Fix multiple VCR tests (#6500)

* fixed multiple currently failed VCR tests
GoogleCloudPlatform · Sep 6, 2022 · cae4012 · cae4012
1 parent 0176a6d
commit cae4012
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/mmv1/products/cgc/terraform.yaml b/mmv1/products/cgc/terraform.yaml
@@ -89,6 +89,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         primary_resource_id: "trigger_pubsub_tf"
         vars:
           pubsub_workflow_tf: "pubsub-workflow-tf"
+          service_account: "eventarc-sa"
           trigger_pubsub_workflow_tf: "trigger-pubsub-workflow-tf"
         min_version: beta
 

diff --git a/mmv1/templates/terraform/constants/cloud_run_service.go.erb b/mmv1/templates/terraform/constants/cloud_run_service.go.erb
@@ -25,6 +25,7 @@ func cloudrunAnnotationDiffSuppress(k, old, new string, d *schema.ResourceData)
 }
 
 var cloudRunGoogleProvidedTemplateAnnotations = regexp.MustCompile(`template\.0\.metadata\.0\.annotations\.run\.googleapis\.com/sandbox`)
+var cloudRunGoogleProvidedTemplateAnnotations_autoscaling_maxscale = regexp.MustCompile(`template\.0\.metadata\.0\.annotations\.autoscaling\.knative\.dev/maxScale`)
 
 func cloudrunTemplateAnnotationDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
 	// Suppress diffs for the annotations provided by API
@@ -33,6 +34,10 @@ func cloudrunTemplateAnnotationDiffSuppress(k, old, new string, d *schema.Resour
 		return true
 	}
 
+	if cloudRunGoogleProvidedTemplateAnnotations_autoscaling_maxscale.MatchString(k) && new == "" {
+		return true
+	}
+
 	// For other keys, don't suppress diff.
 	return false
 }

diff --git a/mmv1/templates/terraform/examples/cloud_run_service_static_outbound.tf.erb b/mmv1/templates/terraform/examples/cloud_run_service_static_outbound.tf.erb
@@ -89,12 +89,16 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
         image = "us-docker.pkg.dev/cloudrun/container/hello"
       }
     }
+    metadata {
+      annotations = {
+        "run.googleapis.com/vpc-access-connector" = google_vpc_access_connector.default.name
+        "run.googleapis.com/vpc-access-egress"    = "all-traffic"
+      }
+    }
   }
 
   metadata {
     annotations = {
-      "run.googleapis.com/vpc-access-connector" = google_vpc_access_connector.default.name
-      "run.googleapis.com/vpc-access-egress"    = "all-traffic"
       "run.googleapis.com/ingress"              = "all"
     }
   }

diff --git a/mmv1/templates/terraform/examples/eventarc_workflows.tf.erb b/mmv1/templates/terraform/examples/eventarc_workflows.tf.erb
@@ -32,7 +32,7 @@ resource "google_project_service" "workflows" {
 # Create a service account for Eventarc trigger and Workflows
 resource "google_service_account" "eventarc_workflows_service_account" {
   provider = google-beta
-  account_id   = "eventarc-workflows-sa"
+  account_id   = "<%= ctx[:vars]['service_account'] %>"
   display_name = "Eventarc Workflows Service Account"
 }
 

diff --git a/mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb b/mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb
@@ -1165,7 +1165,7 @@ func TestAccSqlDatabaseInstance_SqlServerAuditConfig(t *testing.T) {
 	databaseName := "tf-test-" + randString(t, 10)
 	rootPassword := randString(t, 15)
 	addressName := "tf-test-" + randString(t, 10)
-	networkName := BootstrapSharedTestNetwork(t, "sql-instance-private-allocated-ip-range")
+	networkName := BootstrapSharedTestNetwork(t, "sql-instance-sqlserver-audit")
 	bucketName := fmt.Sprintf("%s-%d", "tf-test-bucket", randInt(t))
 	uploadInterval := "900s"
 	retentionInterval := "86400s"