Temporary fix for TGC tests (#9116)

GoogleCloudPlatform · Sep 28, 2023 · d7c4745 · d7c4745
1 parent b4e3fd4
commit d7c4745
Show file tree

Hide file tree

Showing 55 changed files with 32 additions and 79 deletions.
diff --git a/...ss_context_manager_service_perimeter.json → ...ss_context_manager_service_perimeter.json b/...ss_context_manager_service_perimeter.json → ...ss_context_manager_service_perimeter.json
diff --git a/...cess_context_manager_service_perimeter.tf → ...cess_context_manager_service_perimeter.tf b/...cess_context_manager_service_perimeter.tf → ...cess_context_manager_service_perimeter.tf
diff --git a/...ext_manager_service_perimeter.tfplan.json → ...ext_manager_service_perimeter.tfplan.json b/...ext_manager_service_perimeter.tfplan.json → ...ext_manager_service_perimeter.tfplan.json
diff --git a/.../tests/data/example_bigquery_dataset.json → ...ata-ignored/example_bigquery_dataset.json b/.../tests/data/example_bigquery_dataset.json → ...ata-ignored/example_bigquery_dataset.json
@@ -13,12 +13,9 @@
         "datasetReference": {
           "datasetId": "test-dataset"
         },
-        "labels": {
-          "env": "dev"
-        },
         "location": "EU",
         "defaultTableExpirationMs": 3.6e+06
       }
     }
   }
-]
+]
diff --git a/...gc/tests/data/example_bigquery_dataset.tf → .../data-ignored/example_bigquery_dataset.tf b/...gc/tests/data/example_bigquery_dataset.tf → .../data-ignored/example_bigquery_dataset.tf
diff --git a/...data/example_bigquery_dataset.tfplan.json → ...ored/example_bigquery_dataset.tfplan.json b/...data/example_bigquery_dataset.tfplan.json → ...ored/example_bigquery_dataset.tfplan.json
diff --git a/...example_bigquery_dataset_iam_binding.json → ...example_bigquery_dataset_iam_binding.json b/...example_bigquery_dataset_iam_binding.json → ...example_bigquery_dataset_iam_binding.json
@@ -13,9 +13,6 @@
           "datasetId": "test-dataset"
         },
         "defaultTableExpirationMs": 3600000,
-        "labels": {
-          "env": "dev"
-        },
         "location": "EU",
         "friendlyName": ""
       }
@@ -32,4 +29,4 @@
       ]
     }
   }
-]
+]
diff --git a/...a/example_bigquery_dataset_iam_binding.tf → ...d/example_bigquery_dataset_iam_binding.tf b/...a/example_bigquery_dataset_iam_binding.tf → ...d/example_bigquery_dataset_iam_binding.tf
diff --git a/..._bigquery_dataset_iam_binding.tfplan.json → ..._bigquery_dataset_iam_binding.tfplan.json b/..._bigquery_dataset_iam_binding.tfplan.json → ..._bigquery_dataset_iam_binding.tfplan.json
diff --git a/.../example_bigquery_dataset_iam_member.json → .../example_bigquery_dataset_iam_member.json b/.../example_bigquery_dataset_iam_member.json → .../example_bigquery_dataset_iam_member.json
@@ -13,9 +13,6 @@
           "datasetId": "test-dataset"
         },
         "defaultTableExpirationMs": 3600000,
-        "labels": {
-          "env": "dev"
-        },
         "location": "EU",
         "friendlyName": ""
       }
@@ -31,4 +28,4 @@
       ]
     }
   }
-]
+]
diff --git a/...ta/example_bigquery_dataset_iam_member.tf → ...ed/example_bigquery_dataset_iam_member.tf b/...ta/example_bigquery_dataset_iam_member.tf → ...ed/example_bigquery_dataset_iam_member.tf
diff --git a/...e_bigquery_dataset_iam_member.tfplan.json → ...e_bigquery_dataset_iam_member.tfplan.json b/...e_bigquery_dataset_iam_member.tfplan.json → ...e_bigquery_dataset_iam_member.tfplan.json
diff --git a/.../example_bigquery_dataset_iam_policy.json → .../example_bigquery_dataset_iam_policy.json b/.../example_bigquery_dataset_iam_policy.json → .../example_bigquery_dataset_iam_policy.json
@@ -13,9 +13,6 @@
           "datasetId": "test-dataset"
         },
         "defaultTableExpirationMs": 3600000,
-        "labels": {
-          "env": "dev"
-        },
         "location": "EU",
         "friendlyName": ""
       }
@@ -32,4 +29,4 @@
       ]
     }
   }
