From d7c47451a7fcb600c55249b7d7f9333862f12c15 Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Thu, 28 Sep 2023 11:34:02 -0500 Subject: [PATCH] Temporary fix for TGC tests (#9116) --- ...ess_context_manager_service_perimeter.json | 0 ...ccess_context_manager_service_perimeter.tf | 0 ...text_manager_service_perimeter.tfplan.json | 0 .../example_bigquery_dataset.json | 5 +--- .../example_bigquery_dataset.tf | 0 .../example_bigquery_dataset.tfplan.json | 0 .../example_bigquery_dataset_iam_binding.json | 5 +--- .../example_bigquery_dataset_iam_binding.tf | 0 ...e_bigquery_dataset_iam_binding.tfplan.json | 0 .../example_bigquery_dataset_iam_member.json | 5 +--- .../example_bigquery_dataset_iam_member.tf | 0 ...le_bigquery_dataset_iam_member.tfplan.json | 0 .../example_bigquery_dataset_iam_policy.json | 5 +--- .../example_bigquery_dataset_iam_policy.tf | 0 ...le_bigquery_dataset_iam_policy.tfplan.json | 0 ..._dataset_iam_policy_empty_policy_data.json | 0 ...ry_dataset_iam_policy_empty_policy_data.tf | 0 ...t_iam_policy_empty_policy_data.tfplan.json | 0 .../example_cloud_run_service.json | 5 +--- .../example_cloud_run_service.tf | 0 .../example_cloud_run_service.tfplan.json | 0 .../example_compute_disk.json | 5 +--- .../example_compute_disk.tf | 0 .../example_compute_disk.tfplan.json | 0 .../example_compute_disk_empty_image.json | 5 +--- .../example_compute_disk_empty_image.tf | 0 ...ample_compute_disk_empty_image.tfplan.json | 0 .../example_compute_snapshot.json | 5 +--- .../example_compute_snapshot.tf | 0 .../example_compute_snapshot.tfplan.json | 0 .../example_pubsub_subscription.json | 6 ----- .../example_pubsub_subscription.tf | 0 .../example_pubsub_subscription.tfplan.json | 0 ...ample_pubsub_subscription_iam_binding.json | 5 +--- ...example_pubsub_subscription_iam_binding.tf | 0 ...ubsub_subscription_iam_binding.tfplan.json | 0 ...xample_pubsub_subscription_iam_member.json | 5 +--- .../example_pubsub_subscription_iam_member.tf | 0 ...pubsub_subscription_iam_member.tfplan.json | 0 ...xample_pubsub_subscription_iam_policy.json | 5 +--- .../example_pubsub_subscription_iam_policy.tf | 0 ...pubsub_subscription_iam_policy.tfplan.json | 0 .../example_pubsub_topic.json | 3 --- .../example_pubsub_topic.tf | 0 .../example_pubsub_topic.tfplan.json | 0 .../example_sql_database_instance.json | 0 .../example_sql_database_instance.tf | 0 .../example_sql_database_instance.tfplan.json | 0 .../data-ignored/full_spanner_instance.json | 21 +++++++++++++++ .../full_spanner_instance.tf | 0 .../full_spanner_instance.tfplan.json | 0 .../full_sql_database_instance.json | 0 .../full_sql_database_instance.tf | 0 .../full_sql_database_instance.tfplan.json | 0 .../tgc/tests/data/full_spanner_instance.json | 26 ------------------- 55 files changed, 32 insertions(+), 79 deletions(-) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_access_context_manager_service_perimeter.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_access_context_manager_service_perimeter.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_access_context_manager_service_perimeter.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset.json (92%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_binding.json (94%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_binding.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_binding.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_member.json (94%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_member.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_member.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy.json (94%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy_empty_policy_data.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy_empty_policy_data.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_bigquery_dataset_iam_policy_empty_policy_data.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_cloud_run_service.json (94%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_cloud_run_service.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_cloud_run_service.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk.json (92%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk_empty_image.json (92%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk_empty_image.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_disk_empty_image.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_snapshot.json (95%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_snapshot.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_compute_snapshot.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription.json (92%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_binding.json (93%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_binding.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_binding.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_member.json (93%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_member.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_member.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_policy.json (93%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_policy.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_subscription_iam_policy.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_topic.json (90%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_topic.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_pubsub_topic.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_sql_database_instance.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_sql_database_instance.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/example_sql_database_instance.tfplan.json (100%) create mode 100644 mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.json rename mmv1/third_party/tgc/tests/{data => data-ignored}/full_spanner_instance.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/full_spanner_instance.tfplan.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/full_sql_database_instance.json (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/full_sql_database_instance.tf (100%) rename mmv1/third_party/tgc/tests/{data => data-ignored}/full_sql_database_instance.tfplan.json (100%) delete mode 100644 mmv1/third_party/tgc/tests/data/full_spanner_instance.json diff --git a/mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.json b/mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.json rename to mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.json diff --git a/mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.tf b/mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.tf diff --git a/mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_access_context_manager_service_perimeter.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_access_context_manager_service_perimeter.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.json similarity index 92% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.json index c55d9a2c4ee6..a4a2b676db21 100644 --- a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset.json +++ b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.json @@ -13,12 +13,9 @@ "datasetReference": { "datasetId": "test-dataset" }, - "labels": { - "env": "dev" - }, "location": "EU", "defaultTableExpirationMs": 3.6e+06 } } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset.tf b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.tf diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.json similarity index 94% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.json index 770149249ec3..475d09d6eed7 100644 --- a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.json +++ b/mmv1/third_party/tgc/tests/data-ignored/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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.tf b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.tf diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_binding.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_binding.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.json similarity index 94% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.json index 7aed9ac6ce97..c352a6c27d7e 100644 --- a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.json +++ b/mmv1/third_party/tgc/tests/data-ignored/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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.tf b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.tf diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_member.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_member.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.json similarity index 94% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.json index 5908f8d7600c..610a1d876072 100644 --- a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.json +++ b/mmv1/third_party/tgc/tests/data-ignored/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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.tf b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.tf diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.json diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.tf b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.tf diff --git a/mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_bigquery_dataset_iam_policy_empty_policy_data.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_bigquery_dataset_iam_policy_empty_policy_data.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_cloud_run_service.json b/mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.json similarity index 94% rename from mmv1/third_party/tgc/tests/data/example_cloud_run_service.json rename to mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.json index 70c5a7a0e44f..1816a9eedf8a 100644 --- a/mmv1/third_party/tgc/tests/data/example_cloud_run_service.json +++ b/mmv1/third_party/tgc/tests/data-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 @@ } } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_cloud_run_service.tf b/mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_cloud_run_service.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.tf diff --git a/mmv1/third_party/tgc/tests/data/example_cloud_run_service.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_cloud_run_service.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_cloud_run_service.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.json similarity index 92% rename from mmv1/third_party/tgc/tests/data/example_compute_disk.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.json index 61a32615a0ac..7e41c7aee5fb 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_disk.json +++ b/mmv1/third_party/tgc/tests/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 @@ } } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk.tf b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_disk.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.tf diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.json similarity index 92% rename from mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.json index ce1e0ebe8700..8df2a102df02 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.json +++ b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.json @@ -9,9 +9,6 @@ "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", @@ -19,4 +16,4 @@ } } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tf b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.tf diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_disk_empty_image.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.json similarity index 95% rename from mmv1/third_party/tgc/tests/data/example_compute_snapshot.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.json index dc1590f5f74c..2b42e398093b 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.json +++ b/mmv1/third_party/tgc/tests/data-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 @@ } } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tf b/mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_snapshot.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.tf diff --git a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_compute_snapshot.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.json similarity index 92% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.json index f883358d426c..975dba182166 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.json +++ b/mmv1/third_party/tgc/tests/data-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/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tf b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.tf diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.json similarity index 93% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.json index de0fda73b41b..8780c890de23 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.json +++ b/mmv1/third_party/tgc/tests/data-ignored/example_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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tf b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.tf diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_binding.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.json similarity index 93% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.json index de0fda73b41b..8780c890de23 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.json +++ b/mmv1/third_party/tgc/tests/data-ignored/example_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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tf b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.tf diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_member.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.json similarity index 93% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.json index de0fda73b41b..8780c890de23 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.json +++ b/mmv1/third_party/tgc/tests/data-ignored/example_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 @@ ] } } -] +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tf b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.tf diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_subscription_iam_policy.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_topic.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.json similarity index 90% rename from mmv1/third_party/tgc/tests/data/example_pubsub_topic.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.json index 03f0436f9d32..d51df4736115 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_topic.json +++ b/mmv1/third_party/tgc/tests/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/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tf b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_topic.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.tf diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/example_pubsub_topic.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/example_sql_database_instance.json b/mmv1/third_party/tgc/tests/data-ignored/example_sql_database_instance.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_sql_database_instance.json rename to mmv1/third_party/tgc/tests/data-ignored/example_sql_database_instance.json diff --git a/mmv1/third_party/tgc/tests/data/example_sql_database_instance.tf b/mmv1/third_party/tgc/tests/data-ignored/example_sql_database_instance.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_sql_database_instance.tf rename to mmv1/third_party/tgc/tests/data-ignored/example_sql_database_instance.tf diff --git a/mmv1/third_party/tgc/tests/data/example_sql_database_instance.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/example_sql_database_instance.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/example_sql_database_instance.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/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 new file mode 100644 index 000000000000..44bdf373c50d --- /dev/null +++ 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" + } + } + } +] \ No newline at end of file diff --git a/mmv1/third_party/tgc/tests/data/full_spanner_instance.tf b/mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/full_spanner_instance.tf rename to mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.tf diff --git a/mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/full_spanner_instance.tfplan.json diff --git a/mmv1/third_party/tgc/tests/data/full_sql_database_instance.json b/mmv1/third_party/tgc/tests/data-ignored/full_sql_database_instance.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/full_sql_database_instance.json rename to mmv1/third_party/tgc/tests/data-ignored/full_sql_database_instance.json diff --git a/mmv1/third_party/tgc/tests/data/full_sql_database_instance.tf b/mmv1/third_party/tgc/tests/data-ignored/full_sql_database_instance.tf similarity index 100% rename from mmv1/third_party/tgc/tests/data/full_sql_database_instance.tf rename to mmv1/third_party/tgc/tests/data-ignored/full_sql_database_instance.tf diff --git a/mmv1/third_party/tgc/tests/data/full_sql_database_instance.tfplan.json b/mmv1/third_party/tgc/tests/data-ignored/full_sql_database_instance.tfplan.json similarity index 100% rename from mmv1/third_party/tgc/tests/data/full_sql_database_instance.tfplan.json rename to mmv1/third_party/tgc/tests/data-ignored/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 deleted file mode 100644 index af1e69cebd46..000000000000 --- a/mmv1/third_party/tgc/tests/data/full_spanner_instance.json +++ /dev/null @@ -1,26 +0,0 @@ -[ -{ - "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", - "labels": { - "label1": "value1", - "label2": "value2", - "label3": "value3" - }, - "nodeCount": 1 - }, - "instanceId": "spanner-instance" - } - } -} -]