From 28c014250e242dc0398a91f4c16653ae1ca22b86 Mon Sep 17 00:00:00 2001 From: jcromanu <14983382+jcromanu@users.noreply.github.com> Date: Fri, 8 May 2026 16:43:49 +0000 Subject: [PATCH 01/11] Migrated Compute router status to use transport_tpg.SendRequest (#17070) --- ...ta_source_google_compute_router_status.go} | 83 +++++++++++-------- 1 file changed, 50 insertions(+), 33 deletions(-) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_router_status.go.tmpl => data_source_google_compute_router_status.go} (54%) diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go similarity index 54% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go index 910c91ed57ed..818fbd34e883 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_router_status.go @@ -3,15 +3,10 @@ package compute import ( "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-google/google/registry" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -{{- if eq $.TargetVersionName "ga" }} - "google.golang.org/api/compute/v1" -{{- else }} - "google.golang.org/api/compute/v0.beta" -{{- end }} ) func DataSourceGoogleComputeRouterStatus() *schema.Resource { @@ -65,7 +60,7 @@ func DataSourceGoogleComputeRouterStatus() *schema.Resource { func dataSourceComputeRouterStatusRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -79,32 +74,44 @@ func dataSourceComputeRouterStatusRead(d *schema.ResourceData, meta interface{}) if err != nil { return err } + if err := d.Set("region", region); err != nil { + return fmt.Errorf("Error setting region: %s", err) + } - var name string - if n, ok := d.GetOk("name"); ok { - name = n.(string) + url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/regions/{{region}}/routers/{{name}}/getRouterStatus") + if err != nil { + return err } - resp, err := NewClient(config, userAgent).Routers.GetRouterStatus(project, region, name).Do() + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "GET", + Project: project, + RawURL: url, + UserAgent: userAgent, + }) if err != nil { return err } - status := resp.Result + status, ok := res["result"].(map[string]interface{}) + if !ok { + return fmt.Errorf("Error parsing router status response: 'result' field not found or invalid") + } - if err := d.Set("network", status.Network); err != nil { + if err := d.Set("network", status["network"]); err != nil { return fmt.Errorf("Error setting network: %s", err) } - if err := d.Set("best_routes", flattenRoutes(status.BestRoutes)); err != nil { + if err := d.Set("best_routes", flattenRoutes(status["bestRoutes"])); err != nil { return fmt.Errorf("Error setting best_routes: %s", err) } - if err := d.Set("best_routes_for_router", flattenRoutes(status.BestRoutesForRouter)); err != nil { + if err := d.Set("best_routes_for_router", flattenRoutes(status["bestRoutesForRouter"])); err != nil { return fmt.Errorf("Error setting best_routes_for_router: %s", err) } - id, err := tpgresource.ReplaceVars(d, config, "projects/{{"{{"}}project{{"}}"}}/regions/{{"{{"}}region{{"}}"}}/routers/{{"{{"}}name{{"}}"}}") + id, err := tpgresource.ReplaceVars(d, config, "projects/{{project}}/regions/{{region}}/routers/{{name}}") if err != nil { return fmt.Errorf("Error constructing id: %s", err) } @@ -113,22 +120,32 @@ func dataSourceComputeRouterStatusRead(d *schema.ResourceData, meta interface{}) return nil } -func flattenRoutes(routes []*compute.Route) []map[string]interface{} { - results := make([]map[string]interface{}, len(routes)) +func flattenRoutes(routes interface{}) []map[string]interface{} { + routeList, ok := routes.([]interface{}) + if !ok { + return nil + } + + results := make([]map[string]interface{}, len(routeList)) + + for i, route := range routeList { + routeMap, ok := route.(map[string]interface{}) + if !ok { + continue + } - for i, route := range routes { results[i] = map[string]interface{}{ - "dest_range": route.DestRange, - "name": route.Name, - "network": route.Network, - "description": route.Description, - "next_hop_gateway": route.NextHopGateway, - "next_hop_ilb": route.NextHopIlb, - "next_hop_ip": route.NextHopIp, - "next_hop_vpn_tunnel": route.NextHopVpnTunnel, - "priority": route.Priority, - "tags": route.Tags, - "next_hop_network": route.NextHopNetwork, + "dest_range": routeMap["destRange"], + "name": routeMap["name"], + "network": routeMap["network"], + "description": routeMap["description"], + "next_hop_gateway": routeMap["nextHopGateway"], + "next_hop_ilb": routeMap["nextHopIlb"], + "next_hop_ip": routeMap["nextHopIp"], + "next_hop_vpn_tunnel": routeMap["nextHopVpnTunnel"], + "priority": routeMap["priority"], + "tags": routeMap["tags"], + "next_hop_network": routeMap["nextHopNetwork"], } } @@ -137,9 +154,9 @@ func flattenRoutes(routes []*compute.Route) []map[string]interface{} { func init() { registry.Schema{ - Name: "google_compute_router_status", + Name: "google_compute_router_status", ProductName: "compute", - Type: registry.SchemaTypeDataSource, - Schema: DataSourceGoogleComputeRouterStatus(), + Type: registry.SchemaTypeDataSource, + Schema: DataSourceGoogleComputeRouterStatus(), }.Register() } From 8ef647985afa835a35995def5267645e00e8c91d Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Fri, 8 May 2026 09:50:25 -0700 Subject: [PATCH 02/11] tgc-revival: add google_colab_notebook_execution (#17468) --- mmv1/products/colab/NotebookExecution.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmv1/products/colab/NotebookExecution.yaml b/mmv1/products/colab/NotebookExecution.yaml index 375400d569c2..c99b390568d3 100644 --- a/mmv1/products/colab/NotebookExecution.yaml +++ b/mmv1/products/colab/NotebookExecution.yaml @@ -31,6 +31,7 @@ async: operation: import_format: - 'projects/{{project}}/locations/{{location}}/notebookExecutionJobs/{{notebook_execution_job_id}}' +include_in_tgc_next: true custom_code: post_create: 'templates/terraform/post_create/colab_notebook_execution.go.tmpl' examples: @@ -146,6 +147,7 @@ properties: required: true description: 'The base64-encoded contents of the input notebook file.' custom_flatten: 'templates/terraform/custom_flatten/colab_notebook_execution_direct_content.go.tmpl' + tgc_ignore_terraform_custom_flatten: true - name: executionTimeout type: String description: 'Max running time of the execution job in seconds (default 86400s / 24 hrs).' From b00da7a0d69e4f14caaefb0555c46bc510d88bc6 Mon Sep 17 00:00:00 2001 From: Apratim Utkarsh Date: Fri, 8 May 2026 22:36:06 +0530 Subject: [PATCH 03/11] Correct description of the cluster field in RestorePlan (#17480) --- mmv1/products/gkebackup/RestorePlan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/products/gkebackup/RestorePlan.yaml b/mmv1/products/gkebackup/RestorePlan.yaml index db85d61e1ad6..fac64aca2977 100644 --- a/mmv1/products/gkebackup/RestorePlan.yaml +++ b/mmv1/products/gkebackup/RestorePlan.yaml @@ -223,7 +223,7 @@ properties: - name: 'cluster' type: String description: | - The source cluster from which Restores will be created via this RestorePlan. + The name of the target cluster to which you want to Restore via this RestorePlan. required: true immutable: true - name: 'restoreConfig' From 07652b522b11525e8ec470a1b145bf27adc35b24 Mon Sep 17 00:00:00 2001 From: Abhay Bhat <48846719+Ray784@users.noreply.github.com> Date: Fri, 8 May 2026 23:01:24 +0530 Subject: [PATCH 04/11] Custom MAC addresses and NEG based Dynamic NICs support (#17455) --- mmv1/products/compute/NetworkEndpointGroup.yaml | 1 + mmv1/products/compute/Subnetwork.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mmv1/products/compute/NetworkEndpointGroup.yaml b/mmv1/products/compute/NetworkEndpointGroup.yaml index 55dcdfb51dee..bdd0818f9d3c 100644 --- a/mmv1/products/compute/NetworkEndpointGroup.yaml +++ b/mmv1/products/compute/NetworkEndpointGroup.yaml @@ -118,6 +118,7 @@ properties: - 'INTERNET_FQDN_PORT' - 'SERVERLESS' - 'PRIVATE_SERVICE_CONNECT' + - 'GCE_VM_IP_DEDICATED_BACKEND' - name: 'size' type: Integer description: Number of network endpoints in the network endpoint group. diff --git a/mmv1/products/compute/Subnetwork.yaml b/mmv1/products/compute/Subnetwork.yaml index 9b6e49de488b..a25530c568c5 100644 --- a/mmv1/products/compute/Subnetwork.yaml +++ b/mmv1/products/compute/Subnetwork.yaml @@ -563,3 +563,5 @@ properties: enum_values: - ARP_ALL_RANGES - ARP_PRIMARY_RANGE + - ARP_BROADCAST_PRIMARY_RANGE + - ARP_BROADCAST_PRIMARY_RANGE_WITH_LEARNING From 202ca2611222afda0250e6687d3f7337b7b46e64 Mon Sep 17 00:00:00 2001 From: Shuya Ma <87669292+shuyama1@users.noreply.github.com> Date: Fri, 8 May 2026 12:16:16 -0700 Subject: [PATCH 05/11] Fix data lineage config tests (#17482) --- mmv1/products/datalineage/Config.yaml | 3 +- .../data_lineage_config_project.tf.tmpl | 21 +++++++- .../data_source_data_lineage_config_test.go | 27 ++++++++++- .../resource_data_lineage_config_test.go | 48 +++++++++++++++++-- 4 files changed, 92 insertions(+), 7 deletions(-) diff --git a/mmv1/products/datalineage/Config.yaml b/mmv1/products/datalineage/Config.yaml index ad5e654671db..5a0971c64896 100644 --- a/mmv1/products/datalineage/Config.yaml +++ b/mmv1/products/datalineage/Config.yaml @@ -47,7 +47,8 @@ examples: - name: 'data_lineage_config_project' primary_resource_id: 'default' test_env_vars: - project: 'PROJECT_NAME' + org_id: 'ORG_ID' + external_providers: ["time"] - name: 'data_lineage_config_folder' primary_resource_id: 'default' vars: diff --git a/mmv1/templates/terraform/examples/data_lineage_config_project.tf.tmpl b/mmv1/templates/terraform/examples/data_lineage_config_project.tf.tmpl index b031ccd584b1..13c17867457a 100644 --- a/mmv1/templates/terraform/examples/data_lineage_config_project.tf.tmpl +++ b/mmv1/templates/terraform/examples/data_lineage_config_project.tf.tmpl @@ -1,5 +1,23 @@ +resource "google_project" "project" { + project_id = "tf-test%{random_suffix}" + name = "tf-test%{random_suffix}" + org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" +} + +resource "time_sleep" "wait_for_project" { + create_duration = "60s" + depends_on = [google_project.project] +} + +resource "google_project_service" "datalineage_api" { + project = google_project.project.project_id + service = "datalineage.googleapis.com" + depends_on = [time_sleep.wait_for_project] +} + resource "google_data_lineage_config" "{{$.PrimaryResourceId}}" { - parent = "projects/{{index $.TestEnvVars "project"}}" + parent = "projects/${google_project.project.project_id}" location = "global" ingestion { @@ -12,4 +30,5 @@ resource "google_data_lineage_config" "{{$.PrimaryResourceId}}" { } } } + depends_on = [google_project_service.datalineage_api] } diff --git a/mmv1/third_party/terraform/services/datalineage/data_source_data_lineage_config_test.go b/mmv1/third_party/terraform/services/datalineage/data_source_data_lineage_config_test.go index 9f5b72f1c3e8..55be0365adbe 100644 --- a/mmv1/third_party/terraform/services/datalineage/data_source_data_lineage_config_test.go +++ b/mmv1/third_party/terraform/services/datalineage/data_source_data_lineage_config_test.go @@ -12,12 +12,16 @@ func TestAccDataSourceGoogleDataLineageConfig_basic(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), + "org_id": envvar.GetTestOrgFromEnv(t), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + ExternalProviders: map[string]resource.ExternalProvider{ + "time": {}, + }, Steps: []resource.TestStep{ { Config: testAccDataSourceGoogleDataLineageConfig_basic(context), @@ -35,8 +39,26 @@ func TestAccDataSourceGoogleDataLineageConfig_basic(t *testing.T) { func testAccDataSourceGoogleDataLineageConfig_basic(context map[string]interface{}) string { return acctest.Nprintf(` +resource "google_project" "project" { + project_id = "tf-test%{random_suffix}" + name = "tf-test%{random_suffix}" + org_id = "%{org_id}" + deletion_policy = "DELETE" +} + +resource "time_sleep" "wait_for_project" { + create_duration = "60s" + depends_on = [google_project.project] +} + +resource "google_project_service" "datalineage_api" { + project = google_project.project.project_id + service = "datalineage.googleapis.com" + depends_on = [time_sleep.wait_for_project] +} + resource "google_data_lineage_config" "default" { - parent = "projects/%{project}" + parent = "projects/${google_project.project.project_id}" location = "global" ingestion { @@ -49,6 +71,7 @@ resource "google_data_lineage_config" "default" { } } } + depends_on = [google_project_service.datalineage_api] } data "google_data_lineage_config" "default" { diff --git a/mmv1/third_party/terraform/services/datalineage/resource_data_lineage_config_test.go b/mmv1/third_party/terraform/services/datalineage/resource_data_lineage_config_test.go index 2b05808dafce..31b988e80f91 100644 --- a/mmv1/third_party/terraform/services/datalineage/resource_data_lineage_config_test.go +++ b/mmv1/third_party/terraform/services/datalineage/resource_data_lineage_config_test.go @@ -12,13 +12,17 @@ import ( func TestAccDataLineageConfig_update(t *testing.T) { context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), + "org_id": envvar.GetTestOrgFromEnv(t), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckDataLineageConfigDestroyProducer(t), + ExternalProviders: map[string]resource.ExternalProvider{ + "time": {}, + }, Steps: []resource.TestStep{ { Config: testAccDataLineageConfig_basic(context), @@ -49,8 +53,26 @@ func TestAccDataLineageConfig_update(t *testing.T) { func testAccDataLineageConfig_basic(context map[string]interface{}) string { return acctest.Nprintf(` +resource "google_project" "project" { + project_id = "tf-test%{random_suffix}" + name = "tf-test%{random_suffix}" + org_id = "%{org_id}" + deletion_policy = "DELETE" +} + +resource "time_sleep" "wait_for_project" { + create_duration = "60s" + depends_on = [google_project.project] +} + +resource "google_project_service" "datalineage_api" { + project = google_project.project.project_id + service = "datalineage.googleapis.com" + depends_on = [time_sleep.wait_for_project] +} + resource "google_data_lineage_config" "default" { - parent = "projects/%{project}" + parent = "projects/${google_project.project.project_id}" location = "global" ingestion { @@ -71,14 +93,33 @@ resource "google_data_lineage_config" "default" { } } } + depends_on = [google_project_service.datalineage_api] } `, context) } func testAccDataLineageConfig_update(context map[string]interface{}) string { return acctest.Nprintf(` +resource "google_project" "project" { + project_id = "tf-test%{random_suffix}" + name = "tf-test%{random_suffix}" + org_id = "%{org_id}" + deletion_policy = "DELETE" +} + +resource "time_sleep" "wait_for_project" { + create_duration = "60s" + depends_on = [google_project.project] +} + +resource "google_project_service" "datalineage_api" { + project = google_project.project.project_id + service = "datalineage.googleapis.com" + depends_on = [time_sleep.wait_for_project] +} + resource "google_data_lineage_config" "default" { - parent = "projects/%{project}" + parent = "projects/${google_project.project.project_id}" location = "global" ingestion { @@ -91,6 +132,7 @@ resource "google_data_lineage_config" "default" { } } } + depends_on = [google_project_service.datalineage_api] } `, context) } From 37b4deff88452adb15b996c617abb49bd69dd1df Mon Sep 17 00:00:00 2001 From: "Stephen Lewis (Burrows)" Date: Fri, 8 May 2026 13:09:45 -0700 Subject: [PATCH 06/11] Moved compute-related bootstrapping into the compute package (#17461) --- mmv1/products/alloydb/Cluster.yaml | 7 +- mmv1/products/dataproc/Batch.yaml | 10 +- mmv1/products/dataproc/SessionTemplate.yaml | 6 +- mmv1/products/eventarc/Pipeline.yaml | 10 +- mmv1/products/eventarc/Trigger.yaml | 4 +- mmv1/products/gkebackup/BackupPlan.yaml | 33 +- mmv1/products/gkebackup/RestorePlan.yaml | 37 +- mmv1/products/gkehub/Membership.yaml | 13 +- mmv1/products/gkehub2/MembershipBinding.yaml | 5 +- .../gkehub2/MembershipRBACRoleBinding.yaml | 5 +- mmv1/products/looker/Instance.yaml | 3 +- mmv1/products/redis/Instance.yaml | 9 +- mmv1/products/vertexai/IndexEndpoint.yaml | 3 +- .../vertexai/IndexEndpointDeployedIndex.yaml | 5 +- .../base_configs/iam_test_file.go.tmpl | 4 + .../base_configs/iam_test_file.go.tmpl | 4 + .../test_constants/import_tpgcompute.go.tmpl | 3 + .../acctest/bootstrap_test_utils.go.tmpl | 457 +----------- .../resource_alloydb_instance_test.go.tmpl | 19 +- ...resource_alloydb_secondary_cluster_test.go | 5 +- ...esource_alloydb_secondary_instance_test.go | 5 +- ...source_cloudbuild_worker_pool_test.go.tmpl | 7 +- .../services/compute/bootstrap_test_utils.go | 378 ++++++++++ .../resource_compute_disk_test.go.tmpl | 4 +- ...rce_compute_instance_template_test.go.tmpl | 6 +- .../resource_compute_instance_test.go.tmpl | 4 +- ...pute_region_instance_template_test.go.tmpl | 6 +- ...ta_source_google_container_cluster_test.go | 9 +- .../resource_container_cluster_test.go.tmpl | 687 +++++++++--------- .../resource_container_node_pool_test.go.tmpl | 297 ++++---- .../dataproc/iam_dataproc_cluster_test.go | 19 +- .../dataproc/iam_dataproc_job_test.go | 19 +- .../dataproc/resource_dataproc_batch_test.go | 99 ++- .../dataproc/resource_dataproc_cluster.go | 42 +- ...resource_dataproc_cluster_internal_test.go | 28 +- .../resource_dataproc_cluster_migrate.go | 2 +- .../resource_dataproc_cluster_test.go | 203 +++--- .../resource_dataproc_cluster_upgrade_test.go | 19 +- .../resource_dataproc_job_test.go.tmpl | 51 +- ...resource_dataproc_session_template_test.go | 2 +- .../resource_gke_backup_backup_plan_test.go | 11 +- .../resource_gke_backup_restore_plan_test.go | 5 +- ...esource_gke_hub_membership_binding_test.go | 5 +- .../data_source_lustre_instance_test.go | 3 +- .../lustre/resource_lustre_instance_test.go | 13 +- ...esource_sql_database_instance_test.go.tmpl | 27 +- 46 files changed, 1329 insertions(+), 1264 deletions(-) create mode 100644 mmv1/templates/terraform/test_constants/import_tpgcompute.go.tmpl create mode 100644 mmv1/third_party/terraform/services/compute/bootstrap_test_utils.go diff --git a/mmv1/products/alloydb/Cluster.yaml b/mmv1/products/alloydb/Cluster.yaml index 33c815bd0c1f..6ccb872bfbb4 100644 --- a/mmv1/products/alloydb/Cluster.yaml +++ b/mmv1/products/alloydb/Cluster.yaml @@ -59,6 +59,7 @@ custom_code: pre_create: 'templates/terraform/pre_create/alloydb_cluster.go.tmpl' pre_update: 'templates/terraform/pre_update/alloydb_cluster.go.tmpl' pre_delete: 'templates/terraform/pre_delete/alloydb_cluster.go.tmpl' + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' # Skipping the sweeper because we need to force-delete clusters. exclude_sweeper: true include_in_tgc_next: true @@ -76,7 +77,7 @@ examples: alloydb_instance_name: 'alloydb-instance' network_name: 'alloydb-network' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-1")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "alloydb-1")' ignore_read_extra: - 'deletion_protection' - name: 'alloydb_cluster_after_upgrade' @@ -86,7 +87,7 @@ examples: alloydb_instance_name: 'alloydb-instance' network_name: 'alloydb-network' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-1")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "alloydb-1")' ignore_read_extra: - 'deletion_protection' - name: 'alloydb_cluster_full' @@ -105,7 +106,7 @@ examples: alloydb_instance_name: 'alloydb-instance' network_name: 'alloydb-network' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-instance-basic")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "alloydb-instance-basic")' ignore_read_extra: - 'deletion_protection' - 'reconciling' diff --git a/mmv1/products/dataproc/Batch.yaml b/mmv1/products/dataproc/Batch.yaml index 28916a3bd7c9..d0f07545700b 100644 --- a/mmv1/products/dataproc/Batch.yaml +++ b/mmv1/products/dataproc/Batch.yaml @@ -55,7 +55,7 @@ examples: project_name: PROJECT_NAME test_vars_overrides: prevent_destroy: "false" - subnetwork_name: acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-spark-test-network", "dataproc-spark-test-subnetwork") + subnetwork_name: BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-spark-test-network", "dataproc-spark-test-subnetwork") - name: dataproc_batch_spark_full primary_resource_id: example_batch_spark ignore_read_extra: @@ -81,7 +81,7 @@ examples: project_name: PROJECT_NAME test_vars_overrides: prevent_destroy: "false" - subnetwork_name: acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-sparksql-test-network", "dataproc-sparksql-test-subnetwork") + subnetwork_name: BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-sparksql-test-network", "dataproc-sparksql-test-subnetwork") - name: dataproc_batch_pyspark primary_resource_id: example_batch_pyspark ignore_read_extra: @@ -93,7 +93,7 @@ examples: project_name: PROJECT_NAME test_vars_overrides: prevent_destroy: "false" - subnetwork_name: acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-pyspark-test-network", "dataproc-pyspark-test-subnetwork") + subnetwork_name: BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-pyspark-test-network", "dataproc-pyspark-test-subnetwork") - name: dataproc_batch_sparkr primary_resource_id: example_batch_sparkr ignore_read_extra: @@ -105,7 +105,7 @@ examples: project_name: PROJECT_NAME test_vars_overrides: prevent_destroy: "false" - subnetwork_name: acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-pyspark-test-network", "dataproc-pyspark-test-subnetwork") + subnetwork_name: BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-pyspark-test-network", "dataproc-pyspark-test-subnetwork") - name: dataproc_batch_autotuning primary_resource_id: example_batch_autotuning ignore_read_extra: @@ -117,7 +117,7 @@ examples: project_name: PROJECT_NAME test_vars_overrides: prevent_destroy: "false" - subnetwork_name: acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-autotuning-test-network", "dataproc-autotuning-test-subnetwork") + subnetwork_name: BootstrapSubnetWithFirewallForDataprocBatches(t, "dataproc-autotuning-test-network", "dataproc-autotuning-test-subnetwork") parameters: - name: location type: String diff --git a/mmv1/products/dataproc/SessionTemplate.yaml b/mmv1/products/dataproc/SessionTemplate.yaml index 6ad6722330dc..4c2c460e3bbb 100644 --- a/mmv1/products/dataproc/SessionTemplate.yaml +++ b/mmv1/products/dataproc/SessionTemplate.yaml @@ -43,7 +43,7 @@ examples: test_env_vars: project_name: 'PROJECT_NAME' test_vars_overrides: - 'subnetwork_name': 'acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork")' + 'subnetwork_name': 'BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork")' 'prevent_destroy': 'false' ignore_read_extra: - 'runtime_config.0.properties' @@ -58,7 +58,7 @@ examples: test_env_vars: project_name: 'PROJECT_NAME' test_vars_overrides: - 'subnetwork_name': 'acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork")' + 'subnetwork_name': 'BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork")' 'prevent_destroy': 'false' 'kms_key_name': 'acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-dataproc-session-template-key1").CryptoKey.Name' ignore_read_extra: @@ -72,7 +72,7 @@ examples: test_env_vars: project_name: 'PROJECT_NAME' test_vars_overrides: - 'subnetwork_name': 'acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "spark-connect-session-test-network", "spark-connect-session-test-subnetwork")' + 'subnetwork_name': 'BootstrapSubnetWithFirewallForDataprocBatches(t, "spark-connect-session-test-network", "spark-connect-session-test-subnetwork")' 'prevent_destroy': 'false' ignore_read_extra: - 'runtime_config.0.properties' diff --git a/mmv1/products/eventarc/Pipeline.yaml b/mmv1/products/eventarc/Pipeline.yaml index c28e660888bb..0a484d557281 100644 --- a/mmv1/products/eventarc/Pipeline.yaml +++ b/mmv1/products/eventarc/Pipeline.yaml @@ -27,6 +27,8 @@ references: api: https://cloud.google.com/eventarc/docs/reference/rest/v1/projects.locations.pipelines description: | The Eventarc Pipeline resource +custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' async: actions: ['create', 'update', 'delete'] operation: @@ -52,7 +54,7 @@ examples: test_env_vars: project_id: 'PROJECT_NAME' test_vars_overrides: - 'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' + 'network_attachment_name': 'tpgcompute.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", tpgcompute.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", tpgcompute.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' - name: eventarc_pipeline_with_workflow_destination primary_resource_id: primary vars: @@ -69,7 +71,7 @@ examples: project_id: 'PROJECT_NAME' service_account: 'SERVICE_ACCT' test_vars_overrides: - 'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' + 'network_attachment_name': 'tpgcompute.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", tpgcompute.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", tpgcompute.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' - name: eventarc_pipeline_with_oauth_and_protobuf_format primary_resource_id: primary vars: @@ -79,7 +81,7 @@ examples: project_id: 'PROJECT_NAME' service_account: 'SERVICE_ACCT' test_vars_overrides: - 'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' + 'network_attachment_name': 'tpgcompute.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", tpgcompute.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", tpgcompute.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' - name: eventarc_pipeline_with_cmek_and_avro_format primary_resource_id: primary bootstrap_iam: @@ -92,7 +94,7 @@ examples: test_env_vars: project_id: 'PROJECT_NAME' test_vars_overrides: - 'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' + 'network_attachment_name': 'tpgcompute.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", tpgcompute.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", tpgcompute.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))' 'key_name': 'acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key").CryptoKey.Name' parameters: - name: location diff --git a/mmv1/products/eventarc/Trigger.yaml b/mmv1/products/eventarc/Trigger.yaml index db10fc431bc1..e6ea73b3b2a5 100644 --- a/mmv1/products/eventarc/Trigger.yaml +++ b/mmv1/products/eventarc/Trigger.yaml @@ -39,6 +39,8 @@ sweeper: url_substitutions: - region: "us-central1" - region: "europe-west1" +custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' examples: - name: eventarc_trigger_with_cloud_run_destination primary_resource_id: primary @@ -52,7 +54,7 @@ examples: trigger_name: some-trigger network_attachment_name: network-attachment test_vars_overrides: - 'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-trigger-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-trigger-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-trigger-network")))' + 'network_attachment_name': 'tpgcompute.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-trigger-na", tpgcompute.BootstrapSubnet(t, "tf-bootstrap-eventarc-trigger-subnet", tpgcompute.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-trigger-network")))' test_env_vars: project_id: 'PROJECT_NAME' service_account: 'SERVICE_ACCT' diff --git a/mmv1/products/gkebackup/BackupPlan.yaml b/mmv1/products/gkebackup/BackupPlan.yaml index e4b35878fe09..812b4ebd64e5 100644 --- a/mmv1/products/gkebackup/BackupPlan.yaml +++ b/mmv1/products/gkebackup/BackupPlan.yaml @@ -44,6 +44,7 @@ iam_policy: - 'projects/{{project}}/locations/{{location}}/backupPlans/{{name}}' - '{{name}}' custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' include_in_tgc_next: true examples: - name: 'gkebackup_backupplan_basic' @@ -58,8 +59,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_autopilot' @@ -72,8 +73,8 @@ examples: subnetwork_name: 'default' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_cmek' @@ -89,8 +90,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_nslabels' @@ -105,8 +106,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_full' @@ -121,8 +122,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_permissive' @@ -137,8 +138,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_rpo_daily_window' @@ -153,8 +154,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_backupplan_rpo_weekly_window' @@ -169,8 +170,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' parameters: diff --git a/mmv1/products/gkebackup/RestorePlan.yaml b/mmv1/products/gkebackup/RestorePlan.yaml index fac64aca2977..3fd04ca710d5 100644 --- a/mmv1/products/gkebackup/RestorePlan.yaml +++ b/mmv1/products/gkebackup/RestorePlan.yaml @@ -44,6 +44,7 @@ iam_policy: - 'projects/{{project}}/locations/{{location}}/restorePlans/{{name}}' - '{{name}}' custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' include_in_tgc_next: true examples: - name: 'gkebackup_restoreplan_all_namespaces' @@ -57,8 +58,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_rollback_namespace' @@ -72,8 +73,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_protected_application' @@ -87,8 +88,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_all_cluster_resources' @@ -102,8 +103,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_rename_namespace' @@ -117,8 +118,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_second_transformation' @@ -132,8 +133,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_gitops_mode' @@ -147,8 +148,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_restore_order' @@ -162,8 +163,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' - name: 'gkebackup_restoreplan_volume_res' @@ -177,8 +178,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' parameters: diff --git a/mmv1/products/gkehub/Membership.yaml b/mmv1/products/gkehub/Membership.yaml index d387a7105a31..eb1099f43196 100644 --- a/mmv1/products/gkehub/Membership.yaml +++ b/mmv1/products/gkehub/Membership.yaml @@ -49,6 +49,7 @@ iam_policy: - '{{membership_id}}' custom_code: constants: 'templates/terraform/constants/gke_hub_membership_diff.go.tmpl' + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' include_in_tgc_next: true # Skip sweeper gen since this is a child resource. exclude_sweeper: true @@ -66,8 +67,8 @@ examples: project: 'PROJECT_NAME' location: 'REGION' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' # for backward compatible name: '"basic" + randomSuffix' - name: 'gkehub_membership_basic' @@ -80,8 +81,8 @@ examples: subnetwork_name: 'default' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' # for backward compatible name: '"basic" + randomSuffix' oics_vars_overrides: @@ -98,8 +99,8 @@ examples: project: 'PROJECT_NAME' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' # for backward compatible name: '"basic" + randomSuffix' oics_vars_overrides: diff --git a/mmv1/products/gkehub2/MembershipBinding.yaml b/mmv1/products/gkehub2/MembershipBinding.yaml index 885e7e754188..b48d8224ed96 100644 --- a/mmv1/products/gkehub2/MembershipBinding.yaml +++ b/mmv1/products/gkehub2/MembershipBinding.yaml @@ -42,6 +42,7 @@ async: result: resource_inside_response: true custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' # Skip sweeper gen since this is a child resource. exclude_sweeper: true examples: @@ -58,8 +59,8 @@ examples: membership_id: 'fmt.Sprintf("tf-test-membership%s", context["random_suffix"])' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' parameters: diff --git a/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml b/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml index 8d0abfc1ab30..47e88fc5fe2d 100644 --- a/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml +++ b/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml @@ -42,6 +42,7 @@ async: result: resource_inside_response: true custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' # Skip sweeper gen since this is a child resource. exclude_sweeper: true examples: @@ -58,8 +59,8 @@ examples: location: 'global' test_vars_overrides: 'deletion_protection': 'false' - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")' - 'subnetwork_name': 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")' + 'subnetwork_name': 'tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"))' oics_vars_overrides: 'deletion_protection': 'false' parameters: diff --git a/mmv1/products/looker/Instance.yaml b/mmv1/products/looker/Instance.yaml index 8378769b923f..abaa59c3956c 100644 --- a/mmv1/products/looker/Instance.yaml +++ b/mmv1/products/looker/Instance.yaml @@ -83,7 +83,7 @@ examples: client_id: 'my-client-id' client_secret: 'my-client-secret' test_vars_overrides: - 'address_name': 'acctest.BootstrapSharedTestGlobalAddress(t, "looker-vpc-network-3", acctest.AddressWithPrefixLength(8))' + 'address_name': 'tpgcompute.BootstrapSharedTestGlobalAddress(t, "looker-vpc-network-3", tpgcompute.AddressWithPrefixLength(8))' 'kms_key_name': 'acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name' 'network_name': 'acctest.BootstrapSharedServiceNetworkingConnection(t, "looker-vpc-network-3", acctest.ServiceNetworkWithPrefixLength(8))' exclude_docs: true @@ -119,6 +119,7 @@ virtual_fields: nested resources will return an error. Possible values: DEFAULT, FORCE custom_code: pre_delete: templates/terraform/pre_delete/looker_instance.go.tmpl + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' parameters: - name: 'region' type: String diff --git a/mmv1/products/redis/Instance.yaml b/mmv1/products/redis/Instance.yaml index 3810b9033bcb..d317a3ab5e2d 100644 --- a/mmv1/products/redis/Instance.yaml +++ b/mmv1/products/redis/Instance.yaml @@ -41,6 +41,7 @@ async: custom_code: extra_schema_entry: 'templates/terraform/extra_schema_entry/redis_instance.tmpl' constants: 'templates/terraform/constants/redis_instance.go.tmpl' + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' encoder: 'templates/terraform/encoders/redis_location_id_for_fallback_zone.go.tmpl' decoder: 'templates/terraform/decoders/redis_instance.go.tmpl' pre_delete: 'templates/terraform/pre_delete/redis_instance.go.tmpl' @@ -69,7 +70,7 @@ examples: network_name: 'redis-test-network' prevent_destroy: 'true' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "redis-full")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "redis-full")' 'prevent_destroy': 'false' oics_vars_overrides: 'prevent_destroy': 'false' @@ -80,7 +81,7 @@ examples: network_name: 'redis-test-network' prevent_destroy: 'true' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "redis-full-persis")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "redis-full-persis")' 'prevent_destroy': 'false' oics_vars_overrides: 'prevent_destroy': 'false' @@ -117,7 +118,7 @@ examples: network_name: 'redis-test-network' prevent_destroy: 'true' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "redis-mrr")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "redis-mrr")' 'prevent_destroy': 'false' oics_vars_overrides: 'prevent_destroy': 'false' @@ -128,7 +129,7 @@ examples: network_name: 'redis-test-network' prevent_destroy: 'true' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "redis-cmek")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "redis-cmek")' 'prevent_destroy': 'false' oics_vars_overrides: 'prevent_destroy': 'false' diff --git a/mmv1/products/vertexai/IndexEndpoint.yaml b/mmv1/products/vertexai/IndexEndpoint.yaml index 12dd7cbb4e54..fdb8b70164e4 100644 --- a/mmv1/products/vertexai/IndexEndpoint.yaml +++ b/mmv1/products/vertexai/IndexEndpoint.yaml @@ -36,6 +36,7 @@ async: result: resource_inside_response: true custom_code: + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' examples: - name: 'vertex_ai_index_endpoint' primary_resource_id: 'index_endpoint' @@ -63,7 +64,7 @@ examples: - name: 'vertex_ai_index_endpoint_with_public_endpoint' primary_resource_id: 'index_endpoint' test_vars_overrides: - 'network_name': 'acctest.BootstrapSharedTestNetwork(t, "vertex-ai-index-endpoint")' + 'network_name': 'tpgcompute.BootstrapSharedTestNetwork(t, "vertex-ai-index-endpoint")' parameters: - name: 'region' type: String diff --git a/mmv1/products/vertexai/IndexEndpointDeployedIndex.yaml b/mmv1/products/vertexai/IndexEndpointDeployedIndex.yaml index 7abefd7714d2..9692370bf120 100644 --- a/mmv1/products/vertexai/IndexEndpointDeployedIndex.yaml +++ b/mmv1/products/vertexai/IndexEndpointDeployedIndex.yaml @@ -52,6 +52,7 @@ custom_code: decoder: 'templates/terraform/decoders/vertex_ai_index_endpoint_deployed_index.go.tmpl' pre_delete: 'templates/terraform/pre_delete/vertex_ai_index_endpoint_deployed_index.go.tmpl' custom_import: 'templates/terraform/custom_import/vertex_ai_index_endpoint_deployed_index.go.tmpl' + test_constants: 'templates/terraform/test_constants/import_tpgcompute.go.tmpl' # exluding resource_identity due to custom_import exclude_identity_generation: true examples: @@ -68,7 +69,7 @@ examples: address_name: 'vertex-ai-range' test_vars_overrides: 'network_name': 'acctest.BootstrapSharedServiceNetworkingConnection(t, "vpc-network-1")' - 'address_name': 'acctest.BootstrapSharedTestGlobalAddress(t, "vpc-network-1", acctest.AddressWithPrefixLength(8))' + 'address_name': 'tpgcompute.BootstrapSharedTestGlobalAddress(t, "vpc-network-1", tpgcompute.AddressWithPrefixLength(8))' - name: 'vertex_ai_index_endpoint_deployed_index_basic_two' primary_resource_id: 'basic_deployed_index' vars: @@ -82,7 +83,7 @@ examples: address_name: 'vertex-ai-range' test_vars_overrides: 'network_name': 'acctest.BootstrapSharedServiceNetworkingConnection(t, "vpc-network-1")' - 'address_name': 'acctest.BootstrapSharedTestGlobalAddress(t, "vpc-network-1", acctest.AddressWithPrefixLength(8))' + 'address_name': 'tpgcompute.BootstrapSharedTestGlobalAddress(t, "vpc-network-1", tpgcompute.AddressWithPrefixLength(8))' - name: 'vertex_ai_index_endpoint_deployed_index_dedicated_resources' primary_resource_id: 'dedicated_resources' vars: diff --git a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl index c11f91bc837a..25d454a7c08e 100644 --- a/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl +++ b/mmv1/templates/terraform/examples/base_configs/iam_test_file.go.tmpl @@ -18,6 +18,10 @@ import ( "{{ $.ImportPath }}/tpgresource" ) +{{if $.CustomCode.TestConstants -}} + {{- customTemplate $ $.CustomCode.TestConstants true -}} +{{- end}} + var ( _ = fmt.Sprintf _ = strings.Trim diff --git a/mmv1/templates/terraform/samples/base_configs/iam_test_file.go.tmpl b/mmv1/templates/terraform/samples/base_configs/iam_test_file.go.tmpl index 449b53fee0e7..9c1f5e7a944a 100644 --- a/mmv1/templates/terraform/samples/base_configs/iam_test_file.go.tmpl +++ b/mmv1/templates/terraform/samples/base_configs/iam_test_file.go.tmpl @@ -18,6 +18,10 @@ import ( "{{ $.ImportPath }}/tpgresource" ) +{{if $.CustomCode.TestConstants -}} + {{- customTemplate $ $.CustomCode.TestConstants true -}} +{{- end}} + var ( _ = fmt.Sprintf _ = strings.Trim diff --git a/mmv1/templates/terraform/test_constants/import_tpgcompute.go.tmpl b/mmv1/templates/terraform/test_constants/import_tpgcompute.go.tmpl new file mode 100644 index 000000000000..2609490cbbab --- /dev/null +++ b/mmv1/templates/terraform/test_constants/import_tpgcompute.go.tmpl @@ -0,0 +1,3 @@ +import ( + tpgcompute "{{ $.ImportPath }}/services/compute" +) diff --git a/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl b/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl index eb91f6a69900..42394cf492e9 100644 --- a/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl +++ b/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl @@ -4,7 +4,6 @@ import ( "context" "fmt" "log" - "maps" "strings" "testing" "time" @@ -549,160 +548,6 @@ func BootstrapSharedTestADDomain(t *testing.T, testId string, networkName string return sharedADDomain } -const SharedTestNetworkPrefix = "tf-bootstrap-net-" - -// BootstrapSharedTestNetwork will return a persistent compute network for a -// test or set of tests. -// -// Usage 1 -// Resources like service_networking_connection use a consumer network and -// create a complementing tenant network which we don't control. These tenant -// networks never get cleaned up and they can accumulate to the point where a -// limit is reached for the organization. By reusing a consumer network across -// test runs, we can reduce the number of tenant networks that are needed. -// See b/146351146 for more context. -// -// Usage 2 -// Bootstrap networks used in tests (gke clusters, dataproc clusters...) -// to avoid traffic to the default network -// -// testId specifies the test for which a shared network is used/initialized. -// Note that if the network is being used for a service_networking_connection, -// the same testId should generally not be used across tests, to avoid race -// conditions where multiple tests attempt to modify the connection at once. -// -// Returns the name of a network, creating it if it hasn't been created in the -// test project. -func BootstrapSharedTestNetwork(t *testing.T, testId string) string { - project := envvar.GetTestProjectFromEnv() - networkName := SharedTestNetworkPrefix + testId - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return "" - } - - log.Printf("[DEBUG] Getting shared test network %q", networkName) - _, err := tpgcompute.NewClient(config, config.UserAgent).Networks.Get(project, networkName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - log.Printf("[DEBUG] Network %q not found, bootstrapping", networkName) - url := fmt.Sprintf("%sprojects/%s/global/networks", transport_tpg.BaseUrl(tpgcompute.Product, config), project) - netObj := map[string]interface{}{ - "name": networkName, - "autoCreateSubnetworks": false, - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: project, - RawURL: url, - UserAgent: config.UserAgent, - Body: netObj, - Timeout: 4 * time.Minute, - }) - if err != nil { - t.Fatalf("Error bootstrapping shared test network %q: %s", networkName, err) - } - - log.Printf("[DEBUG] Waiting for network creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, project, "Error bootstrapping shared test network", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping shared test network %q: %s", networkName, err) - } - } - - network, err := tpgcompute.NewClient(config, config.UserAgent).Networks.Get(project, networkName).Do() - if err != nil { - t.Errorf("Error getting shared test network %q: %s", networkName, err) - } - if network == nil { - t.Fatalf("Error getting shared test network %q: is nil", networkName) - } - return network.Name -} - -type AddressSettings struct { - PrefixLength int -} - -func AddressWithPrefixLength(prefixLength int) func(*AddressSettings) { - return func(settings *AddressSettings) { - settings.PrefixLength = prefixLength - } -} - -func NewAddressSettings(options ...func(*AddressSettings)) *AddressSettings { - settings := &AddressSettings{ - PrefixLength: 16, // default prefix length - } - - for _, o := range options { - o(settings) - } - return settings -} - -const SharedTestGlobalAddressPrefix = "tf-bootstrap-addr-" - -// params are the functions to set compute global address -func BootstrapSharedTestGlobalAddress(t *testing.T, testId string, params ...func(*AddressSettings)) string { - project := envvar.GetTestProjectFromEnv() - addressName := SharedTestGlobalAddressPrefix + testId - networkName := BootstrapSharedTestNetwork(t, testId) - networkId := fmt.Sprintf("projects/%v/global/networks/%v", project, networkName) - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return "" - } - - log.Printf("[DEBUG] Getting shared test global address %q", addressName) - _, err := tpgcompute.NewClient(config, config.UserAgent).GlobalAddresses.Get(project, addressName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - log.Printf("[DEBUG] Global address %q not found, bootstrapping", addressName) - url := fmt.Sprintf("%sprojects/%s/global/addresses", transport_tpg.BaseUrl(tpgcompute.Product, config), project) - - settings := NewAddressSettings(params...) - - netObj := map[string]interface{}{ - "name": addressName, - "address_type": "INTERNAL", - "purpose": "VPC_PEERING", - "prefix_length": settings.PrefixLength, - "network": networkId, - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: project, - RawURL: url, - UserAgent: config.UserAgent, - Body: netObj, - Timeout: 4 * time.Minute, - }) - if err != nil { - t.Fatalf("Error bootstrapping shared test global address %q: %s", addressName, err) - } - - log.Printf("[DEBUG] Waiting for global address creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, project, "Error bootstrapping shared test global address", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping shared test global address %q: %s", addressName, err) - } - } - - address, err := tpgcompute.NewClient(config, config.UserAgent).GlobalAddresses.Get(project, addressName).Do() - if err != nil { - t.Errorf("Error getting shared test global address %q: %s", addressName, err) - } - if address == nil { - t.Fatalf("Error getting shared test global address %q: is nil", addressName) - } - return address.Name -} - type ServiceNetworkSettings struct { PrefixLength int ParentService string @@ -767,9 +612,9 @@ func BootstrapSharedServiceNetworkingConnection(t *testing.T, testId string, par t.Fatalf("Error getting project: %s", err) } - networkName := SharedTestNetworkPrefix + testId + networkName := tpgcompute.SharedTestNetworkPrefix + testId networkId := fmt.Sprintf("projects/%v/global/networks/%v", project.ProjectNumber, networkName) - globalAddressName := BootstrapSharedTestGlobalAddress(t, testId, AddressWithPrefixLength(settings.PrefixLength)) + globalAddressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId, tpgcompute.AddressWithPrefixLength(settings.PrefixLength)) readCall := tpgservicenetworking.NewClient(config, config.UserAgent).Services.Connections.List(parentService).Network(networkId) if config.UserProjectOverride { @@ -1281,301 +1126,3 @@ func BootstrapSharedCaPoolInLocation(t *testing.T, location string) string { } return poolName } - -func BootstrapSubnetForDataprocBatches(t *testing.T, subnetName string, networkName string) string { - subnetOptions := map[string]interface{}{ - "privateIpGoogleAccess": true, - } - return BootstrapSubnetWithOverrides(t, subnetName, networkName, subnetOptions) -} - -func BootstrapSubnet(t *testing.T, subnetName string, networkName string) string { - return BootstrapSubnetWithOverrides(t, subnetName, networkName, make(map[string]interface{})) -} - -func BootstrapSubnetWithFirewallForDataprocBatches(t *testing.T, testId string, subnetName string) string { - networkName := BootstrapSharedTestNetwork(t, testId) - subnetworkName := BootstrapSubnetForDataprocBatches(t, subnetName, networkName) - BootstrapFirewallForDataprocSharedNetwork(t, subnetName, networkName) - return subnetworkName -} - -func BootstrapSubnetWithOverrides(t *testing.T, subnetName string, networkName string, subnetOptions map[string]interface{}) string { - projectID := envvar.GetTestProjectFromEnv() - region := envvar.GetTestRegionFromEnv() - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - t.Fatal("Could not bootstrap config.") - } - - computeService := tpgcompute.NewClient(config, config.UserAgent) - if computeService == nil { - t.Fatal("Could not create compute client.") - } - - // In order to create a networkAttachment we need to bootstrap a subnet. - _, err := computeService.Subnetworks.Get(projectID, region, subnetName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - log.Printf("[DEBUG] Subnet %q not found, bootstrapping", subnetName) - - networkUrl := fmt.Sprintf("%sprojects/%s/global/networks/%s", transport_tpg.BaseUrl(tpgcompute.Product, config), projectID, networkName) - url := fmt.Sprintf("%sprojects/%s/regions/%s/subnetworks", transport_tpg.BaseUrl(tpgcompute.Product, config), projectID, region) - - defaultSubnetObj := map[string]interface{}{ - "name": subnetName, - "region ": region, - "network": networkUrl, - "ipCidrRange": "10.77.0.0/20", - } - - if len(subnetOptions) != 0 { - maps.Copy(defaultSubnetObj, subnetOptions) - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: projectID, - RawURL: url, - UserAgent: config.UserAgent, - Body: defaultSubnetObj, - Timeout: 4 * time.Minute, - }) - - log.Printf("Response is, %s", res) - if err != nil { - t.Fatalf("Error bootstrapping test subnet %s: %s", subnetName, err) - } - - log.Printf("[DEBUG] Waiting for network creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping test subnet", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping test subnet %s: %s", subnetName, err) - } - } - - subnet, err := computeService.Subnetworks.Get(projectID, region, subnetName).Do() - - if subnet == nil { - t.Fatalf("Error getting test subnet %s: is nil", subnetName) - } - - if err != nil { - t.Fatalf("Error getting test subnet %s: %s", subnetName, err) - } - return subnet.Name -} - -func BootstrapNetworkAttachment(t *testing.T, networkAttachmentName string, subnetName string) string { - projectID := envvar.GetTestProjectFromEnv() - region := envvar.GetTestRegionFromEnv() - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return "" - } - - computeService := tpgcompute.NewClient(config, config.UserAgent) - if computeService == nil { - return "" - } - - networkAttachment, err := computeService.NetworkAttachments.Get(projectID, region, networkAttachmentName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - // Create Network Attachment Here. - log.Printf("[DEBUG] Network Attachment %s not found, bootstrapping", networkAttachmentName) - url := fmt.Sprintf("%sprojects/%s/regions/%s/networkAttachments", transport_tpg.BaseUrl(tpgcompute.Product, config), projectID, region) - - subnetURL := fmt.Sprintf("%sprojects/%s/regions/%s/subnetworks/%s", transport_tpg.BaseUrl(tpgcompute.Product, config), projectID, region, subnetName) - networkAttachmentObj := map[string]interface{}{ - "name": networkAttachmentName, - "region": region, - "subnetworks": []string{subnetURL}, - "connectionPreference": "ACCEPT_AUTOMATIC", - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: projectID, - RawURL: url, - UserAgent: config.UserAgent, - Body: networkAttachmentObj, - Timeout: 4 * time.Minute, - }) - if err != nil { - t.Fatalf("Error bootstrapping test Network Attachment %s: %s", networkAttachmentName, err) - } - - log.Printf("[DEBUG] Waiting for network creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping shared test subnet", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping test Network Attachment %s: %s", networkAttachmentName, err) - } - } - - networkAttachment, err = computeService.NetworkAttachments.Get(projectID, region, networkAttachmentName).Do() - - if networkAttachment == nil { - t.Fatalf("Error getting test network attachment %s: is nil", networkAttachmentName) - } - - if err != nil { - t.Fatalf("Error getting test Network Attachment %s: %s", networkAttachmentName, err) - } - - return networkAttachment.Name -} - -// The default network within GCP already comes pre configured with -// certain firewall rules open to allow internal communication. As we -// are boostrapping a network for dataproc tests, we need to additionally -// open up similar rules to allow the nodes to talk to each other -// internally as part of their configuration or this will just hang. -const SharedTestFirewallPrefix = "tf-bootstrap-firewall-" - -func BootstrapFirewallForDataprocSharedNetwork(t *testing.T, firewallName string, networkName string) string { - project := envvar.GetTestProjectFromEnv() - firewallName = SharedTestFirewallPrefix + firewallName - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - return "" - } - - log.Printf("[DEBUG] Getting Firewall %q for Network %q", firewallName, networkName) - _, err := tpgcompute.NewClient(config, config.UserAgent).Firewalls.Get(project, firewallName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - log.Printf("[DEBUG] firewallName %q not found, bootstrapping", firewallName) - url := fmt.Sprintf("%sprojects/%s/global/firewalls", transport_tpg.BaseUrl(tpgcompute.Product, config), project) - - networkId := fmt.Sprintf("projects/%s/global/networks/%s", project, networkName) - allowObj := []interface{}{ - map[string]interface{}{ - "IPProtocol": "icmp", - }, - map[string]interface{}{ - "IPProtocol": "tcp", - "ports": []string{"0-65535"}, - }, - map[string]interface{}{ - "IPProtocol": "udp", - "ports": []string{"0-65535"}, - }, - } - - firewallObj := map[string]interface{}{ - "name": firewallName, - "network": networkId, - "allowed": allowObj, - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: project, - RawURL: url, - UserAgent: config.UserAgent, - Body: firewallObj, - Timeout: 4 * time.Minute, - }) - if err != nil { - t.Fatalf("Error bootstrapping Firewall %q for Network %q: %s", firewallName, networkName, err) - } - - log.Printf("[DEBUG] Waiting for Firewall creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, project, "Error bootstrapping Firewall", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping Firewall %q: %s", firewallName, err) - } - } - - firewall, err := tpgcompute.NewClient(config, config.UserAgent).Firewalls.Get(project, firewallName).Do() - if err != nil { - t.Errorf("Error getting Firewall %q: %s", firewallName, err) - } - if firewall == nil { - t.Fatalf("Error getting Firewall %q: is nil", firewallName) - } - return firewall.Name -} - -const SharedStoragePoolPrefix = "tf-bootstrap-storage-pool-" - -func BootstrapComputeStoragePool(t *testing.T, storagePoolName, storagePoolType string) string { - projectID := envvar.GetTestProjectFromEnv() - zone := envvar.GetTestZoneFromEnv() - - storagePoolName = SharedStoragePoolPrefix + storagePoolType + "-" + storagePoolName - - config := transport_tpg.BootstrapConfig(t) - if config == nil { - t.Fatal("Could not bootstrap config.") - } - - computeService := tpgcompute.NewClient(config, config.UserAgent) - if computeService == nil { - t.Fatal("Could not create compute client.") - } - - _, err := computeService.StoragePools.Get(projectID, zone, storagePoolName).Do() - if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { - log.Printf("[DEBUG] Storage pool %q not found, bootstrapping", storagePoolName) - - url := fmt.Sprintf("%sprojects/%s/zones/%s/storagePools", transport_tpg.BaseUrl(tpgcompute.Product, config), projectID, zone) - storagePoolTypeUrl := fmt.Sprintf("/projects/%s/zones/%s/storagePoolTypes/%s", projectID, zone, storagePoolType) - - storagePoolObj := map[string]interface{}{ - "name": storagePoolName, - "poolProvisionedCapacityGb": 10240, - "poolProvisionedThroughput": 180, - "storagePoolType": storagePoolTypeUrl, - "capacityProvisioningType": "ADVANCED", - } - - if storagePoolType == "hyperdisk-balanced" { - storagePoolObj["poolProvisionedIops"] = 10000 - storagePoolObj["poolProvisionedThroughput"] = 1024 - } - - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - Project: projectID, - RawURL: url, - UserAgent: config.UserAgent, - Body: storagePoolObj, - Timeout: 20 * time.Minute, - }) - - log.Printf("Response is, %s", res) - if err != nil { - t.Fatalf("Error bootstrapping storage pool %s: %s", storagePoolName, err) - } - - log.Printf("[DEBUG] Waiting for storage pool creation to finish") - err = tpgcompute.ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping storage pool", config.UserAgent, 4*time.Minute) - if err != nil { - t.Fatalf("Error bootstrapping test storage pool %s: %s", storagePoolName, err) - } - } - - storagePool, err := computeService.StoragePools.Get(projectID, zone, storagePoolName).Do() - - if storagePool == nil { - t.Fatalf("Error getting storage pool %s: is nil", storagePoolName) - } - - if err != nil { - t.Fatalf("Error getting storage pool %s: %s", storagePoolName, err) - } - - storagePoolResourceName, err := tpgresource.GetRelativePath(storagePool.SelfLink) - - if err != nil { - t.Fatal("Failed to extract Storage Pool resource name from URL.") - } - - return storagePoolResourceName -} diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl index 0407547e7d0d..80e4018b1de2 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccAlloydbInstance_update(t *testing.T) { @@ -519,7 +520,7 @@ func TestAccAlloydbInstance_createInstanceWithNetworkConfigAndAllocatedIPRange(t t.Parallel() testId := "alloydb-1" - addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId) + addressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId) networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId) context := map[string]interface{}{ @@ -1014,13 +1015,13 @@ data "google_project" "project" {} func TestAccAlloydbInstance_createInstanceWithPscInterfaceConfigs(t *testing.T) { t.Parallel() - networkName := acctest.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network") - subnetworkName := acctest.BootstrapSubnet(t, "tf-test-alloydb-subnetwork", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network") + subnetworkName := tpgcompute.BootstrapSubnet(t, "tf-test-alloydb-subnetwork", networkName) random_suffix := acctest.RandString(t, 10) context := map[string]interface{}{ "random_suffix": random_suffix, - "networkAttachmentName": acctest.BootstrapNetworkAttachment(t, "tf-test-alloydb-create-na", subnetworkName), + "networkAttachmentName": tpgcompute.BootstrapNetworkAttachment(t, "tf-test-alloydb-create-na", subnetworkName), } acctest.VcrTest(t, resource.TestCase{ @@ -1071,13 +1072,13 @@ data "google_project" "project" {} func TestAccAlloydbInstance_updateInstanceWithPscInterfaceConfigs(t *testing.T) { t.Parallel() - networkName := acctest.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network") - subnetworkName := acctest.BootstrapSubnet(t, "tf-test-alloydb-subnetwork", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network") + subnetworkName := tpgcompute.BootstrapSubnet(t, "tf-test-alloydb-subnetwork", networkName) random_suffix := acctest.RandString(t, 10) context := map[string]interface{}{ "random_suffix": random_suffix, - "networkAttachmentName": acctest.BootstrapNetworkAttachment(t, "tf-test-alloydb-update-na", subnetworkName), + "networkAttachmentName": tpgcompute.BootstrapNetworkAttachment(t, "tf-test-alloydb-update-na", subnetworkName), } acctest.VcrTest(t, resource.TestCase{ @@ -1098,7 +1099,7 @@ func TestAccAlloydbInstance_updateInstanceWithPscInterfaceConfigs(t *testing.T) func TestAccAlloydbInstance_updatePscAutoConnections(t *testing.T) { t.Parallel() - networkName := acctest.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network-psc") + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "tf-test-alloydb-network-psc") random_suffix := acctest.RandString(t, 10) context := map[string]interface{}{ "network_name": networkName, @@ -1184,7 +1185,7 @@ func TestAccAlloydbInstance_createPrimaryAndReadPoolInstanceWithAllocatedIpRange testId := "alloydb-1" context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), - "address_name": acctest.BootstrapSharedTestGlobalAddress(t, testId), + "address_name": tpgcompute.BootstrapSharedTestGlobalAddress(t, testId), "network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, testId), } diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go index cce0930c2ee7..5ac895707e6d 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go @@ -6,6 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) // The cluster creation should succeed with minimal number of arguments @@ -600,7 +601,7 @@ func TestAccAlloydbCluster_secondaryClusterWithNetworkConfigAndAllocatedIPRange( t.Parallel() context := map[string]interface{}{ - "address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), + "address_name": tpgcompute.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), "network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"), "random_suffix": acctest.RandString(t, 10), } @@ -1168,7 +1169,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteWithNetworkConfigAndAllocatedI context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"), - "address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), + "address_name": tpgcompute.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go index 2e280730bc51..b7f09352944a 100644 --- a/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go +++ b/mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_instance_test.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) // This test passes if secondary instance's machine config can be updated @@ -288,7 +289,7 @@ func TestAccAlloydbCluster_secondaryInstanceWithNetworkConfigAndAllocatedIPRange context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"), - "address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), + "address_name": tpgcompute.BootstrapSharedTestGlobalAddress(t, "alloydb-1"), } acctest.VcrTest(t, resource.TestCase{ @@ -477,7 +478,7 @@ resource "google_alloydb_instance" "secondary" { } database_flags = { - "alloydb.enable_auto_explain" = "true" + "alloydb.enable_auto_explain" = "true" } } diff --git a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.tmpl b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.tmpl index aa6399bb3de0..4259161e48be 100644 --- a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_worker_pool_test.go.tmpl @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -58,9 +59,9 @@ func TestAccCloudbuildWorkerPool_basic(t *testing.T) { t.Parallel() - testNetworkName := acctest.BootstrapSharedTestNetwork(t, "attachment-network") - subnetName := acctest.BootstrapSubnet(t, "tf-test-subnet", testNetworkName) - networkAttachmentName := acctest.BootstrapNetworkAttachment(t, "tf-test-attachment", subnetName) + testNetworkName := tpgcompute.BootstrapSharedTestNetwork(t, "attachment-network") + subnetName := tpgcompute.BootstrapSubnet(t, "tf-test-subnet", testNetworkName) + networkAttachmentName := tpgcompute.BootstrapNetworkAttachment(t, "tf-test-attachment", subnetName) // Need to have the full network attachment name in the format project/{project_id}/regions/{region_id}/networkAttachments/{networkAttachmentName} fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachmentName) diff --git a/mmv1/third_party/terraform/services/compute/bootstrap_test_utils.go b/mmv1/third_party/terraform/services/compute/bootstrap_test_utils.go new file mode 100644 index 000000000000..565d263ca95b --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/bootstrap_test_utils.go @@ -0,0 +1,378 @@ +package compute + +import ( + "fmt" + "log" + "maps" + "testing" + "time" + + "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" +) + +const SharedTestNetworkPrefix = "tf-bootstrap-net-" + +// BootstrapSharedTestNetwork will return a persistent compute network for a +// test or set of tests. +// +// Usage 1 +// Resources like service_networking_connection use a consumer network and +// create a complementing tenant network which we don't control. These tenant +// networks never get cleaned up and they can accumulate to the point where a +// limit is reached for the organization. By reusing a consumer network across +// test runs, we can reduce the number of tenant networks that are needed. +// See b/146351146 for more context. +// +// Usage 2 +// Bootstrap networks used in tests (gke clusters, dataproc clusters...) +// to avoid traffic to the default network +// +// testId specifies the test for which a shared network is used/initialized. +// Note that if the network is being used for a service_networking_connection, +// the same testId should generally not be used across tests, to avoid race +// conditions where multiple tests attempt to modify the connection at once. +// +// Returns the name of a network, creating it if it hasn't been created in the +// test project. +func BootstrapSharedTestNetwork(t *testing.T, testId string) string { + project := envvar.GetTestProjectFromEnv() + networkName := SharedTestNetworkPrefix + testId + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return "" + } + + log.Printf("[DEBUG] Getting shared test network %q", networkName) + _, err := NewClient(config, config.UserAgent).Networks.Get(project, networkName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + log.Printf("[DEBUG] Network %q not found, bootstrapping", networkName) + url := fmt.Sprintf("%sprojects/%s/global/networks", transport_tpg.BaseUrl(Product, config), project) + netObj := map[string]interface{}{ + "name": networkName, + "autoCreateSubnetworks": false, + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: project, + RawURL: url, + UserAgent: config.UserAgent, + Body: netObj, + Timeout: 4 * time.Minute, + }) + if err != nil { + t.Fatalf("Error bootstrapping shared test network %q: %s", networkName, err) + } + + log.Printf("[DEBUG] Waiting for network creation to finish") + err = ComputeOperationWaitTime(config, res, project, "Error bootstrapping shared test network", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping shared test network %q: %s", networkName, err) + } + } + + network, err := NewClient(config, config.UserAgent).Networks.Get(project, networkName).Do() + if err != nil { + t.Errorf("Error getting shared test network %q: %s", networkName, err) + } + if network == nil { + t.Fatalf("Error getting shared test network %q: is nil", networkName) + } + return network.Name +} + +type AddressSettings struct { + PrefixLength int +} + +func AddressWithPrefixLength(prefixLength int) func(*AddressSettings) { + return func(settings *AddressSettings) { + settings.PrefixLength = prefixLength + } +} + +func NewAddressSettings(options ...func(*AddressSettings)) *AddressSettings { + settings := &AddressSettings{ + PrefixLength: 16, // default prefix length + } + + for _, o := range options { + o(settings) + } + return settings +} + +const SharedTestGlobalAddressPrefix = "tf-bootstrap-addr-" + +// params are the functions to set compute global address +func BootstrapSharedTestGlobalAddress(t *testing.T, testId string, params ...func(*AddressSettings)) string { + project := envvar.GetTestProjectFromEnv() + addressName := SharedTestGlobalAddressPrefix + testId + networkName := BootstrapSharedTestNetwork(t, testId) + networkId := fmt.Sprintf("projects/%v/global/networks/%v", project, networkName) + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return "" + } + + log.Printf("[DEBUG] Getting shared test global address %q", addressName) + _, err := NewClient(config, config.UserAgent).GlobalAddresses.Get(project, addressName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + log.Printf("[DEBUG] Global address %q not found, bootstrapping", addressName) + url := fmt.Sprintf("%sprojects/%s/global/addresses", transport_tpg.BaseUrl(Product, config), project) + + settings := NewAddressSettings(params...) + + netObj := map[string]interface{}{ + "name": addressName, + "address_type": "INTERNAL", + "purpose": "VPC_PEERING", + "prefix_length": settings.PrefixLength, + "network": networkId, + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: project, + RawURL: url, + UserAgent: config.UserAgent, + Body: netObj, + Timeout: 4 * time.Minute, + }) + if err != nil { + t.Fatalf("Error bootstrapping shared test global address %q: %s", addressName, err) + } + + log.Printf("[DEBUG] Waiting for global address creation to finish") + err = ComputeOperationWaitTime(config, res, project, "Error bootstrapping shared test global address", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping shared test global address %q: %s", addressName, err) + } + } + + address, err := NewClient(config, config.UserAgent).GlobalAddresses.Get(project, addressName).Do() + if err != nil { + t.Errorf("Error getting shared test global address %q: %s", addressName, err) + } + if address == nil { + t.Fatalf("Error getting shared test global address %q: is nil", addressName) + } + return address.Name +} + +func BootstrapSubnet(t *testing.T, subnetName string, networkName string) string { + return BootstrapSubnetWithOverrides(t, subnetName, networkName, make(map[string]interface{})) +} + +func BootstrapSubnetWithOverrides(t *testing.T, subnetName string, networkName string, subnetOptions map[string]interface{}) string { + projectID := envvar.GetTestProjectFromEnv() + region := envvar.GetTestRegionFromEnv() + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + t.Fatal("Could not bootstrap config.") + } + + computeService := NewClient(config, config.UserAgent) + if computeService == nil { + t.Fatal("Could not create compute client.") + } + + // In order to create a networkAttachment we need to bootstrap a subnet. + _, err := computeService.Subnetworks.Get(projectID, region, subnetName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + log.Printf("[DEBUG] Subnet %q not found, bootstrapping", subnetName) + + networkUrl := fmt.Sprintf("%sprojects/%s/global/networks/%s", transport_tpg.BaseUrl(Product, config), projectID, networkName) + url := fmt.Sprintf("%sprojects/%s/regions/%s/subnetworks", transport_tpg.BaseUrl(Product, config), projectID, region) + + defaultSubnetObj := map[string]interface{}{ + "name": subnetName, + "region ": region, + "network": networkUrl, + "ipCidrRange": "10.77.0.0/20", + } + + if len(subnetOptions) != 0 { + maps.Copy(defaultSubnetObj, subnetOptions) + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: projectID, + RawURL: url, + UserAgent: config.UserAgent, + Body: defaultSubnetObj, + Timeout: 4 * time.Minute, + }) + + log.Printf("Response is, %s", res) + if err != nil { + t.Fatalf("Error bootstrapping test subnet %s: %s", subnetName, err) + } + + log.Printf("[DEBUG] Waiting for network creation to finish") + err = ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping test subnet", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping test subnet %s: %s", subnetName, err) + } + } + + subnet, err := computeService.Subnetworks.Get(projectID, region, subnetName).Do() + + if subnet == nil { + t.Fatalf("Error getting test subnet %s: is nil", subnetName) + } + + if err != nil { + t.Fatalf("Error getting test subnet %s: %s", subnetName, err) + } + return subnet.Name +} + +func BootstrapNetworkAttachment(t *testing.T, networkAttachmentName string, subnetName string) string { + projectID := envvar.GetTestProjectFromEnv() + region := envvar.GetTestRegionFromEnv() + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return "" + } + + computeService := NewClient(config, config.UserAgent) + if computeService == nil { + return "" + } + + networkAttachment, err := computeService.NetworkAttachments.Get(projectID, region, networkAttachmentName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + // Create Network Attachment Here. + log.Printf("[DEBUG] Network Attachment %s not found, bootstrapping", networkAttachmentName) + url := fmt.Sprintf("%sprojects/%s/regions/%s/networkAttachments", transport_tpg.BaseUrl(Product, config), projectID, region) + + subnetURL := fmt.Sprintf("%sprojects/%s/regions/%s/subnetworks/%s", transport_tpg.BaseUrl(Product, config), projectID, region, subnetName) + networkAttachmentObj := map[string]interface{}{ + "name": networkAttachmentName, + "region": region, + "subnetworks": []string{subnetURL}, + "connectionPreference": "ACCEPT_AUTOMATIC", + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: projectID, + RawURL: url, + UserAgent: config.UserAgent, + Body: networkAttachmentObj, + Timeout: 4 * time.Minute, + }) + if err != nil { + t.Fatalf("Error bootstrapping test Network Attachment %s: %s", networkAttachmentName, err) + } + + log.Printf("[DEBUG] Waiting for network creation to finish") + err = ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping shared test subnet", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping test Network Attachment %s: %s", networkAttachmentName, err) + } + } + + networkAttachment, err = computeService.NetworkAttachments.Get(projectID, region, networkAttachmentName).Do() + + if networkAttachment == nil { + t.Fatalf("Error getting test network attachment %s: is nil", networkAttachmentName) + } + + if err != nil { + t.Fatalf("Error getting test Network Attachment %s: %s", networkAttachmentName, err) + } + + return networkAttachment.Name +} + +const SharedStoragePoolPrefix = "tf-bootstrap-storage-pool-" + +func BootstrapComputeStoragePool(t *testing.T, storagePoolName, storagePoolType string) string { + projectID := envvar.GetTestProjectFromEnv() + zone := envvar.GetTestZoneFromEnv() + + storagePoolName = SharedStoragePoolPrefix + storagePoolType + "-" + storagePoolName + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + t.Fatal("Could not bootstrap config.") + } + + computeService := NewClient(config, config.UserAgent) + if computeService == nil { + t.Fatal("Could not create compute client.") + } + + _, err := computeService.StoragePools.Get(projectID, zone, storagePoolName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + log.Printf("[DEBUG] Storage pool %q not found, bootstrapping", storagePoolName) + + url := fmt.Sprintf("%sprojects/%s/zones/%s/storagePools", transport_tpg.BaseUrl(Product, config), projectID, zone) + storagePoolTypeUrl := fmt.Sprintf("/projects/%s/zones/%s/storagePoolTypes/%s", projectID, zone, storagePoolType) + + storagePoolObj := map[string]interface{}{ + "name": storagePoolName, + "poolProvisionedCapacityGb": 10240, + "poolProvisionedThroughput": 180, + "storagePoolType": storagePoolTypeUrl, + "capacityProvisioningType": "ADVANCED", + } + + if storagePoolType == "hyperdisk-balanced" { + storagePoolObj["poolProvisionedIops"] = 10000 + storagePoolObj["poolProvisionedThroughput"] = 1024 + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: projectID, + RawURL: url, + UserAgent: config.UserAgent, + Body: storagePoolObj, + Timeout: 20 * time.Minute, + }) + + log.Printf("Response is, %s", res) + if err != nil { + t.Fatalf("Error bootstrapping storage pool %s: %s", storagePoolName, err) + } + + log.Printf("[DEBUG] Waiting for storage pool creation to finish") + err = ComputeOperationWaitTime(config, res, projectID, "Error bootstrapping storage pool", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping test storage pool %s: %s", storagePoolName, err) + } + } + + storagePool, err := computeService.StoragePools.Get(projectID, zone, storagePoolName).Do() + + if storagePool == nil { + t.Fatalf("Error getting storage pool %s: is nil", storagePoolName) + } + + if err != nil { + t.Fatalf("Error getting storage pool %s: %s", storagePoolName, err) + } + + storagePoolResourceName, err := tpgresource.GetRelativePath(storagePool.SelfLink) + + if err != nil { + t.Fatal("Failed to extract Storage Pool resource name from URL.") + } + + return storagePoolResourceName +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.tmpl index b9164942f736..d87cbec9c8ec 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.tmpl @@ -1960,7 +1960,7 @@ resource "google_compute_disk" "foobar" { func TestAccComputeDisk_storagePoolSpecified(t *testing.T) { t.Parallel() - storagePoolNameLong := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-throughput") + storagePoolNameLong := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-throughput") diskName := fmt.Sprintf("tf-test-disk-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ @@ -1982,7 +1982,7 @@ func TestAccComputeDisk_storagePoolSpecified(t *testing.T) { func TestAccComputeDisk_storagePoolSpecified_nameOnly(t *testing.T) { t.Parallel() - acctest.BootstrapComputeStoragePool(t, "basic-2", "hyperdisk-throughput") + tpgcompute.BootstrapComputeStoragePool(t, "basic-2", "hyperdisk-throughput") diskName := fmt.Sprintf("tf-test-disk-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl index 6a6faa98ca6a..8b366ebe3a26 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl @@ -1708,9 +1708,9 @@ func TestAccComputeInstanceTemplate_sourceImageEncryptionKey(t *testing.T) { func TestAccComputeInstanceTemplate_NetworkAttachment(t *testing.T) { t.Parallel() - testNetworkName := acctest.BootstrapSharedTestNetwork(t, "attachment-network") - subnetName := acctest.BootstrapSubnet(t, "tf-test-subnet", testNetworkName) - networkAttachmentName := acctest.BootstrapNetworkAttachment(t, "tf-test-attachment", subnetName) + testNetworkName := tpgcompute.BootstrapSharedTestNetwork(t, "attachment-network") + subnetName := tpgcompute.BootstrapSubnet(t, "tf-test-subnet", testNetworkName) + networkAttachmentName := tpgcompute.BootstrapNetworkAttachment(t, "tf-test-attachment", subnetName) // Need to have the full network attachment name in the format project/{project_id}/regions/{region_id}/networkAttachments/{networkAttachmentName} fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachmentName) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl index 4d7898ef55ab..e9450502b27c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl @@ -12771,7 +12771,7 @@ func TestAccComputeInstance_bootDisk_storagePoolSpecified(t *testing.T) { t.Parallel() instanceName := fmt.Sprintf("tf-test-instance-%s", acctest.RandString(t, 10)) - storagePoolNameLong := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") + storagePoolNameLong := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -12793,7 +12793,7 @@ func TestAccComputeInstance_bootDisk_storagePoolSpecified_nameOnly(t *testing.T) t.Parallel() instanceName := fmt.Sprintf("tf-test-instance-%s", acctest.RandString(t, 10)) - acctest.BootstrapComputeStoragePool(t, "basic-2", "hyperdisk-balanced") + tpgcompute.BootstrapComputeStoragePool(t, "basic-2", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl index 6e75493232ea..b9507c2d954d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl @@ -1771,11 +1771,11 @@ func TestAccComputeRegionInstanceTemplate_GuestOsFeatures(t *testing.T) { func TestAccComputeRegionInstanceTemplate_networkAttachment(t *testing.T) { t.Parallel() - network := acctest.BootstrapSharedTestNetwork(t, "attachment-network") - subnet := acctest.BootstrapSubnet(t, "tf-test-subnet", network) + network := tpgcompute.BootstrapSharedTestNetwork(t, "attachment-network") + subnet := tpgcompute.BootstrapSubnet(t, "tf-test-subnet", network) region := envvar.GetTestRegionFromEnv() - networkAttachmentShortname := acctest.BootstrapNetworkAttachment(t, "tf-test-attachment", subnet) + networkAttachmentShortname := tpgcompute.BootstrapNetworkAttachment(t, "tf-test-attachment", subnet) networkAttachment := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachmentShortname) context := map[string]interface{}{ diff --git a/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go b/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go index d00914820c6c..66b42a5b6436 100644 --- a/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go +++ b/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go @@ -6,13 +6,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccContainerClusterDatasource_zonal(t *testing.T) { t.Parallel() - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -35,8 +36,8 @@ func TestAccContainerClusterDatasource_zonal(t *testing.T) { func TestAccContainerClusterDatasource_regional(t *testing.T) { t.Parallel() - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl index 3570e000ccd8..b743bc45a0ea 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/container" cloudkms "google.golang.org/api/cloudkms/v1" ) @@ -41,8 +42,8 @@ func TestAccContainerCluster_basic(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -86,8 +87,8 @@ func TestAccContainerCluster_basic_noCpaUpgrade(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -121,8 +122,8 @@ func TestAccContainerCluster_resourceManagerTags(t *testing.T) { randomSuffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) bootstrapGkeTagManagerServiceAgents(t) acctest.VcrTest(t, resource.TestCase{ @@ -179,8 +180,8 @@ func TestAccContainerCluster_networkingModeRoutes(t *testing.T) { t.Parallel() // separate shared network name because test requests a specific CIDR - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster-moderoutes") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster-moderoutes", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster-moderoutes") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster-moderoutes", networkName) firstClusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) secondClusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ @@ -214,8 +215,8 @@ func TestAccContainerCluster_misc(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -252,8 +253,8 @@ func TestAccContainerCluster_withAddons(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -286,8 +287,8 @@ func TestAccContainerCluster_withAddons(t *testing.T) { func TestAccContainerCluster_withDeletionProtection(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -324,8 +325,8 @@ func TestAccContainerCluster_withNotificationConfig(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) topic := fmt.Sprintf("tf-test-topic-%s", acctest.RandString(t, 10)) newTopic := fmt.Sprintf("tf-test-topic-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -378,8 +379,8 @@ func TestAccContainerCluster_withFilteredNotificationConfig(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) topic := fmt.Sprintf("tf-test-topic-%s", acctest.RandString(t, 10)) newTopic := fmt.Sprintf("tf-test-topic-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -422,8 +423,8 @@ func TestAccContainerCluster_withConfidentialNodes(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -483,8 +484,8 @@ func TestAccContainerCluster_withLocalSsdEncryptionMode(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) npName := fmt.Sprintf("tf-test-node-pool-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ @@ -509,8 +510,8 @@ func TestAccContainerCluster_withMaxRunDuration(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) npName := fmt.Sprintf("tf-test-node-pool-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ @@ -553,8 +554,8 @@ func TestAccContainerCluster_withFlexStart(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) npName := fmt.Sprintf("tf-test-node-pool-%s", acctest.RandString(t, 10)) acctest.VcrTest(t, resource.TestCase{ @@ -586,8 +587,8 @@ func TestAccContainerCluster_withILBSubsetting(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -630,8 +631,8 @@ func TestAccContainerCluster_omittedILBSubsetting(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -674,8 +675,8 @@ func TestAccContainerCluster_disableL4LbFirewallReconciliation(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -740,8 +741,8 @@ func TestAccContainerCluster_inTransitEncryptionConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -783,8 +784,8 @@ func TestAccContainerCluster_networkPerformanceConfig(t *testing.T) { acctest.SkipIfVcr(t) clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -854,8 +855,8 @@ func TestAccContainerCluster_withAdditiveVPC(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -879,8 +880,8 @@ func TestAccContainerCluster_withMasterAuthConfig_NoCert(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -907,8 +908,8 @@ func TestAccContainerCluster_withAuthenticatorGroupsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) orgDomain := envvar.GetTestOrgDomainFromEnv(t) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -1004,8 +1005,8 @@ func TestAccContainerCluster_withPodAutoscaling(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1201,8 +1202,8 @@ func TestAccContainerCluster_withNetworkPolicyEnabled(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1274,8 +1275,8 @@ func TestAccContainerCluster_withNetworkPolicyEnabled(t *testing.T) { func TestAccContainerCluster_withReleaseChannelEnabled(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1309,8 +1310,8 @@ func TestAccContainerCluster_withReleaseChannelEnabled(t *testing.T) { func TestAccContainerCluster_withReleaseChannelEnabledDefaultVersion(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1376,8 +1377,8 @@ func TestAccContainerCluster_withInvalidReleaseChannel(t *testing.T) { acctest.SkipIfVcr(t) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1395,8 +1396,8 @@ func TestAccContainerCluster_withInvalidReleaseChannel(t *testing.T) { func TestAccContainerCluster_withAcceleratedGkeAutoUpgradeConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1421,8 +1422,8 @@ func TestAccContainerCluster_withAcceleratedGkeAutoUpgradeConfig(t *testing.T) { func TestAccContainerCluster_withTelemetryEnabled(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1469,8 +1470,8 @@ func TestAccContainerCluster_withManagedOpenTelemetryConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1563,8 +1564,8 @@ func TestAccContainerCluster_withManagedMLDiagnosticsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1664,8 +1665,8 @@ func TestAccContainerCluster_withMasterAuthorizedNetworksConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1733,8 +1734,8 @@ func TestAccContainerCluster_withGcpPublicCidrsAccessEnabledToggle(t *testing.T) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1827,8 +1828,8 @@ func TestAccContainerCluster_withAuthorizedNetworkPrivateEnforcementToggle(t *te t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1887,8 +1888,8 @@ func TestAccContainerCluster_regional(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-regional-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1913,8 +1914,8 @@ func TestAccContainerCluster_regionalWithNodePool(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-regional-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1938,8 +1939,8 @@ func TestAccContainerCluster_regionalWithNodeLocations(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2006,8 +2007,8 @@ func TestAccContainerCluster_nodePoolWithUpgradeSettings(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2125,8 +2126,8 @@ func TestAccContainerCluster_withPrivateClusterConfigGlobalAccessEnabledOnly(t * t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2159,8 +2160,8 @@ func TestAccContainerCluster_withIntraNodeVisibility(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2199,8 +2200,8 @@ func TestAccContainerCluster_withVersion(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2224,8 +2225,8 @@ func TestAccContainerCluster_updateVersion(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2258,8 +2259,8 @@ func TestAccContainerCluster_withNodeConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2302,8 +2303,8 @@ func TestAccContainerCluster_withNodeConfigLinuxNodeConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2452,8 +2453,8 @@ func TestAccContainerCluster_withKubeletConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2514,8 +2515,8 @@ func TestAccContainerCluster_withNodeConfigFastSocket(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2567,8 +2568,8 @@ func TestAccContainerCluster_withNodeConfigFastSocket(t *testing.T) { func TestAccContainerCluster_withNodeConfigGcfsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2610,8 +2611,8 @@ func TestAccContainerCluster_withNodeConfigGcfsConfig(t *testing.T) { func TestAccContainerCluster_withNodeConfigKubeletConfigSettingsUpdates(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2668,8 +2669,8 @@ func TestAccContainerCluster_withNodeConfigKubeletConfigSettingsInNodePool(t *te t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2693,8 +2694,8 @@ func TestAccContainerCluster_withInsecureKubeletReadonlyPortEnabledInNodePool(t t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2720,8 +2721,8 @@ func TestAccContainerCluster_withInsecureKubeletReadonlyPortEnabledInNodePool(t func TestAccContainerCluster_withInsecureKubeletReadonlyPortEnabledDefaultsUpdates(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2793,8 +2794,8 @@ func TestAccContainerCluster_withInsecureKubeletReadonlyPortEnabledDefaultsUpdat func TestAccContainerCluster_withLoggingVariantInNodeConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2818,8 +2819,8 @@ func TestAccContainerCluster_withLoggingVariantInNodePool(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2842,8 +2843,8 @@ func TestAccContainerCluster_withLoggingVariantInNodePool(t *testing.T) { func TestAccContainerCluster_withLoggingVariantUpdates(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2885,8 +2886,8 @@ func TestAccContainerCluster_withAdvancedMachineFeaturesInNodePool(t *testing.T) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2909,8 +2910,8 @@ func TestAccContainerCluster_withAdvancedMachineFeaturesInNodePool(t *testing.T) func TestAccContainerCluster_withNodePoolDefaults(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -2968,8 +2969,8 @@ func TestAccContainerCluster_withNodeConfigScopeAlias(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2993,8 +2994,8 @@ func TestAccContainerCluster_withNodeConfigShieldedInstanceConfig(t *testing.T) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3018,8 +3019,8 @@ func TestAccContainerCluster_withNodeConfigReservationAffinity(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3050,8 +3051,8 @@ func TestAccContainerCluster_withNodeConfigReservationAffinitySpecific(t *testin reservationName := fmt.Sprintf("tf-test-reservation-%s", acctest.RandString(t, 10)) clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3087,8 +3088,8 @@ func TestAccContainerCluster_withWorkloadMetadataConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3140,8 +3141,8 @@ func TestAccContainerCluster_withSandboxConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3198,8 +3199,8 @@ func TestAccContainerCluster_withSandboxConfigType(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3224,8 +3225,8 @@ func TestAccContainerCluster_withBootDiskKmsKey(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) kms := acctest.BootstrapKMSKeyInLocation(t, "us-central1") - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -3286,8 +3287,8 @@ func TestAccContainerCluster_backend(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3312,8 +3313,8 @@ func TestAccContainerCluster_withNodePoolBasic(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3338,8 +3339,8 @@ func TestAccContainerCluster_withNodePoolUpdateVersion(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3373,8 +3374,8 @@ func TestAccContainerCluster_withNodePoolResize(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3414,8 +3415,8 @@ func TestAccContainerCluster_withNodePoolAutoscaling(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3470,8 +3471,8 @@ func TestAccContainerCluster_withNodePoolCIA(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3535,8 +3536,8 @@ func TestAccContainerCluster_withNodePoolNamePrefix(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) npNamePrefix := "tf-test-np-" acctest.VcrTest(t, resource.TestCase{ @@ -3561,8 +3562,8 @@ func TestAccContainerCluster_withNodePoolMultiple(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) npNamePrefix := "tf-test-np-" acctest.VcrTest(t, resource.TestCase{ @@ -3588,8 +3589,8 @@ func TestAccContainerCluster_withNodePoolConflictingNameFields(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npPrefix := "tf-test-np" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3609,8 +3610,8 @@ func TestAccContainerCluster_withNodePoolNodeConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3635,8 +3636,8 @@ func TestAccContainerCluster_withNodePoolNodeDrainConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3665,8 +3666,8 @@ func TestAccContainerCluster_withClusterDisruptionBudget(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_cluster_disruption_budget" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3691,8 +3692,8 @@ func TestAccContainerCluster_withMaintenanceWindow(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_window" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3731,8 +3732,8 @@ func TestAccContainerCluster_withRecurringMaintenanceWindow(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_recurring_maintenance_window" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3780,8 +3781,8 @@ func TestAccContainerCluster_withMaintenanceExclusionWindow(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_window" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3816,8 +3817,8 @@ func TestAccContainerCluster_withMaintenanceExclusionOptions(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3849,8 +3850,8 @@ func TestAccContainerCluster_withMaintenanceExclusionOptions_untilEndOfSupport(t t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3880,8 +3881,8 @@ func TestAccContainerCluster_deleteMaintenanceExclusionOptions(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3930,8 +3931,8 @@ func TestAccContainerCluster_deleteMaintenanceExclusionOptions_untilEndOfSupport t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3978,8 +3979,8 @@ func TestAccContainerCluster_updateMaintenanceExclusionOptions(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) // step1: create a new cluster and initialize the maintenceExclusion without exclusion scopes, // step2: add exclusion scopes to the maintenancePolicy, @@ -4048,8 +4049,8 @@ func TestAccContainerCluster_updateMaintenanceExclusionOptions_untilEndOfSupport t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_options" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) // step1: create a new cluster and initialize the maintenceExclusion without exclusion scopes, // step2: add exclusion scopes to the maintenancePolicy, @@ -4114,8 +4115,8 @@ func TestAccContainerCluster_deleteExclusionWindow(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) resourceName := "google_container_cluster.with_maintenance_exclusion_window" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4325,8 +4326,8 @@ func TestAccContainerCluster_nodeAutoprovisioning(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4405,8 +4406,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaults(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) includeMinCpuPlatform := true acctest.VcrTest(t, resource.TestCase{ @@ -4458,8 +4459,8 @@ func TestAccContainerCluster_autoprovisioningDefaultsUpgradeSettings(t *testing. t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4496,8 +4497,8 @@ func TestAccContainerCluster_nodeAutoprovisioningNetworkTags(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4525,8 +4526,8 @@ func TestAccContainerCluster_withDefaultComputeClassEnabled(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4565,8 +4566,8 @@ func TestAccContainerCluster_withAutopilotDefaultComputeClassEnabled(t *testing. t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4653,8 +4654,8 @@ func TestAccContainerCluster_withAutopilotClusterPolicy(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4761,8 +4762,8 @@ func TestAccContainerCluster_withShieldedNodes(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4904,8 +4905,8 @@ func TestAccContainerCluster_withAutopilotKubeletConfig(t *testing.T) { randomSuffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4954,8 +4955,8 @@ func TestAccContainerCluster_withAutopilot_withNodePoolAutoConfig(t *testing.T) randomSuffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -4980,8 +4981,8 @@ func TestAccContainerCluster_withStandard_withNodePoolDefaults(t *testing.T) { randomSuffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5069,8 +5070,8 @@ func TestAccContainerCluster_withWorkloadIdentityConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -5114,8 +5115,8 @@ func TestAccContainerCluster_withWorkloadIdentityConfigAutopilot(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) pid := envvar.GetTestProjectFromEnv() - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5139,8 +5140,8 @@ func TestAccContainerCluster_withSecretManagerConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5201,8 +5202,8 @@ func TestAccContainerCluster_withSecretSyncConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5272,8 +5273,8 @@ func TestAccContainerCluster_withLoggingConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) minVersion := "1.32" acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5364,8 +5365,8 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -5485,8 +5486,8 @@ func TestAccContainerCluster_withSoleTenantGroup(t *testing.T) { t.Parallel() resourceName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -5508,8 +5509,8 @@ func TestAccContainerCluster_withSoleTenantGroup(t *testing.T) { func TestAccContainerCluster_withAutoscalingProfile(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("cluster-test-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5545,8 +5546,8 @@ func TestAccContainerCluster_withInvalidAutoscalingProfile(t *testing.T) { acctest.SkipIfVcr(t) t.Parallel() clusterName := fmt.Sprintf("cluster-test-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5600,8 +5601,8 @@ func TestAccContainerCluster_withBinaryAuthorizationEnabledBool(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5634,8 +5635,8 @@ func TestAccContainerCluster_withBinaryAuthorizationEvaluationModeAutopilot(t *t t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5668,8 +5669,8 @@ func TestAccContainerCluster_withBinaryAuthorizationEvaluationModeClassic(t *tes t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5727,8 +5728,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsDiskSizeGb(t *testing.T t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) includeDiskSizeGb := true acctest.VcrTest(t, resource.TestCase{ @@ -5762,8 +5763,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsDiskType(t *testing.T) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) includeDiskType := true acctest.VcrTest(t, resource.TestCase{ @@ -5797,8 +5798,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsImageType(t *testing.T) t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) includeImageType := true acctest.VcrTest(t, resource.TestCase{ @@ -5833,8 +5834,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsBootDiskKmsKey(t *testi clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) kms := acctest.BootstrapKMSKeyInLocation(t, "us-central1") - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -5869,8 +5870,8 @@ func TestAccContainerCluster_nodeAutoprovisioningDefaultsShieldedInstance(t *tes t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5894,8 +5895,8 @@ func TestAccContainerCluster_autoprovisioningDefaultsManagement(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5928,8 +5929,8 @@ func TestAccContainerCluster_autoprovisioningLocations(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6074,8 +6075,8 @@ func TestAccContainerCluster_withExternalIpsConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -6109,8 +6110,8 @@ func TestAccContainerCluster_withMeshCertificatesConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -6153,8 +6154,8 @@ func TestAccContainerCluster_withCostManagementConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -6188,8 +6189,8 @@ func TestAccContainerCluster_withDatabaseEncryption(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) // Use the bootstrapped KMS key so we can avoid creating keys needlessly // as they will pile up in the project because they can not be completely @@ -6230,8 +6231,8 @@ func TestAccContainerCluster_withAdvancedDatapath(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6255,8 +6256,8 @@ func TestAccContainerCluster_enableCiliumPolicies(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6350,8 +6351,8 @@ func TestAccContainerCluster_withResourceUsageExportConfig(t *testing.T) { suffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", suffix) datesetId := fmt.Sprintf("tf_test_cluster_resource_usage_%s", suffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6421,8 +6422,8 @@ func TestAccContainerCluster_withEnableKubernetesAlpha(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6446,8 +6447,8 @@ func TestAccContainerCluster_withEnableKubernetesBetaAPIs(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6471,8 +6472,8 @@ func TestAccContainerCluster_withEnableKubernetesBetaAPIsOnExistingCluster(t *te t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6505,8 +6506,8 @@ func TestAccContainerCluster_withIncompatibleMasterVersionNodeVersion(t *testing t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func(){acctest.AccTestPreCheck(t)}, @@ -6527,8 +6528,8 @@ func TestAccContainerCluster_withDNSConfig(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) domainName := fmt.Sprintf("tf-test-domain-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -6559,8 +6560,8 @@ func TestAccContainerCluster_withDNSConfig(t *testing.T) { func TestAccContainerCluster_withGatewayApiConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -6625,8 +6626,8 @@ func TestAccContainerCluster_withProtectConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6660,8 +6661,8 @@ func TestAccContainerCluster_withSecurityPostureConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6721,8 +6722,8 @@ func TestAccContainerCluster_withFleetConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) projectID := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -6818,8 +6819,8 @@ func TestAccContainerCluster_withWorkloadALTSConfigAutopilot(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7024,8 +7025,8 @@ func TestAccContainerCluster_WithCPAFeatures(t *testing.T) { suffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", suffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) // Bootstrap KMS keys and needed IAM role. diskKey := acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "control-plane-disk-encryption") @@ -7340,8 +7341,8 @@ func TestAccContainerCluster_kubeDns_minimal(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -7364,8 +7365,8 @@ func TestAccContainerCluster_autopilot_minimal(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -7388,8 +7389,8 @@ func TestAccContainerCluster_autopilot_withDNSConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7441,8 +7442,8 @@ func TestAccContainerCluster_autopilot_withAdditiveVPC(t *testing.T) { domain := "additive.autopilot.example" clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7505,8 +7506,8 @@ func TestAccContainerCluster_cloudDns_nil_scope(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7546,8 +7547,8 @@ func TestAccContainerCluster_autopilot_withAdditiveVPCMutation(t *testing.T) { domain := "additive-mutating.autopilot.example" clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7600,8 +7601,8 @@ func TestAccContainerCluster_autopilot_net_admin(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7643,8 +7644,8 @@ func TestAccContainerCluster_autopilot_privileged_admission(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7809,8 +7810,8 @@ func TestAccContainerCluster_withCpuCfsQuotaPool(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -7844,8 +7845,8 @@ func TestAccContainerCluster_network_tier_config(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -9224,8 +9225,8 @@ func TestAccContainerCluster_withEnablePrivateEndpointToggle(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -13933,8 +13934,8 @@ func TestAccContainerCluster_customPlacementPolicy(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) policy := fmt.Sprintf("tf-test-policy-%s", acctest.RandString(t, 10)) @@ -14083,8 +14084,8 @@ func TestAccContainerCluster_withConfidentialBootDisk(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-node-pool-%s", acctest.RandString(t, 10)) kms := acctest.BootstrapKMSKeyInLocation(t, "us-central1") - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -14149,8 +14150,8 @@ func TestAccContainerCluster_withConfidentialBootDiskNodeConfig(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) kms := acctest.BootstrapKMSKeyInLocation(t, "us-central1") - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -14212,8 +14213,8 @@ func TestAccContainerCluster_withoutConfidentialBootDisk(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) npName := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -14813,8 +14814,8 @@ func TestAccContainerCluster_privateRegistry(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) secretID := fmt.Sprintf("tf-test-secret-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -15140,8 +15141,8 @@ func TestAccContainerCluster_registryHosts(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) secretID := fmt.Sprintf("tf-test-secret-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), @@ -15460,8 +15461,8 @@ func TestAccContainerCluster_writableCgroups(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -15664,8 +15665,8 @@ func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -15827,11 +15828,11 @@ func TestAccContainerCluster_storagePoolsWithNodePool(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) location := envvar.GetTestZoneFromEnv() - storagePoolResourceName := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") + storagePoolResourceName := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -15883,11 +15884,11 @@ func TestAccContainerCluster_storagePoolsWithNodeConfig(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) location := envvar.GetTestZoneFromEnv() - storagePoolResourceName := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") + storagePoolResourceName := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -15970,8 +15971,8 @@ func TestAccContainerCluster_withAutopilotGcpFilestoreCsiDriver(t *testing.T) { randomSuffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16044,8 +16045,8 @@ func TestAccContainerCluster_withDnsEndpoint(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16119,8 +16120,8 @@ func TestAccContainerCluster_withDnsEndpointAndEnableK8sTokensViaDns(t *testing. t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16177,8 +16178,8 @@ func TestAccContainerCluster_withDnsEndpointAndEnableK8sCertsViaDns(t *testing.T t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16235,8 +16236,8 @@ func TestAccContainerCluster_withCgroupMode(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16264,8 +16265,8 @@ func TestAccContainerCluster_withCgroupModeUpdate(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16319,8 +16320,8 @@ func TestAccContainerCluster_withEnterpriseConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) pid := envvar.GetTestProjectFromEnv() acctest.VcrTest(t, resource.TestCase{ @@ -16402,8 +16403,8 @@ func TestAccContainerCluster_disableControlPlaneIP(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16589,8 +16590,8 @@ func bootstrapAdditionalIpRangesNetworkConfig(t *testing.T, name string, additio sri := []subnetRangeInfo{} // We create our network to ensure no range collisions. - networkName := acctest.BootstrapSharedTestNetwork(t, fmt.Sprintf("%s-network", name)) - mainSubnet := acctest.BootstrapSubnetWithOverrides(t, fmt.Sprintf("%s-subnet-main", name), networkName, map[string]interface{}{ + networkName := tpgcompute.BootstrapSharedTestNetwork(t, fmt.Sprintf("%s-network", name)) + mainSubnet := tpgcompute.BootstrapSubnetWithOverrides(t, fmt.Sprintf("%s-subnet-main", name), networkName, map[string]interface{}{ "ipCidrRange": "10.2.0.0/24", "secondaryIpRanges": []map[string]interface{}{ { @@ -16631,7 +16632,7 @@ func bootstrapAdditionalIpRangesNetworkConfig(t *testing.T, name string, additio } subnetName := fmt.Sprintf("%s-subnet-add-%d", name, subnetIndex) - acctest.BootstrapSubnetWithOverrides(t, subnetName, networkName, subnetOverrides) + tpgcompute.BootstrapSubnetWithOverrides(t, subnetName, networkName, subnetOverrides) si := subnetRangeInfo{ SubnetName: subnetName, @@ -16755,8 +16756,8 @@ func TestAccContainerCluster_auto_ipam_config_enabled(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16827,8 +16828,8 @@ func TestAccContainerCluster_auto_ipam_config_none(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16867,8 +16868,8 @@ func TestAccContainerCluster_withAnonymousAuthenticationConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -16965,8 +16966,8 @@ func TestAccContainerCluster_WithCPAFeaturesUpdate(t *testing.T) { suffix := acctest.RandString(t, 10) clusterName := fmt.Sprintf("tf-test-cluster-%s", suffix) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) // Bootstrap KMS keys and needed IAM role. diskKey := acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "control-plane-disk-encryption") @@ -17098,8 +17099,8 @@ func TestAccContainerCluster_RbacBindingConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -17162,8 +17163,8 @@ func TestAccContainerCluster_withKubeletResourceManagerConfig(t *testing.T) { t.Parallel() clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -17695,8 +17696,8 @@ func TestAccContainerCluster_withClusterBootDisk(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl index c8db9e56fd8e..9af41e5226f2 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/container" "github.com/hashicorp/terraform-provider-google/google/services/tags" ) @@ -19,8 +20,8 @@ func TestAccContainerNodePool_basic(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -43,7 +44,7 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) { t.Parallel() pid := envvar.GetTestProjectFromEnv() - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") tagData := map[string]interface{}{ "purpose": "GCE_FIREWALL", "purpose_data": map[string]interface{}{ @@ -57,7 +58,7 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) { "pid": pid, "org": envvar.GetTestOrgFromEnv(t), "network": networkName, - "subnet": acctest.BootstrapSubnet(t, "gke-cluster", networkName), + "subnet": tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName), "tagKey1": tagKey1, "tagValue1": tags.BootstrapSharedTestProjectTagValue(t, "resourceManagerTags1", tagKey1), "tagKey2": tagKey2, @@ -117,8 +118,8 @@ func TestAccContainerNodePool_basicWithClusterId(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -192,8 +193,8 @@ func TestAccContainerNodePool_namePrefix(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -219,8 +220,8 @@ func TestAccContainerNodePool_noName(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -244,8 +245,8 @@ func TestAccContainerNodePool_withLoggingVariantUpdates(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -285,8 +286,8 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -324,8 +325,8 @@ func TestAccContainerNodePool_withNodeConfigWithBootDiskConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -357,8 +358,8 @@ func TestAccContainerNodePool_withNodeConfigWithBootDiskConfigChangeType(t *test cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -390,8 +391,8 @@ func TestAccContainerNodePool_withNodeConfigWithBootDiskConfigChangeTypeLegacy(t cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -424,8 +425,8 @@ func TestAccContainerNodePool_withLegacyNodeConfigAndBootDiskUpdate(t *testing.T cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -633,8 +634,8 @@ func TestAccContainerNodePool_withTaintsUpdate(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -669,8 +670,8 @@ func TestAccContainerNodePool_withMachineAndDiskUpdate(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -705,8 +706,8 @@ func TestAccContainerNodePool_withReservationAffinity(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -737,8 +738,8 @@ func TestAccContainerNodePool_withReservationAffinitySpecific(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) reservation := fmt.Sprintf("tf-test-reservation-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -775,8 +776,8 @@ func TestAccContainerNodePool_withWorkloadIdentityConfig(t *testing.T) { pid := envvar.GetTestProjectFromEnv() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -817,8 +818,8 @@ func TestAccContainerNodePool_withSandboxConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -847,8 +848,8 @@ func TestAccContainerNodePool_withSandboxConfigType(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -872,8 +873,8 @@ func TestAccContainerNodePool_withKubeletConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -960,8 +961,8 @@ func TestAccContainerNodePool_withInvalidKubeletCpuManagerPolicy(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -981,8 +982,8 @@ func TestAccContainerNodePool_withLinuxNodeConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1024,8 +1025,8 @@ func TestAccContainerNodePool_withSwapConfig_bootDisk(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1078,8 +1079,8 @@ func TestAccContainerNodePool_withSwapConfig_ephemeralLocalSsd(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1107,8 +1108,8 @@ func TestAccContainerNodePool_withSwapConfig_dedicatedLocalSsd(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1173,8 +1174,8 @@ func TestAccContainerNodePool_withCgroupMode(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1207,8 +1208,8 @@ func TestAccContainerNodePool_withHugepageConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1241,8 +1242,8 @@ func TestAccContainerNodePool_withNodeKernelModuleLoading(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1417,8 +1418,8 @@ func TestAccContainerNodePool_withBootDiskKmsKey(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -1450,8 +1451,8 @@ func TestAccContainerNodePool_withUpgradeSettings(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1525,8 +1526,8 @@ func TestAccContainerNodePool_withGPU(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1550,8 +1551,8 @@ func TestAccContainerNodePool_withManagement(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) management := ` management { @@ -1605,8 +1606,8 @@ func TestAccContainerNodePool_withNodeDrainConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1633,8 +1634,8 @@ func TestAccContainerNodePool_withAccurateTimeConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1672,8 +1673,8 @@ func TestAccContainerNodePool_withNodeConfigScopeAlias(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1698,8 +1699,8 @@ func TestAccContainerNodePool_regionalAutoscaling(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1755,8 +1756,8 @@ func TestAccContainerNodePool_totalSize(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1813,8 +1814,8 @@ func TestAccContainerNodePool_autoscaling(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1869,8 +1870,8 @@ func TestAccContainerNodePool_resize(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1908,8 +1909,8 @@ func TestAccContainerNodePool_version(t *testing.T) { t.Parallel() cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1949,8 +1950,8 @@ func TestAccContainerNodePool_regionalClusters(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1974,8 +1975,8 @@ func TestAccContainerNodePool_EmptyGuestAccelerator(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2021,8 +2022,8 @@ func TestAccContainerNodePool_shieldedInstanceConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2048,8 +2049,8 @@ func TestAccContainerNodePool_concurrent(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np1 := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) np2 := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2101,8 +2102,8 @@ func TestAccContainerNodePool_withSoleTenantConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) minNodeCpus := 1 acctest.VcrTest(t, resource.TestCase{ @@ -2130,8 +2131,8 @@ func TestAccContainerNodePool_ephemeralStorageConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2183,8 +2184,8 @@ func TestAccContainerNodePool_ephemeralStorageLocalSsdConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2242,8 +2243,8 @@ func TestAccContainerNodePool_ephemeralStorageLocalSsdConfigWithDataCacheCount(t cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2301,8 +2302,8 @@ func TestAccContainerNodePool_ephemeralStorageLocalSsdConfigOnlyDataCacheCount(t cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2360,8 +2361,8 @@ func TestAccContainerNodePool_localNvmeSsdBlockConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2423,8 +2424,8 @@ func TestAccContainerNodePool_secondaryBootDisks(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2503,8 +2504,8 @@ func TestAccContainerNodePool_gcfsConfig(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2564,8 +2565,8 @@ func TestAccContainerNodePool_gvnic(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2633,8 +2634,8 @@ func TestAccContainerNodePool_fastSocket(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2709,8 +2710,8 @@ func TestAccContainerNodePool_compactPlacement(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2763,8 +2764,8 @@ func TestAccContainerNodePool_customPlacementPolicy(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) policy := fmt.Sprintf("tf-test-policy-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2830,8 +2831,8 @@ func TestAccContainerNodePool_enableQueuedProvisioning(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2901,8 +2902,8 @@ func TestAccContainerNodePool_threadsPerCore(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -2961,8 +2962,8 @@ func TestAccContainerNodePool_nestedVirtualization(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -3023,8 +3024,8 @@ func TestAccContainerNodePool_performanceMonitoringUnit(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5120,8 +5121,8 @@ func TestAccContainerNodePool_withConfidentialNodes(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5206,8 +5207,8 @@ func TestAccContainerNodePool_withLocalSsdEncryptionMode(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5265,8 +5266,8 @@ func TestAccContainerNodePool_withMaxRunDuration(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5360,8 +5361,8 @@ func TestAccContainerNodePool_withFlexStart(t *testing.T) { clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-cluster-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5443,8 +5444,8 @@ func TestAccContainerNodePool_tpuTopology(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np1 := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) np2 := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5515,8 +5516,8 @@ func TestAccContainerNodePool_withHostMaintenancePolicy(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5574,8 +5575,8 @@ func TestAccContainerNodePool_withConfidentialBootDisk(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) kms := acctest.BootstrapKMSKeyInLocation(t, "us-central1") - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -5645,8 +5646,8 @@ func TestAccContainerNodePool_withoutConfidentialBootDisk(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-np-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -5841,8 +5842,8 @@ func TestAccContainerNodePool_privateRegistry(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodepool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) secretID := fmt.Sprintf("tf-test-secret-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6036,8 +6037,8 @@ func TestAccContainerNodePool_writableCgroups(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodepool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6149,8 +6150,8 @@ func TestAccContainerNodePool_registryHosts(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodepool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) secretID := fmt.Sprintf("tf-test-secret-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6285,8 +6286,8 @@ func TestAccContainerNodePool_defaultDriverInstallation(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6353,11 +6354,11 @@ func TestAccContainerNodePool_storagePools(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) np := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) location := envvar.GetTestZoneFromEnv() - storagePoolResourceName := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") + storagePoolResourceName := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -6413,11 +6414,11 @@ func TestAccContainerNodePool_withMachineDiskStoragePoolsUpdate(t *testing.T) { cluster := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10)) nodePool := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10)) - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) location := envvar.GetTestZoneFromEnv() - storagePoolResourceName := acctest.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") + storagePoolResourceName := tpgcompute.BootstrapComputeStoragePool(t, "basic-1", "hyperdisk-balanced") acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go index 91df938b4003..b9744fd9df85 100644 --- a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go +++ b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccDataprocClusterIamBinding(t *testing.T) { @@ -16,9 +17,9 @@ func TestAccDataprocClusterIamBinding(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/clusters/%s %s", envvar.GetTestProjectFromEnv(), "us-central1", cluster, role) @@ -62,9 +63,9 @@ func TestAccDataprocClusterIamMember(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/clusters/%s %s serviceAccount:%s", envvar.GetTestProjectFromEnv(), @@ -104,9 +105,9 @@ func TestAccDataprocClusterIamPolicy(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/clusters/%s", envvar.GetTestProjectFromEnv(), "us-central1", cluster) diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go index bd4ab1f4cd9f..74f6bd4211fd 100644 --- a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go +++ b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccDataprocJobIamBinding(t *testing.T) { @@ -17,9 +18,9 @@ func TestAccDataprocJobIamBinding(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/jobs/%s %s", envvar.GetTestProjectFromEnv(), "us-central1", job, role) @@ -60,9 +61,9 @@ func TestAccDataprocJobIamMember(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/jobs/%s %s serviceAccount:%s", envvar.GetTestProjectFromEnv(), @@ -97,9 +98,9 @@ func TestAccDataprocJobIamPolicy(t *testing.T) { account := "tf-test-dpiam-" + acctest.RandString(t, 10) role := "roles/editor" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) importId := fmt.Sprintf("projects/%s/regions/%s/jobs/%s", envvar.GetTestProjectFromEnv(), "us-central1", job) diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_batch_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_batch_test.go index 9d8e37f801c5..4bb9a99c3e66 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_batch_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_batch_test.go @@ -1,7 +1,15 @@ -package dataproc +package dataproc_test import ( + "fmt" + "log" "testing" + "time" + + "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" + "github.com/hashicorp/terraform-provider-google/google/services/dataproc" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) func TestCloudDataprocBatchRuntimeConfigVersionDiffSuppress(t *testing.T) { @@ -52,8 +60,95 @@ func TestCloudDataprocBatchRuntimeConfigVersionDiffSuppress(t *testing.T) { } for tn, tc := range cases { - if CloudDataprocBatchRuntimeConfigVersionDiffSuppressFunc(tc.Old, tc.New) != tc.ExpectDiffSuppress { + if dataproc.CloudDataprocBatchRuntimeConfigVersionDiffSuppressFunc(tc.Old, tc.New) != tc.ExpectDiffSuppress { t.Errorf("bad: %s, %q => %q expect DiffSuppress to return %t", tn, tc.Old, tc.New, tc.ExpectDiffSuppress) } } } + +func BootstrapSubnetForDataprocBatches(t *testing.T, subnetName string, networkName string) string { + subnetOptions := map[string]interface{}{ + "privateIpGoogleAccess": true, + } + return tpgcompute.BootstrapSubnetWithOverrides(t, subnetName, networkName, subnetOptions) +} + +func BootstrapSubnetWithFirewallForDataprocBatches(t *testing.T, testId string, subnetName string) string { + networkName := tpgcompute.BootstrapSharedTestNetwork(t, testId) + subnetworkName := BootstrapSubnetForDataprocBatches(t, subnetName, networkName) + BootstrapFirewallForDataprocSharedNetwork(t, subnetName, networkName) + return subnetworkName +} + +// The default network within GCP already comes pre configured with +// certain firewall rules open to allow internal communication. As we +// are boostrapping a network for dataproc tests, we need to additionally +// open up similar rules to allow the nodes to talk to each other +// internally as part of their configuration or this will just hang. +const SharedTestFirewallPrefix = "tf-bootstrap-firewall-" + +func BootstrapFirewallForDataprocSharedNetwork(t *testing.T, firewallName string, networkName string) string { + project := envvar.GetTestProjectFromEnv() + firewallName = SharedTestFirewallPrefix + firewallName + + config := transport_tpg.BootstrapConfig(t) + if config == nil { + return "" + } + + log.Printf("[DEBUG] Getting Firewall %q for Network %q", firewallName, networkName) + _, err := tpgcompute.NewClient(config, config.UserAgent).Firewalls.Get(project, firewallName).Do() + if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 404) { + log.Printf("[DEBUG] firewallName %q not found, bootstrapping", firewallName) + url := fmt.Sprintf("%sprojects/%s/global/firewalls", transport_tpg.BaseUrl(tpgcompute.Product, config), project) + + networkId := fmt.Sprintf("projects/%s/global/networks/%s", project, networkName) + allowObj := []interface{}{ + map[string]interface{}{ + "IPProtocol": "icmp", + }, + map[string]interface{}{ + "IPProtocol": "tcp", + "ports": []string{"0-65535"}, + }, + map[string]interface{}{ + "IPProtocol": "udp", + "ports": []string{"0-65535"}, + }, + } + + firewallObj := map[string]interface{}{ + "name": firewallName, + "network": networkId, + "allowed": allowObj, + } + + res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + Config: config, + Method: "POST", + Project: project, + RawURL: url, + UserAgent: config.UserAgent, + Body: firewallObj, + Timeout: 4 * time.Minute, + }) + if err != nil { + t.Fatalf("Error bootstrapping Firewall %q for Network %q: %s", firewallName, networkName, err) + } + + log.Printf("[DEBUG] Waiting for Firewall creation to finish") + err = tpgcompute.ComputeOperationWaitTime(config, res, project, "Error bootstrapping Firewall", config.UserAgent, 4*time.Minute) + if err != nil { + t.Fatalf("Error bootstrapping Firewall %q: %s", firewallName, err) + } + } + + firewall, err := tpgcompute.NewClient(config, config.UserAgent).Firewalls.Get(project, firewallName).Do() + if err != nil { + t.Errorf("Error getting Firewall %q: %s", firewallName, err) + } + if firewall == nil { + t.Fatalf("Error getting Firewall %q: is nil", firewallName) + } + return firewall.Name +} diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go index 3cace0fc20a0..a089c5fb9dbe 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go @@ -1661,7 +1661,7 @@ by Dataproc`, Computed: true, AtLeastOneOf: clusterSoftwareConfigKeys, ForceNew: true, - DiffSuppressFunc: dataprocImageVersionDiffSuppress, + DiffSuppressFunc: DataprocImageVersionDiffSuppress, Description: `The Cloud Dataproc image version to use for the cluster - this controls the sets of software versions installed onto the nodes when you create clusters. If not specified, defaults to the latest version.`, }, "override_properties": { @@ -3534,7 +3534,7 @@ func flattenInitializationActions(nia []*dataproc.NodeInitializationAction) ([]m "script": v.ExecutableFile, } if len(v.ExecutionTimeout) > 0 { - tsec, err := extractInitTimeout(v.ExecutionTimeout) + tsec, err := ExtractInitTimeout(v.ExecutionTimeout) if err != nil { return nil, err } @@ -3833,7 +3833,7 @@ func flattenWorkerInstanceGroupConfig(d *schema.ResourceData, icg *dataproc.Inst return []map[string]interface{}{data} } -func extractInitTimeout(t string) (int, error) { +func ExtractInitTimeout(t string) (int, error) { d, err := time.ParseDuration(t) if err != nil { return 0, err @@ -3889,53 +3889,53 @@ func configOptions(d *schema.ResourceData, option string) (map[string]interface{ return nil, false } -func dataprocImageVersionDiffSuppress(_, old, new string, _ *schema.ResourceData) bool { - oldV, err := parseDataprocImageVersion(old) +func DataprocImageVersionDiffSuppress(_, old, new string, _ *schema.ResourceData) bool { + oldV, err := ParseDataprocImageVersion(old) if err != nil { return false } - newV, err := parseDataprocImageVersion(new) + newV, err := ParseDataprocImageVersion(new) if err != nil { return false } - if newV.major != oldV.major { + if newV.Major != oldV.Major { return false } - if newV.minor != oldV.minor { + if newV.Minor != oldV.Minor { return false } ignoreSubminor := []string{"", "prodcurrent", "prodprevious"} // Only compare subminor version if set to a numeric value in config version. - if !slices.Contains(ignoreSubminor, newV.subminor) && newV.subminor != oldV.subminor { + if !slices.Contains(ignoreSubminor, newV.Subminor) && newV.Subminor != oldV.Subminor { return false } // Only compare os if it is set in config version. - if newV.osName != "" && newV.osName != oldV.osName { + if newV.OsName != "" && newV.OsName != oldV.OsName { return false } return true } -type dataprocImageVersion struct { - major string - minor string - subminor string - osName string +type DataprocImageVersion struct { + Major string + Minor string + Subminor string + OsName string } -func parseDataprocImageVersion(version string) (*dataprocImageVersion, error) { +func ParseDataprocImageVersion(version string) (*DataprocImageVersion, error) { matches := resolveDataprocImageVersion.FindStringSubmatch(version) if len(matches) != 5 { return nil, fmt.Errorf("invalid image version %q", version) } - return &dataprocImageVersion{ - major: matches[1], - minor: matches[2], - subminor: matches[3], - osName: matches[4], + return &DataprocImageVersion{ + Major: matches[1], + Minor: matches[2], + Subminor: matches[3], + OsName: matches[4], }, nil } diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_internal_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_internal_test.go index fb5aa82c4808..21e01b7e4f8a 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_internal_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_internal_test.go @@ -1,13 +1,15 @@ -package dataproc +package dataproc_test import ( "testing" + + "github.com/hashicorp/terraform-provider-google/google/services/dataproc" ) func TestDataprocExtractInitTimeout(t *testing.T) { t.Parallel() - actual, err := extractInitTimeout("500s") + actual, err := dataproc.ExtractInitTimeout("500s") expected := 500 if err != nil { t.Fatalf("Expected %d, but got error %v", expected, err) @@ -20,7 +22,7 @@ func TestDataprocExtractInitTimeout(t *testing.T) { func TestDataprocExtractInitTimeout_nonSeconds(t *testing.T) { t.Parallel() - actual, err := extractInitTimeout("5m") + actual, err := dataproc.ExtractInitTimeout("5m") expected := 300 if err != nil { t.Fatalf("Expected %d, but got error %v", expected, err) @@ -33,7 +35,7 @@ func TestDataprocExtractInitTimeout_nonSeconds(t *testing.T) { func TestDataprocExtractInitTimeout_empty(t *testing.T) { t.Parallel() - _, err := extractInitTimeout("") + _, err := dataproc.ExtractInitTimeout("") expected := "time: invalid duration" if err != nil && err.Error() != expected { return @@ -44,7 +46,7 @@ func TestDataprocExtractInitTimeout_empty(t *testing.T) { func TestDataprocParseImageVersion(t *testing.T) { t.Parallel() - testCases := map[string]dataprocImageVersion{ + testCases := map[string]dataproc.DataprocImageVersion{ "1.2": {"1", "2", "", ""}, "1.2.3": {"1", "2", "3", ""}, "1.2.3rc": {"1", "2", "3rc", ""}, @@ -54,20 +56,20 @@ func TestDataprocParseImageVersion(t *testing.T) { } for v, expected := range testCases { - actual, err := parseDataprocImageVersion(v) - if actual.major != expected.major { + actual, err := dataproc.ParseDataprocImageVersion(v) + if actual.Major != expected.Major { t.Errorf("parsing version %q returned error: %v", v, err) } if err != nil { t.Errorf("parsing version %q returned error: %v", v, err) } - if actual.minor != expected.minor { + if actual.Minor != expected.Minor { t.Errorf("parsing version %q returned error: %v", v, err) } - if actual.subminor != expected.subminor { + if actual.Subminor != expected.Subminor { t.Errorf("parsing version %q returned error: %v", v, err) } - if actual.osName != expected.osName { + if actual.OsName != expected.OsName { t.Errorf("parsing version %q returned error: %v", v, err) } } @@ -79,7 +81,7 @@ func TestDataprocParseImageVersion(t *testing.T) { "1-debian", } for _, v := range errorTestCases { - if _, err := parseDataprocImageVersion(v); err == nil { + if _, err := dataproc.ParseDataprocImageVersion(v); err == nil { t.Errorf("expected parsing invalid version %q to return error", v) } } @@ -114,12 +116,12 @@ func TestDataprocDiffSuppress(t *testing.T) { } for _, tup := range doSuppress { - if !dataprocImageVersionDiffSuppress("", tup[0], tup[1], nil) { + if !dataproc.DataprocImageVersionDiffSuppress("", tup[0], tup[1], nil) { t.Errorf("expected (old: %q, new: %q) to be suppressed", tup[0], tup[1]) } } for _, tup := range noSuppress { - if dataprocImageVersionDiffSuppress("", tup[0], tup[1], nil) { + if dataproc.DataprocImageVersionDiffSuppress("", tup[0], tup[1], nil) { t.Errorf("expected (old: %q, new: %q) to not be suppressed", tup[0], tup[1]) } } diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_migrate.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_migrate.go index 0e503027fbc5..cfd16d501078 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_migrate.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_migrate.go @@ -1147,7 +1147,7 @@ by Dataproc`, Computed: true, AtLeastOneOf: clusterSoftwareConfigKeys, ForceNew: true, - DiffSuppressFunc: dataprocImageVersionDiffSuppress, + DiffSuppressFunc: DataprocImageVersionDiffSuppress, Description: `The Cloud Dataproc image version to use for the cluster - this controls the sets of software versions installed onto the nodes when you create clusters. If not specified, defaults to the latest version.`, }, "override_properties": { diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go index 72cec85239dc..5712902ec4af 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" dataproc_tpg "github.com/hashicorp/terraform-provider-google/google/services/dataproc" "github.com/hashicorp/terraform-provider-google/google/services/storage" "github.com/hashicorp/terraform-provider-google/google/tpgresource" @@ -113,8 +114,8 @@ func TestAccDataprocVirtualCluster_basic(t *testing.T) { rnd := acctest.RandString(t, 10) pid := envvar.GetTestProjectFromEnv() version := "3.5-dataproc-17" - networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "gke-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -154,9 +155,9 @@ func TestAccDataprocCluster_withAccelerators(t *testing.T) { project := envvar.GetTestProjectFromEnv() acceleratorType := "nvidia-tesla-t4" zone := "us-central1-c" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -286,9 +287,9 @@ func TestAccDataprocCluster_withConfidentialCompute(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) imageUri := "https://www.googleapis.com/compute/v1/projects/cloud-dataproc/global/images/dataproc-2-1-ubu20-20241026-165100-rc01" acctest.VcrTest(t, resource.TestCase{ @@ -331,9 +332,9 @@ func TestAccDataprocCluster_withMetadataAndTags(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -361,9 +362,9 @@ func TestAccDataprocCluster_withResourceManagerTags(t *testing.T) { pid := envvar.GetTestProjectFromEnv() projectNumber := envvar.GetTestProjectNumberFromEnv() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) // TODO: remove this IAM binding once tagUser permissions are present in Dataproc Service Agent role. acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -394,9 +395,9 @@ func TestAccDataprocCluster_withMinNumInstances(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -420,9 +421,9 @@ func TestAccDataprocCluster_withReservationAffinity(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -448,9 +449,9 @@ func TestAccDataprocCluster_withDataprocMetricConfig(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -477,9 +478,9 @@ func TestAccDataprocCluster_withNodeGroupAffinity(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -502,9 +503,9 @@ func TestAccDataprocCluster_singleNodeCluster(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -570,9 +571,9 @@ func TestAccDataprocCluster_nonPreemptibleSecondary(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -595,9 +596,9 @@ func TestAccDataprocCluster_spotSecondary(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -803,9 +804,9 @@ func TestAccDataprocCluster_withStagingBucket(t *testing.T) { var cluster dataproc.Cluster clusterName := fmt.Sprintf("tf-test-dproc-%s", rnd) bucketName := fmt.Sprintf("%s-bucket", clusterName) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -838,9 +839,9 @@ func TestAccDataprocCluster_withTempBucket(t *testing.T) { var cluster dataproc.Cluster clusterName := fmt.Sprintf("tf-test-dproc-%s", rnd) bucketName := fmt.Sprintf("%s-temp-bucket", clusterName) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -872,9 +873,9 @@ func TestAccDataprocCluster_withInitAction(t *testing.T) { var cluster dataproc.Cluster bucketName := fmt.Sprintf("tf-test-dproc-%s-init-bucket", rnd) objectName := "msg.txt" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -899,9 +900,9 @@ func TestAccDataprocCluster_withConfigOverrides(t *testing.T) { rnd := acctest.RandString(t, 10) var cluster dataproc.Cluster - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -925,9 +926,9 @@ func TestAccDataprocCluster_withServiceAcc(t *testing.T) { sa := "a" + acctest.RandString(t, 10) saEmail := fmt.Sprintf("%s@%s.iam.gserviceaccount.com", sa, envvar.GetTestProjectFromEnv()) rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster @@ -962,9 +963,9 @@ func TestAccDataprocCluster_withImageVersion(t *testing.T) { rnd := acctest.RandString(t, 10) version := "2.0.35-debian10" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -987,9 +988,9 @@ func TestAccDataprocCluster_withOptionalComponents(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1012,9 +1013,9 @@ func TestAccDataprocCluster_withLifecycleConfigIdleDeleteTtl(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1046,9 +1047,9 @@ func TestAccDataprocCluster_withLifecycleConfigAutoDeletion(t *testing.T) { rnd := acctest.RandString(t, 10) now := time.Now() fmtString := "2006-01-02T15:04:05.072Z" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1076,9 +1077,9 @@ func TestAccDataprocCluster_withLifecycleConfigIdleStopTtl(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1110,9 +1111,9 @@ func TestAccDataprocCluster_withLifecycleConfigAutoStop(t *testing.T) { rnd := acctest.RandString(t, 10) now := time.Now() fmtString := "2006-01-02T15:04:05.072Z" - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1139,9 +1140,9 @@ func TestAccDataprocCluster_withLabels(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1219,9 +1220,9 @@ func TestAccDataprocCluster_withEndpointConfig(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1244,9 +1245,9 @@ func TestAccDataprocCluster_KMS(t *testing.T) { rnd := acctest.RandString(t, 10) kms := acctest.BootstrapKMSKey(t) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.BootstrapIamMembers(t, []acctest.IamMember{ { @@ -1276,9 +1277,9 @@ func TestAccDataprocCluster_withKerberos(t *testing.T) { rnd := acctest.RandString(t, 10) kms := acctest.BootstrapKMSKey(t) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1300,9 +1301,9 @@ func TestAccDataprocCluster_withIdentityConfig(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1325,9 +1326,9 @@ func TestAccDataprocCluster_updateIdentityConfigUserMapping(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster @@ -1358,9 +1359,9 @@ func TestAccDataprocCluster_withAutoscalingPolicy(t *testing.T) { t.Parallel() rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) var cluster dataproc.Cluster acctest.VcrTest(t, resource.TestCase{ @@ -1425,9 +1426,9 @@ func TestAccDataprocCluster_withClusterTier(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1495,9 +1496,9 @@ func TestAccDataprocCluster_withEngine(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1573,9 +1574,9 @@ func TestAccDataprocCluster_withClusterTypeSingleNode(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -1599,9 +1600,9 @@ func TestAccDataprocCluster_withClusterTypeZeroScale(t *testing.T) { var cluster dataproc.Cluster rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go index 5e427a19e75f..04121e0aad72 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_upgrade_test.go @@ -8,6 +8,7 @@ import ( "google.golang.org/api/dataproc/v1" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) // Tests schema version migration by creating a cluster with an old version of the provider (4.65.0) @@ -18,9 +19,9 @@ func TestAccDataprocClusterLabelsMigration_withoutLabels_withoutChanges(t *testi rnd := acctest.RandString(t, 10) var cluster dataproc.Cluster - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) oldVersion := map[string]resource.ExternalProvider{ "google": { @@ -67,9 +68,9 @@ func TestAccDataprocClusterLabelsMigration_withLabels_withoutChanges(t *testing. rnd := acctest.RandString(t, 10) var cluster dataproc.Cluster - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) oldVersion := map[string]resource.ExternalProvider{ "google": { @@ -119,9 +120,9 @@ func TestAccDataprocClusterLabelsMigration_withUpdate(t *testing.T) { rnd := acctest.RandString(t, 10) var cluster dataproc.Cluster - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) oldVersion := map[string]resource.ExternalProvider{ "google": { diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl index 23b016be221b..29623964ad08 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" tpgdataproc "github.com/hashicorp/terraform-provider-google/google/services/dataproc" "github.com/hashicorp/terraform-provider-google/google/services/storage" "github.com/hashicorp/terraform-provider-google/google/tpgresource" @@ -50,9 +51,9 @@ func TestAccDataprocJob_updatable(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) jobId := fmt.Sprintf("tf-test-dproc-update-job-id-%s", rnd) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -83,9 +84,9 @@ func TestAccDataprocJob_PySpark(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) jobId := fmt.Sprintf("tf-test-dproc-custom-job-id-%s", rnd) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -125,9 +126,9 @@ func TestAccDataprocJob_Spark(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -161,9 +162,9 @@ func TestAccDataprocJob_Hadoop(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -197,9 +198,9 @@ func TestAccDataprocJob_Hive(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -233,9 +234,9 @@ func TestAccDataprocJob_Pig(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -297,15 +298,15 @@ func testAccDataprocJobSparkSql(t *testing.T, config string) { func TestAccDataprocJob_SparkSql_QueryList(t *testing.T) { rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) testAccDataprocJobSparkSql(t, testAccDataprocJob_SparkSql_QueryList(rnd, subnetworkName)) } func TestAccDataprocJob_SparkSql_QueryFile(t *testing.T) { rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) testAccDataprocJobSparkSql(t, testAccDataprocJob_SparkSql_QueryFile(rnd, subnetworkName)) } @@ -314,9 +315,9 @@ func TestAccDataprocJob_Presto(t *testing.T) { var job dataproc.Job rnd := acctest.RandString(t, 10) - networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") - subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) - acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, "dataproc-cluster") + subnetworkName := tpgcompute.BootstrapSubnet(t, "dataproc-cluster", networkName) + BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_session_template_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_session_template_test.go index c336f6ac7d90..e20f004f6c78 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_session_template_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_session_template_test.go @@ -24,7 +24,7 @@ func TestAccDataprocSessionTemplate_update(t *testing.T) { "project_name": envvar.GetTestProjectFromEnv(), "kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-dataproc-session-template-key1").CryptoKey.Name, "prevent_destroy": false, - "subnetwork_name": acctest.BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork"), + "subnetwork_name": BootstrapSubnetWithFirewallForDataprocBatches(t, "jupyer-session-test-network", "jupyter-session-test-subnetwork"), "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go index 658e79ce5b0b..3609c9490df0 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -15,8 +16,8 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) { context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), "random_suffix": acctest.RandString(t, 10), - "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), - "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"), + "subnetwork_name": tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")), } acctest.VcrTest(t, resource.TestCase{ @@ -171,7 +172,7 @@ resource "google_container_cluster" "primary" { network = "%{network_name}" subnetwork = "%{subnetwork_name}" } - + resource "google_gke_backup_backup_plan" "backupplan" { name = "tf-test-testplan%{random_suffix}" cluster = google_container_cluster.primary.id @@ -222,7 +223,7 @@ resource "google_container_cluster" "primary" { network = "%{network_name}" subnetwork = "%{subnetwork_name}" } - + resource "google_gke_backup_backup_plan" "backupplan" { name = "tf-test-testplan%{random_suffix}" cluster = google_container_cluster.primary.id @@ -296,7 +297,7 @@ resource "google_container_cluster" "primary" { network = "%{network_name}" subnetwork = "%{subnetwork_name}" } - + resource "google_gke_backup_backup_plan" "backupplan" { name = "tf-test-testplan%{random_suffix}" cluster = google_container_cluster.primary.id diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go index 04c53ad5f927..7f18378d266f 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go @@ -6,6 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccGKEBackupRestorePlan_update(t *testing.T) { @@ -14,8 +15,8 @@ func TestAccGKEBackupRestorePlan_update(t *testing.T) { context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), "deletion_protection": false, - "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), - "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"), + "subnetwork_name": tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")), "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go index 9f8b0530e171..c94571e5304c 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample_update(t *testing.T) { @@ -18,8 +19,8 @@ func TestAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample_update( "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), "random_suffix": acctest.RandString(t, 10), - "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), - "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster"), + "subnetwork_name": tpgcompute.BootstrapSubnet(t, "gke-cluster", tpgcompute.BootstrapSharedTestNetwork(t, "gke-cluster")), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/lustre/data_source_lustre_instance_test.go b/mmv1/third_party/terraform/services/lustre/data_source_lustre_instance_test.go index e369beca67db..d68e270e6398 100644 --- a/mmv1/third_party/terraform/services/lustre/data_source_lustre_instance_test.go +++ b/mmv1/third_party/terraform/services/lustre/data_source_lustre_instance_test.go @@ -5,13 +5,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccLustreInstanceDatasource_basic(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/lustre/resource_lustre_instance_test.go b/mmv1/third_party/terraform/services/lustre/resource_lustre_instance_test.go index 131891b82ddf..83b21e62ecb7 100644 --- a/mmv1/third_party/terraform/services/lustre/resource_lustre_instance_test.go +++ b/mmv1/third_party/terraform/services/lustre/resource_lustre_instance_test.go @@ -7,13 +7,14 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" ) func TestAccLustreInstance_withMaintenancePolicy(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } @@ -93,7 +94,7 @@ func TestAccLustreInstance_update(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } @@ -164,7 +165,7 @@ func TestAccLustreInstance_withAccessRulesOptions(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } @@ -279,7 +280,7 @@ func TestAccLustreInstance_withKmsKey(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), "kms": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name, } @@ -371,7 +372,7 @@ func TestAccLustreInstance_withPlacementPolicy(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } @@ -434,7 +435,7 @@ func TestAccLustreInstance_dynamicTier(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "network_name": acctest.BootstrapSharedTestNetwork(t, "default-vpc"), + "network_name": tpgcompute.BootstrapSharedTestNetwork(t, "default-vpc"), "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl index 57cb3114a070..68cf5b13c06f 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" "github.com/hashicorp/terraform-provider-google/google/services/sql" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-plugin-testing/helper/resource" {{- if ne $.TargetVersionName "ga" }} @@ -326,7 +327,7 @@ func TestAccSqlDatabaseInstance_deleteDefaultUserBeforeSubsequentApiCalls(t *tes databaseName := "tf-test-" + acctest.RandString(t, 10) testId := "sql-instance-clone-2" - addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId) + addressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId) networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId) // 1. Create an instance. @@ -1236,7 +1237,7 @@ func TestAccSqlDatabaseInstance_withPSCEnabled_withPscAutoConnections(t *testing testId := "test-psc-auto-con-1" instanceName := "tf-test-" + acctest.RandString(t, 10) projectId := envvar.GetTestProjectFromEnv() - networkName := acctest.BootstrapSharedTestNetwork(t, testId) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, testId) network_short_link_name := fmt.Sprintf("projects/%s/global/networks/%s", projectId, networkName) acctest.VcrTest(t, resource.TestCase{ @@ -1265,7 +1266,7 @@ func TestAccSqlDatabaseInstance_withPSCEnabled_thenAddPscAutoConnections_thenRem testId := "test-psc-auto-con-2" instanceName := "tf-test-" + acctest.RandString(t, 10) projectId := envvar.GetTestProjectFromEnv() - networkName := acctest.BootstrapSharedTestNetwork(t, testId) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, testId) network_short_link_name := fmt.Sprintf("projects/%s/global/networks/%s", projectId, networkName) acctest.VcrTest(t, resource.TestCase{ @@ -1334,9 +1335,9 @@ func TestAccSqlDatabaseInstance_withPscEnabled_withNetworkAttachmentUri_thenRemo networkNameStr := "tf-test-cloud-sql-network-psc-1" subnetworkNameStr := "tf-test-cloud-sql-subnetwork-psc-1" networkAttachmentNameStr := "tf-test-cloud-sql-update-na-psc-1" - networkName := acctest.BootstrapSharedTestNetwork(t, networkNameStr) - subnetworkName := acctest.BootstrapSubnet(t, subnetworkNameStr, networkName) - networkAttachmentName := acctest.BootstrapNetworkAttachment(t, networkAttachmentNameStr, subnetworkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, networkNameStr) + subnetworkName := tpgcompute.BootstrapSubnet(t, subnetworkNameStr, networkName) + networkAttachmentName := tpgcompute.BootstrapNetworkAttachment(t, networkAttachmentNameStr, subnetworkName) networkAttachmentUri := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", projectId, region, networkAttachmentName) @@ -1385,9 +1386,9 @@ func TestAccSqlDatabaseInstance_withPscEnabled_withNetworkAttachmentUriOnCreate( networkNameStr := "tf-test-cloud-sql-network-psc-2" subnetworkNameStr := "tf-test-cloud-sql-subnetwork-psc-2" networkAttachmentNameStr := "tf-test-cloud-sql-update-na-psc-2" - networkName := acctest.BootstrapSharedTestNetwork(t, networkNameStr) - subnetworkName := acctest.BootstrapSubnet(t, subnetworkNameStr, networkName) - networkAttachmentName := acctest.BootstrapNetworkAttachment(t, networkAttachmentNameStr, subnetworkName) + networkName := tpgcompute.BootstrapSharedTestNetwork(t, networkNameStr) + subnetworkName := tpgcompute.BootstrapSubnet(t, subnetworkNameStr, networkName) + networkAttachmentName := tpgcompute.BootstrapNetworkAttachment(t, networkAttachmentNameStr, subnetworkName) networkAttachmentUri := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", projectId, region, networkAttachmentName) @@ -1411,11 +1412,11 @@ func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange(t *testi databaseName := "tf-test-" + acctest.RandString(t, 10) testId := "sql-instance-allocated-1" - addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId) + addressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId) networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId) updateTestId := "sql-instance-allocated-update-1" - addressName_update := acctest.BootstrapSharedTestGlobalAddress(t, updateTestId) + addressName_update := tpgcompute.BootstrapSharedTestGlobalAddress(t, updateTestId) networkName_update := acctest.BootstrapSharedServiceNetworkingConnection(t, updateTestId) acctest.VcrTest(t, resource.TestCase{ @@ -1452,7 +1453,7 @@ func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeReplica(t databaseName := "tf-test-" + acctest.RandString(t, 10) testId := "sql-instance-replica-1" - addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId) + addressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId) networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId) acctest.VcrTest(t, resource.TestCase{ @@ -1485,7 +1486,7 @@ func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeClone(t * databaseName := "tf-test-" + acctest.RandString(t, 10) testId := "sql-instance-clone-1" - addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId) + addressName := tpgcompute.BootstrapSharedTestGlobalAddress(t, testId) networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId) acctest.VcrTest(t, resource.TestCase{ From 77ef00b86b9c78ce5e5b6ee46c03defe330dfd4f Mon Sep 17 00:00:00 2001 From: Shuya Ma <87669292+shuyama1@users.noreply.github.com> Date: Fri, 8 May 2026 13:16:20 -0700 Subject: [PATCH 07/11] Bump TeamCity execution timeout (#17484) --- mmv1/third_party/terraform/.teamcity/components/constants.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/.teamcity/components/constants.kt b/mmv1/third_party/terraform/.teamcity/components/constants.kt index 940181ade746..ca3115bf3bd5 100644 --- a/mmv1/third_party/terraform/.teamcity/components/constants.kt +++ b/mmv1/third_party/terraform/.teamcity/components/constants.kt @@ -30,7 +30,7 @@ const val DefaultDaysOfMonth = "*" const val DefaultBranchName = "refs/heads/nightly-test" // Value used to make long-running builds fail due to a timeout -const val DefaultBuildTimeoutDuration = 60 * 15 // 15 hours in minutes +const val DefaultBuildTimeoutDuration = 60 * 18 // 18 hours in minutes // Values used to define and reference Shared Resource locks, used to avoid conflicting builds const val SharedResourceNameGa = "ci-test-project-nightly-ga Service Lock" @@ -50,4 +50,4 @@ const val VcrRecordingProjectId = "VCRRecording" // Artifact rules controls which artifacts are uploaded to S3 // https://www.jetbrains.com/help/teamcity/2024.07/configuring-general-settings.html#Artifact+Paths // The value below lacks a file extension, to allow upload of individual .txt files or a single .tar.gz file -const val ArtifactRules = "%teamcity.build.checkoutDir%/debug*" \ No newline at end of file +const val ArtifactRules = "%teamcity.build.checkoutDir%/debug*" From a18ab4f2817ef44f7d9e8a03275ae1b8c0370922 Mon Sep 17 00:00:00 2001 From: Shuya Ma <87669292+shuyama1@users.noreply.github.com> Date: Fri, 8 May 2026 13:21:05 -0700 Subject: [PATCH 08/11] support sample-based templates in unused-template-check (#17474) --- .../cmd/testdata/resource1.yaml | 7 +++ tools/template-check/cmd/unusedtmpl.go | 61 +++++++++++++++++-- tools/template-check/cmd/unusedtmpl_test.go | 27 +++++++- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/tools/template-check/cmd/testdata/resource1.yaml b/tools/template-check/cmd/testdata/resource1.yaml index 23e0b7095803..d214cee8f592 100644 --- a/tools/template-check/cmd/testdata/resource1.yaml +++ b/tools/template-check/cmd/testdata/resource1.yaml @@ -58,3 +58,10 @@ properties: type: String description: Service id of the App Engine application required: true + +samples: + - name: "sample1" + steps: + - name: "step1" + - name: "step2" + config_path: "custom/path/to/step2.tf.tmpl" diff --git a/tools/template-check/cmd/unusedtmpl.go b/tools/template-check/cmd/unusedtmpl.go index b826e906aaa6..ef052a01ead3 100644 --- a/tools/template-check/cmd/unusedtmpl.go +++ b/tools/template-check/cmd/unusedtmpl.go @@ -16,6 +16,7 @@ import ( const unusedTmplDesc = "Check whether any template files are not used in product yamls" var exampleFilePathReg = regexp.MustCompile(".*mmv1/templates/terraform/examples/([a-zA-Z0-9_-]+).tf.tmpl") +var sampleFilePathReg = regexp.MustCompile(".*mmv1/templates/terraform/samples/services/.*\\.tf\\.tmpl") type unusedTmplOptions struct { rootOptions *rootOptions @@ -29,8 +30,15 @@ type tree struct { type resourceYaml struct { Examples []struct { - Name string - } + Name string `yaml:"name"` + } `yaml:"examples,omitempty"` + Samples []struct { + Name string `yaml:"name"` + Steps []struct { + Name string `yaml:"name"` + ConfigPath string `yaml:"config_path,omitempty"` + } `yaml:"steps"` + } `yaml:"samples,omitempty"` } func newUnusedTmplCmd(rootOptions *rootOptions) *cobra.Command { @@ -54,7 +62,7 @@ func (o *unusedTmplOptions) run() error { if len(o.fileList) == 0 { return nil } - newCustomTmpls, newExamples := processInputFiles(o.fileList) + newCustomTmpls, newExamples, newSamples := processInputFiles(o.fileList) found := false // get repo dir from tmpl files @@ -93,16 +101,31 @@ func (o *unusedTmplOptions) run() error { } } + if len(newSamples) > 0 { + samples, err := findSamples(productFiles) + if err != nil { + return err + } + for _, file := range newSamples { + templatePath := strings.ReplaceAll(file, repoPath+"/mmv1/", "") + if _, ok := samples[templatePath]; !ok { + found = true + fmt.Fprintf(os.Stderr, "File %s not used in any product yaml.\n", file) + } + } + } if found { return fmt.Errorf("found templates not used") } return nil } -func processInputFiles(fileList []string) (customTmpls []string, examples []string) { +func processInputFiles(fileList []string) (customTmpls []string, examples []string, samples []string) { for _, v := range fileList { if exampleFilePathReg.MatchString(v) { examples = append(examples, v) + } else if sampleFilePathReg.MatchString(v) { + samples = append(samples, v) } else if strings.Contains(v, "mmv1/templates/terraform") && strings.HasSuffix(v, ".tmpl") { customTmpls = append(customTmpls, v) } else { @@ -254,3 +277,33 @@ func findExamples(yamlFiles []string) (map[string]bool, error) { } return allExamples, nil } + +// findSamples parsed yaml files to get samples. +// It returns a map of samples where the key is the inferred sample path. +func findSamples(yamlFiles []string) (map[string]bool, error) { + allSamples := map[string]bool{} + for _, yamlFile := range yamlFiles { + b, err := os.ReadFile(yamlFile) + if err != nil { + return nil, err + } + + var r resourceYaml + if err := yaml.Unmarshal(b, &r); err != nil { + return nil, fmt.Errorf("failed to unmarshal yaml file for samples %s: %s", yamlFile, err) + } + packageName := filepath.Base(filepath.Dir(yamlFile)) + for _, sample := range r.Samples { + for _, step := range sample.Steps { + var tmplPath string + if step.ConfigPath != "" { + tmplPath = step.ConfigPath + } else { + tmplPath = fmt.Sprintf("templates/terraform/samples/services/%s/%s.tf.tmpl", packageName, step.Name) + } + allSamples[tmplPath] = true + } + } + } + return allSamples, nil +} diff --git a/tools/template-check/cmd/unusedtmpl_test.go b/tools/template-check/cmd/unusedtmpl_test.go index a9c1961b808f..b01a49a392a4 100644 --- a/tools/template-check/cmd/unusedtmpl_test.go +++ b/tools/template-check/cmd/unusedtmpl_test.go @@ -12,14 +12,17 @@ func TestProcessInput(t *testing.T) { "mmv1/templates/terraform/examples/abc.go.tmpl", "mmv1/templates/terraform/examples/subfolder/abc.tf.tmpl", "mmv1/templates/terraform/custom_flatten/abc.go.tmpl", + "mmv1/templates/terraform/samples/services/workstations/workstation_cluster_custom_urls.tf.tmpl", } - tmpl, examples := processInputFiles(fileList) - wantTmpl, wantExamples := []string{ + tmpl, examples, samples := processInputFiles(fileList) + wantTmpl, wantExamples, wantSamples := []string{ "mmv1/templates/terraform/examples/abc.go.tmpl", "mmv1/templates/terraform/examples/subfolder/abc.tf.tmpl", "mmv1/templates/terraform/custom_flatten/abc.go.tmpl", }, []string{ "mmv1/templates/terraform/examples/abc.tf.tmpl", + }, []string{ + "mmv1/templates/terraform/samples/services/workstations/workstation_cluster_custom_urls.tf.tmpl", } if diff := cmp.Diff(wantTmpl, tmpl); diff != "" { @@ -28,6 +31,9 @@ func TestProcessInput(t *testing.T) { if diff := cmp.Diff(wantExamples, examples); diff != "" { t.Errorf("processInputFiles() got diff(-want, got) for example files = %s", diff) } + if diff := cmp.Diff(wantSamples, samples); diff != "" { + t.Errorf("processInputFiles() got diff(-want, got) for sample files = %s", diff) + } } func TestFindTmpls(t *testing.T) { @@ -52,6 +58,7 @@ func TestFindTmpls(t *testing.T) { "templates/terraform/custom_flatten/bigquery_dataset_ref.go.tmpl": true, "templates/terraform/iam/example_config_body/app_engine_service.tf.tmpl": true, "templates/terraform/state_migrations/big_query_job.go.tmpl": true, + "custom/path/to/step2.tf.tmpl": true, } if diff := cmp.Diff(want, got); diff != "" { t.Errorf("findTmpls() got unexpected diff(-want, got) = %s", diff) @@ -84,3 +91,19 @@ func TestFindExamples(t *testing.T) { t.Errorf("findExamples() got unexpected diff(-want, got) = %s", diff) } } + +func TestFindSamples(t *testing.T) { + yamlFiles := []string{"testdata/resource1.yaml"} + got, err := findSamples(yamlFiles) + if err != nil { + t.Fatal(err) + } + + want := map[string]bool{ + "templates/terraform/samples/services/testdata/step1.tf.tmpl": true, + "custom/path/to/step2.tf.tmpl": true, + } + if diff := cmp.Diff(want, got); diff != "" { + t.Errorf("findSamples() got unexpected diff(-want, got) = %s", diff) + } +} From ac45a1e1b45181ebb69e3b596d41bbabab1a58f3 Mon Sep 17 00:00:00 2001 From: arakaki Date: Sat, 9 May 2026 06:15:48 +0900 Subject: [PATCH 09/11] fix(bigqueryconnection): flatten authentication fields from API response (#17341) --- .../bigqueryconnection/Connection.yaml | 4 +-- ...nfiguration_authentication_flatten.go.tmpl | 27 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/mmv1/products/bigqueryconnection/Connection.yaml b/mmv1/products/bigqueryconnection/Connection.yaml index 345fb064c20e..3973420c6621 100644 --- a/mmv1/products/bigqueryconnection/Connection.yaml +++ b/mmv1/products/bigqueryconnection/Connection.yaml @@ -163,8 +163,8 @@ examples: username: '"user" + randomSuffix' password: '"password"' ignore_read_extra: - # username and password are not returned by the API - - 'configuration.0.authentication.0.username_password.0.username' + # The plaintext password is redacted by the API on read, so it cannot + # be verified against the original config. - 'configuration.0.authentication.0.username_password.0.password' external_providers: ["random", "time"] # Random provider diff --git a/mmv1/templates/terraform/custom_flatten/bigquery_connection_configuration_authentication_flatten.go.tmpl b/mmv1/templates/terraform/custom_flatten/bigquery_connection_configuration_authentication_flatten.go.tmpl index 09f47bf56fb4..8c32dbf5621e 100644 --- a/mmv1/templates/terraform/custom_flatten/bigquery_connection_configuration_authentication_flatten.go.tmpl +++ b/mmv1/templates/terraform/custom_flatten/bigquery_connection_configuration_authentication_flatten.go.tmpl @@ -11,14 +11,29 @@ limitations under the License. */ -}} func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if v == nil { + return nil + } + original := v.(map[string]interface{}) + if len(original) == 0 { + return nil + } + + password := map[string]interface{}{ + // The API redacts the plaintext on read, so we keep the value from + // state to avoid a permadiff. + "plaintext": d.Get("configuration.0.authentication.0.username_password.0.password.0.plaintext"), + } + if originalPassword, ok := original["password"].(map[string]interface{}); ok { + if secretType, ok := originalPassword["secretType"]; ok { + password["secret_type"] = secretType + } + } + return []interface{}{ map[string]interface{}{ - "username": d.Get("configuration.0.authentication.0.username_password.0.username"), - "password": []interface{}{ - map[string]interface{}{ - "plaintext": d.Get("configuration.0.authentication.0.username_password.0.password.0.plaintext"), - }, - }, + "username": original["username"], + "password": []interface{}{password}, }, } } From 8d7f85bbb6c8c50804a55910d18dc8ea6924fea3 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Fri, 8 May 2026 14:37:42 -0700 Subject: [PATCH 10/11] tgc: fix TestAccDatastreamPrivateConnection test (#17486) --- mmv1/products/datastream/PrivateConnection.yaml | 2 ++ .../decoders/datastream_private_connection.go.tmpl | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 mmv1/templates/tgc_next/decoders/datastream_private_connection.go.tmpl diff --git a/mmv1/products/datastream/PrivateConnection.yaml b/mmv1/products/datastream/PrivateConnection.yaml index 9ce58699aaa1..fb991a274516 100644 --- a/mmv1/products/datastream/PrivateConnection.yaml +++ b/mmv1/products/datastream/PrivateConnection.yaml @@ -43,6 +43,7 @@ custom_code: post_create: 'templates/terraform/post_create/private_connection.go.tmpl' pre_delete: 'templates/terraform/pre_delete/private_connection.go.tmpl' post_import: 'templates/terraform/post_import/private_connection.go.tmpl' + tgc_decoder: 'templates/tgc_next/decoders/datastream_private_connection.go.tmpl' include_in_tgc_next: true schema_version: 1 state_upgraders: true @@ -165,6 +166,7 @@ properties: A free subnet for peering. (CIDR of /29) required: true - name: 'pscInterfaceConfig' + is_missing_in_cai: true type: NestedObject description: | The PSC Interface configuration is used to create PSC Interface diff --git a/mmv1/templates/tgc_next/decoders/datastream_private_connection.go.tmpl b/mmv1/templates/tgc_next/decoders/datastream_private_connection.go.tmpl new file mode 100644 index 000000000000..8b9953f425bd --- /dev/null +++ b/mmv1/templates/tgc_next/decoders/datastream_private_connection.go.tmpl @@ -0,0 +1,10 @@ +if _, ok := res["pscInterfaceConfig"]; !ok { + if _, ok := res["vpcPeeringConfig"]; !ok { + // Both are missing! Inject one to satisfy schema. + // We default to pscInterfaceConfig as that's what the failing test intends. + res["pscInterfaceConfig"] = map[string]interface{}{ + "networkAttachment": "unknown", + } + } +} +return res, hclData, nil From c2ee27ba8e96246984f54a628d49cb95517f230e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Braun Date: Sat, 9 May 2026 02:36:02 +0200 Subject: [PATCH 11/11] redis: tolerate missing redis.instances.getAuthString permission on Read (#24784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When auth_enabled is true, the Decoder calls /authString to populate auth_string. That endpoint requires redis.instances.getAuthString — a broader permission than redis.instances.get. Previously a 403 there made plan fail for callers with read-only roles such as roles/viewer. Treat any error fetching the auth string as recoverable: log a warning and clear auth_string in state so plan/read can proceed. Co-Authored-By: Claude Opus 4.7 --- .../terraform/decoders/redis_instance.go.tmpl | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mmv1/templates/terraform/decoders/redis_instance.go.tmpl b/mmv1/templates/terraform/decoders/redis_instance.go.tmpl index 148c3a0efd42..c06ffe0038a1 100644 --- a/mmv1/templates/terraform/decoders/redis_instance.go.tmpl +++ b/mmv1/templates/terraform/decoders/redis_instance.go.tmpl @@ -26,7 +26,7 @@ if v, ok := res["authEnabled"].(bool); ok { billingProject = bp } - res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ + authRes, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ Config: config, Method: "GET", Project: billingProject, @@ -34,10 +34,16 @@ if v, ok := res["authEnabled"].(bool); ok { UserAgent: userAgent, }) if err != nil { - return nil, fmt.Errorf("Error reading AuthString: %s", err) - } - - if err := d.Set("auth_string", res["authString"]); err != nil { + // Reading the auth string requires the redis.instances.getAuthString + // permission, which is broader than the redis.instances.get permission + // needed to plan/read the instance itself. To allow plans from + // least-privilege accounts (e.g. roles/viewer), don't fail the Read + // when the auth string is unreadable; just clear the value. + log.Printf("[WARN] Unable to fetch authString for redis instance (auth_enabled=true): %s", err) + if err := d.Set("auth_string", ""); err != nil { + return nil, fmt.Errorf("Error reading Instance: %s", err) + } + } else if err := d.Set("auth_string", authRes["authString"]); err != nil { return nil, fmt.Errorf("Error reading Instance: %s", err) } }