-]
+]
diff --git a/...ta/example_bigquery_dataset_iam_policy.tf → ...ed/example_bigquery_dataset_iam_policy.tf b/...ta/example_bigquery_dataset_iam_policy.tf → ...ed/example_bigquery_dataset_iam_policy.tf
diff --git a/...e_bigquery_dataset_iam_policy.tfplan.json → ...e_bigquery_dataset_iam_policy.tfplan.json b/...e_bigquery_dataset_iam_policy.tfplan.json → ...e_bigquery_dataset_iam_policy.tfplan.json
diff --git a/...dataset_iam_policy_empty_policy_data.json → ...dataset_iam_policy_empty_policy_data.json b/...dataset_iam_policy_empty_policy_data.json → ...dataset_iam_policy_empty_policy_data.json
diff --git a/...y_dataset_iam_policy_empty_policy_data.tf → ...y_dataset_iam_policy_empty_policy_data.tf b/...y_dataset_iam_policy_empty_policy_data.tf → ...y_dataset_iam_policy_empty_policy_data.tf
diff --git a/..._iam_policy_empty_policy_data.tfplan.json → ..._iam_policy_empty_policy_data.tfplan.json b/..._iam_policy_empty_policy_data.tfplan.json → ..._iam_policy_empty_policy_data.tfplan.json
diff --git a/...tests/data/example_cloud_run_service.json → ...ta-ignored/example_cloud_run_service.json b/...tests/data/example_cloud_run_service.json → ...ta-ignored/example_cloud_run_service.json
@@ -12,9 +12,6 @@
         "apiVersion": "serving.knative.dev/v1",
         "kind": "Service",
         "metadata": {
-          "annotations": {
-            "generated-by": "magic-modules"
-          },
           "name": "cloudrun-to-get-cai",
           "namespace": "{{.Provider.project}}"
         },
@@ -48,4 +45,4 @@
       }
     }
   }
-]
+]
diff --git a/...c/tests/data/example_cloud_run_service.tf → ...data-ignored/example_cloud_run_service.tf b/...c/tests/data/example_cloud_run_service.tf → ...data-ignored/example_cloud_run_service.tf
diff --git a/...ata/example_cloud_run_service.tfplan.json → ...red/example_cloud_run_service.tfplan.json b/...ata/example_cloud_run_service.tfplan.json → ...red/example_cloud_run_service.tfplan.json
diff --git a/.../tgc/tests/data/example_compute_disk.json → ...ts/data-ignored/example_compute_disk.json b/.../tgc/tests/data/example_compute_disk.json → ...ts/data-ignored/example_compute_disk.json
@@ -9,9 +9,6 @@
       "discovery_name": "Disk",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
-        "labels": {
-          "environment": "dev"
-        },
         "name": "test-disk",
         "physicalBlockSizeBytes": 4096,
         "sourceImage": "projects/debian-cloud/global/images/debian-8-jessie-v20170523",
@@ -20,4 +17,4 @@
       }
     }
   }
-]
+]
diff --git a/...ty/tgc/tests/data/example_compute_disk.tf → ...ests/data-ignored/example_compute_disk.tf b/...ty/tgc/tests/data/example_compute_disk.tf → ...ests/data-ignored/example_compute_disk.tf
diff --git a/...sts/data/example_compute_disk.tfplan.json → ...-ignored/example_compute_disk.tfplan.json b/...sts/data/example_compute_disk.tfplan.json → ...-ignored/example_compute_disk.tfplan.json
diff --git a/...ata/example_compute_disk_empty_image.json → ...red/example_compute_disk_empty_image.json b/...ata/example_compute_disk_empty_image.json → ...red/example_compute_disk_empty_image.json
@@ -9,14 +9,11 @@
       "discovery_name": "Disk",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
-        "labels": {
-          "environment": "dev"
-        },
         "name": "test-disk",
         "physicalBlockSizeBytes": 4096,
         "type": "projects/{{.Provider.project}}/zones/us-central1-a/diskTypes/pd-ssd",
         "zone": "projects/{{.Provider.project}}/global/zones/us-central1-a"
       }
     }
   }
-]
+]
diff --git a/.../data/example_compute_disk_empty_image.tf → ...nored/example_compute_disk_empty_image.tf b/.../data/example_compute_disk_empty_image.tf → ...nored/example_compute_disk_empty_image.tf
diff --git a/...mple_compute_disk_empty_image.tfplan.json → ...mple_compute_disk_empty_image.tfplan.json b/...mple_compute_disk_empty_image.tfplan.json → ...mple_compute_disk_empty_image.tfplan.json
diff --git a/.../tests/data/example_compute_snapshot.json → ...ata-ignored/example_compute_snapshot.json b/.../tests/data/example_compute_snapshot.json → ...ata-ignored/example_compute_snapshot.json
@@ -9,9 +9,6 @@
       "discovery_name": "Snapshot",
       "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
       "data": {
-        "labels": {
-          "test-name": "test-value"
-        },
         "name": "test-instance",
         "sourceDisk": "projects/{{.Provider.project}}/zones/us-central1-a/disks/debian-disk",
         "storageLocations": [
@@ -39,4 +36,4 @@
       }
     }
   }
