Moved compute-related bootstrapping into the compute package

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'

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

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'

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

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'

mmv1/products/gkebackup/BackupPlan.yaml

@@ -44,6 +44,7 @@
     - '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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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:
@@ -380,7 +381,7 @@
                           - 'FRIDAY'
                           - 'SATURDAY'
                           - 'SUNDAY'
             # Exclusion Window Object - End
   - name: 'etag'
     type: String
     description: |