From c4e8c3ea295d858a040a9d5ee1939733d85e77da Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 30 Sep 2024 15:55:19 -0700 Subject: [PATCH] Fix labels related tests (#11873) (#19700) [upstream:4da617806521ef46b7b66cf84bf2f79687015345] Signed-off-by: Modular Magician --- .changelog/11873.txt | 3 +++ .../resource_cloud_run_service_test.go | 13 ++++++++----- .../resource_container_cluster_test.go | 19 +++++++++++-------- .../dataflow/resource_dataflow_job_test.go | 3 ++- 4 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 .changelog/11873.txt diff --git a/.changelog/11873.txt b/.changelog/11873.txt new file mode 100644 index 00000000000..42b910df155 --- /dev/null +++ b/.changelog/11873.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` \ No newline at end of file diff --git a/google/services/cloudrun/resource_cloud_run_service_test.go b/google/services/cloudrun/resource_cloud_run_service_test.go index 95083f7f632..302f03819af 100644 --- a/google/services/cloudrun/resource_cloud_run_service_test.go +++ b/google/services/cloudrun/resource_cloud_run_service_test.go @@ -423,7 +423,7 @@ func TestAccCloudRunService_withProviderDefaultLabels(t *testing.T) { resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.%", "1"), resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.generated-by", "magic-modules"), - resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "6"), + resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "7"), ), }, { @@ -449,7 +449,7 @@ func TestAccCloudRunService_withProviderDefaultLabels(t *testing.T) { resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.%", "1"), resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.generated-by", "magic-modules-update"), - resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "6"), + resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "7"), ), }, { @@ -508,7 +508,7 @@ func TestAccCloudRunService_withProviderDefaultLabels(t *testing.T) { resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_labels.%", "1"), resource.TestCheckNoResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.%"), - resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "5"), + resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "6"), ), }, { @@ -547,8 +547,11 @@ func TestAccCloudRunServiceMigration_withLabels(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.labels.%", "2"), resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_labels.%", "3"), - resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.%", "1"), - resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "6"), + // A new system annotation is added by the API around 08/28/2024, + // and the current service annotation filter doesn't work for this new annotation during the migration, + // so it is treated as the user defined annotation. + resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.annotations.%", "2"), + resource.TestCheckResourceAttr("google_cloud_run_service.default", "metadata.0.effective_annotations.%", "7"), ), }, }, diff --git a/google/services/container/resource_container_cluster_test.go b/google/services/container/resource_container_cluster_test.go index 34075be60d3..7a5d6e1cdfb 100644 --- a/google/services/container/resource_container_cluster_test.go +++ b/google/services/container/resource_container_cluster_test.go @@ -10470,11 +10470,12 @@ func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) { resource.TestCheckResourceAttr("google_container_cluster.primary", "resource_labels.%", "1"), resource.TestCheckResourceAttr("google_container_cluster.primary", "resource_labels.created-by", "terraform"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "2"), + // goog-terraform-provisioned: true is added + resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "3"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.default_key1", "default_value1"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.created-by", "terraform"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "2"), + resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "3"), ), }, { @@ -10490,11 +10491,12 @@ func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) { resource.TestCheckResourceAttr("google_container_cluster.primary", "resource_labels.created-by", "terraform"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.default_key1", "value1"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "2"), + // goog-terraform-provisioned: true is added + resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "3"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.default_key1", "value1"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.created-by", "terraform"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "2"), + resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "3"), ), }, { @@ -10508,11 +10510,12 @@ func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("google_container_cluster.primary", "resource_labels.%", "0"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "2"), + // goog-terraform-provisioned: true is added + resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "3"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.default_key1", "default_value1"), resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.created-by", "terraform"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "2"), + resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "3"), ), }, { @@ -10525,8 +10528,8 @@ func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) { Config: testAccContainerCluster_basic(clusterName, networkName, subnetworkName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("google_container_cluster.primary", "resource_labels.%", "0"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "0"), - resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "0"), + resource.TestCheckResourceAttr("google_container_cluster.primary", "terraform_labels.%", "1"), + resource.TestCheckResourceAttr("google_container_cluster.primary", "effective_labels.%", "1"), ), }, { diff --git a/google/services/dataflow/resource_dataflow_job_test.go b/google/services/dataflow/resource_dataflow_job_test.go index bdce0be80dd..0341d664169 100644 --- a/google/services/dataflow/resource_dataflow_job_test.go +++ b/google/services/dataflow/resource_dataflow_job_test.go @@ -362,7 +362,8 @@ func TestAccDataflowJob_withProviderDefaultLabels(t *testing.T) { Config: testAccDataflowJob_zone(bucket, job, zone), Check: resource.ComposeTestCheckFunc( resource.TestCheckNoResourceAttr("google_dataflow_job.big_data", "labels.%"), - resource.TestCheckResourceAttr("google_dataflow_job.big_data", "effective_labels.%", "3"), + // goog-terraform-provisioned: true is added + resource.TestCheckResourceAttr("google_dataflow_job.big_data", "effective_labels.%", "4"), ), }, {