-]
+]
diff --git a/...gc/tests/data/example_compute_snapshot.tf → .../data-ignored/example_compute_snapshot.tf b/...gc/tests/data/example_compute_snapshot.tf → .../data-ignored/example_compute_snapshot.tf
diff --git a/...data/example_compute_snapshot.tfplan.json → ...ored/example_compute_snapshot.tfplan.json b/...data/example_compute_snapshot.tfplan.json → ...ored/example_compute_snapshot.tfplan.json
diff --git a/...sts/data/example_pubsub_subscription.json → ...-ignored/example_pubsub_subscription.json b/...sts/data/example_pubsub_subscription.json → ...-ignored/example_pubsub_subscription.json
@@ -14,9 +14,6 @@
         "expirationPolicy": {
           "ttl": "300000.5s"
         },
-        "labels": {
-          "test-label2": "test-value2"
-        },
         "messageRetentionDuration": "1200s",
         "retainAckedMessages": true,
         "retryPolicy": {
@@ -39,9 +36,6 @@
         "ackDeadlineSeconds": 20,
         "deadLetterPolicy": null,
         "expirationPolicy": null,
-        "labels": {
-          "test-label1": "test-value1"
-        },
         "messageRetentionDuration": "604800s",
         "pushConfig": {
           "pushEndpoint": "https://example.com/push"

diff --git a/...tests/data/example_pubsub_subscription.tf → ...ta-ignored/example_pubsub_subscription.tf b/...tests/data/example_pubsub_subscription.tf → ...ta-ignored/example_pubsub_subscription.tf
diff --git a/...a/example_pubsub_subscription.tfplan.json → ...d/example_pubsub_subscription.tfplan.json b/...a/example_pubsub_subscription.tfplan.json → ...d/example_pubsub_subscription.tfplan.json
diff --git a/...mple_pubsub_subscription_iam_binding.json → ...mple_pubsub_subscription_iam_binding.json b/...mple_pubsub_subscription_iam_binding.json → ...mple_pubsub_subscription_iam_binding.json
@@ -12,9 +12,6 @@
         "ackDeadlineSeconds": 20,
         "deadLetterPolicy": null,
         "expirationPolicy": null,
-        "labels": {
-          "test-label1": "test-value1"
-        },
         "messageRetentionDuration": "604800s",
         "pushConfig": {
           "pushEndpoint": "https://example.com/push"
@@ -33,4 +30,4 @@
       ]
     }
   }
-]
+]
diff --git a/...xample_pubsub_subscription_iam_binding.tf → ...xample_pubsub_subscription_iam_binding.tf b/...xample_pubsub_subscription_iam_binding.tf → ...xample_pubsub_subscription_iam_binding.tf
diff --git a/...bsub_subscription_iam_binding.tfplan.json → ...bsub_subscription_iam_binding.tfplan.json b/...bsub_subscription_iam_binding.tfplan.json → ...bsub_subscription_iam_binding.tfplan.json
diff --git a/...ample_pubsub_subscription_iam_member.json → ...ample_pubsub_subscription_iam_member.json b/...ample_pubsub_subscription_iam_member.json → ...ample_pubsub_subscription_iam_member.json
@@ -12,9 +12,6 @@
         "ackDeadlineSeconds": 20,
         "deadLetterPolicy": null,
         "expirationPolicy": null,
-        "labels": {
-          "test-label1": "test-value1"
-        },
         "messageRetentionDuration": "604800s",
         "pushConfig": {
           "pushEndpoint": "https://example.com/push"
@@ -33,4 +30,4 @@
       ]
     }
   }
-]
+]
diff --git a/...example_pubsub_subscription_iam_member.tf → ...example_pubsub_subscription_iam_member.tf b/...example_pubsub_subscription_iam_member.tf → ...example_pubsub_subscription_iam_member.tf
diff --git a/...ubsub_subscription_iam_member.tfplan.json → ...ubsub_subscription_iam_member.tfplan.json b/...ubsub_subscription_iam_member.tfplan.json → ...ubsub_subscription_iam_member.tfplan.json
diff --git a/...ample_pubsub_subscription_iam_policy.json → ...ample_pubsub_subscription_iam_policy.json b/...ample_pubsub_subscription_iam_policy.json → ...ample_pubsub_subscription_iam_policy.json
@@ -12,9 +12,6 @@
         "ackDeadlineSeconds": 20,
         "deadLetterPolicy": null,
         "expirationPolicy": null,
