Move cloudrun sql test to examples (#2790)

Merged PR #2790.
GoogleCloudPlatform · Dec 6, 2019 · c6509ff · c6509ff
1 parent 6b437f4
commit c6509ff
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 84 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/cloudrun/terraform.yaml b/products/cloudrun/terraform.yaml
@@ -57,7 +57,24 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         vars:
           cloud_run_service_name: "tftest-cloudrun"
         test_env_vars:
-          namespace: :PROJECT_NAME
+          project: :PROJECT_NAME
+      - !ruby/object:Provider::Terraform::Examples
+        name: "cloud_run_service_sql"
+        primary_resource_id: "default"
+        primary_resource_name: "fmt.Sprintf(\"tftest-cloudrun%s\", context[\"random_suffix\"])"
+        vars:
+          cloud_run_service_name: "tftest-cloudrun"
+          cloud_run_sql_name: "cloudrun-sql"
+        test_env_vars:
+          project: :PROJECT_NAME
+      - !ruby/object:Provider::Terraform::Examples
+        name: "cloud_run_service_noauth"
+        primary_resource_id: "default"
+        primary_resource_name: "fmt.Sprintf(\"tftest-cloudrun%s\", context[\"random_suffix\"])"
+        vars:
+          cloud_run_service_name: "tftest-cloudrun"
+        test_env_vars:
+          project: :PROJECT_NAME
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: 'templates/terraform/encoders/cloud_run_service.go.erb'
       decoder: 'templates/terraform/decoders/cloud_run.go.erb'

diff --git a/templates/terraform/examples/cloud_run_service_noauth.tf.erb b/templates/terraform/examples/cloud_run_service_noauth.tf.erb
@@ -0,0 +1,33 @@
+resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
+  name     = "<%= ctx[:vars]['cloud_run_service_name'] %>"
+  location = "us-central1"
+
+  metadata {
+    namespace = "<%= ctx[:test_env_vars]['project'] %>"
+  }
+
+  template {
+    spec {
+      containers {
+        image = "gcr.io/cloudrun/hello"
+      }
+    }
+  }
+}
+
+data "google_iam_policy" "noauth" {
+  binding {
+    role = "roles/run.invoker"
+    members = [
+      "allUsers",
+    ]
+  }
+}
+
+resource "google_cloud_run_service_iam_policy" "noauth" {
+  location    = google_cloud_run_service.default.location
+  project     = google_cloud_run_service.default.project
+  service     = google_cloud_run_service.default.name
+
+  policy_data = data.google_iam_policy.noauth.policy_data
+}
diff --git a/templates/terraform/examples/cloud_run_service_sql.tf.erb b/templates/terraform/examples/cloud_run_service_sql.tf.erb
@@ -0,0 +1,32 @@
+resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
+  name     = "<%= ctx[:vars]['cloud_run_service_name'] %>"
+  location = "us-central1"
+
+  metadata {
+    namespace = "<%= ctx[:test_env_vars]['project'] %>"
+  }
+
+  template {
+    spec {
+      containers {
+        image = "gcr.io/cloudrun/hello"
+      }
+    }
+
+    metadata {
+      annotations = {
+        "autoscaling.knative.dev/maxScale"      = "1000"
+        "run.googleapis.com/cloudsql-instances" = "<%= ctx[:test_env_vars]['project'] %>:us-central1:${google_sql_database_instance.instance.name}"
+        "run.googleapis.com/client-name"        = "cloud-console"
+      }
+    }
+  }
+}
+
+resource "google_sql_database_instance" "instance" {
+  name   = "<%= ctx[:vars]['cloud_run_sql_name'] %>"
+  region = "us-east1"
+  settings {
+    tier = "D0"
+  }
+}
diff --git a/third_party/terraform/tests/resource_cloud_run_service_test.go b/third_party/terraform/tests/resource_cloud_run_service_test.go
@@ -40,29 +40,6 @@ func TestAccCloudRunService_cloudRunServiceUpdate(t *testing.T) {
 	})
 }
 
-func TestAccCloudRunService_cloudRunServiceSql(t *testing.T) {
-	t.Parallel()
-
-	project := getTestProjectFromEnv()
-	name := "tftest-cloudrun-" + acctest.RandString(6)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccCloudRunService_cloudRunServiceSql(name, project),
-			},
-			{
-				ResourceName:            "google_cloud_run_service.default",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"metadata.0.resource_version", "status.0.conditions"},
-			},
-		},
-	})
-}
-
 func testAccCloudRunService_cloudRunServiceUpdate(name, project, concurrency string) string {
 	return fmt.Sprintf(`
 resource "google_cloud_run_service" "default" {
@@ -90,61 +67,3 @@ resource "google_cloud_run_service" "default" {
 }
 `, name, project, concurrency)
 }
-
-func testAccCloudRunService_cloudRunServiceSql(name, project string) string {
-	return fmt.Sprintf(`
-data "google_project" "project" {}
-
-resource "google_sql_database_instance" "instance" {
-  name   = "tf-test-%s"
-  region = "us-east1"
-  settings {
-    tier = "D0"
-  }
-}
-
-resource "google_cloud_run_service" "default" {
-  location = "us-east1"
-  name     = "%s"
-
-  metadata {
-    namespace = "%s"
-    labels = {
-      "cloud.googleapis.com/location" = "us-east1"
-      "foo"                           = "bar"
-    }
-  }
-
-  template {
-    metadata {
-      annotations = {
-        "autoscaling.knative.dev/maxScale"      = "1000"
-        "run.googleapis.com/cloudsql-instances" = "%s:us-east1:${google_sql_database_instance.instance.name}"
-        "run.googleapis.com/client-name"        = "cloud-console"
-      }
-    }
-
-    spec {
-      service_account_name = "${data.google_project.project.number}-compute@developer.gserviceaccount.com"
-
-      containers {
-        image = "gcr.io/cloudrun/hello"
-        args  = ["arrg2", "pirate"]
-        resources {
-          limits = {
-            cpu    = "1000m"
-            memory = "256Mi"
-          }
-        }
-      }
-      container_concurrency = 10
-    }
-  }
-
-  traffic {
-    percent         = 100
-    latest_revision = true
-  }
-}
-`, acctest.RandString(6), name, project, project)
-}