-        "labels": {
-          "test-label1": "test-value1"
-        },
         "messageRetentionDuration": "604800s",
         "pushConfig": {
           "pushEndpoint": "https://example.com/push"
@@ -33,4 +30,4 @@
       ]
     }
   }
-]
+]
diff --git a/...example_pubsub_subscription_iam_policy.tf → ...example_pubsub_subscription_iam_policy.tf b/...example_pubsub_subscription_iam_policy.tf → ...example_pubsub_subscription_iam_policy.tf
diff --git a/...ubsub_subscription_iam_policy.tfplan.json → ...ubsub_subscription_iam_policy.tfplan.json b/...ubsub_subscription_iam_policy.tfplan.json → ...ubsub_subscription_iam_policy.tfplan.json
diff --git a/.../tgc/tests/data/example_pubsub_topic.json → ...ts/data-ignored/example_pubsub_topic.json b/.../tgc/tests/data/example_pubsub_topic.json → ...ts/data-ignored/example_pubsub_topic.json
@@ -10,9 +10,6 @@
             "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
             "data": {
                 "kmsKeyName": "projects/{{.Provider.project}}/locations/australia-southeast1/keyRings/default_kms_keyring_name/cryptoKeys/default_kms_key_name",
-                "labels": {
-                    "test-key": "test-value"
-                },
                 "messageStoragePolicy": {
                     "allowedPersistenceRegions": [
                         "australia-southeast1"

diff --git a/...ty/tgc/tests/data/example_pubsub_topic.tf → ...ests/data-ignored/example_pubsub_topic.tf b/...ty/tgc/tests/data/example_pubsub_topic.tf → ...ests/data-ignored/example_pubsub_topic.tf
diff --git a/...sts/data/example_pubsub_topic.tfplan.json → ...-ignored/example_pubsub_topic.tfplan.json b/...sts/data/example_pubsub_topic.tfplan.json → ...-ignored/example_pubsub_topic.tfplan.json
diff --git a/...s/data/example_sql_database_instance.json → ...gnored/example_sql_database_instance.json b/...s/data/example_sql_database_instance.json → ...gnored/example_sql_database_instance.json
diff --git a/...sts/data/example_sql_database_instance.tf → ...-ignored/example_sql_database_instance.tf b/...sts/data/example_sql_database_instance.tf → ...-ignored/example_sql_database_instance.tf
diff --git a/...example_sql_database_instance.tfplan.json → ...example_sql_database_instance.tfplan.json b/...example_sql_database_instance.tfplan.json → ...example_sql_database_instance.tfplan.json
diff --git a/mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.json b/mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.json
@@ -0,0 +1,21 @@
+[
+  {
+    "name": "//spanner.googleapis.com/projects/{{.Provider.project}}/instances/spanner-instance",
+    "asset_type": "spanner.googleapis.com/Instance",
+    "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}",
+    "resource": {
+      "version": "v1",
+      "discovery_document_uri": "https://www.googleapis.com/discovery/v1/apis/spanner/v1/rest",
+      "discovery_name": "Instance",
+      "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}",
+      "data": {
+        "instance": {
+          "config": "projects/{{.Provider.project}}/instanceConfigs/regional-us-central1",
+          "displayName": "spanner-instance",
+          "nodeCount": 1
+        },
+        "instanceId": "spanner-instance"
+      }
+    }
+  }
+]
diff --git a/...y/tgc/tests/data/full_spanner_instance.tf → ...sts/data-ignored/full_spanner_instance.tf b/...y/tgc/tests/data/full_spanner_instance.tf → ...sts/data-ignored/full_spanner_instance.tf
diff --git a/...ts/data/full_spanner_instance.tfplan.json → ...ignored/full_spanner_instance.tfplan.json b/...ts/data/full_spanner_instance.tfplan.json → ...ignored/full_spanner_instance.tfplan.json
diff --git a/...ests/data/full_sql_database_instance.json → ...a-ignored/full_sql_database_instance.json b/...ests/data/full_sql_database_instance.json → ...a-ignored/full_sql_database_instance.json
diff --git a/.../tests/data/full_sql_database_instance.tf → ...ata-ignored/full_sql_database_instance.tf b/.../tests/data/full_sql_database_instance.tf → ...ata-ignored/full_sql_database_instance.tf
diff --git a/...ta/full_sql_database_instance.tfplan.json → ...ed/full_sql_database_instance.tfplan.json b/...ta/full_sql_database_instance.tfplan.json → ...ed/full_sql_database_instance.tfplan.json
diff --git a/mmv1/third_party/tgc/tests/data/full_spanner_instance.json b/mmv1/third_party/tgc/tests/data/full_spanner_instance.json