Allow Cloud Run metadata block to be optional (#2793)

Merged PR #2793.
GoogleCloudPlatform · Dec 6, 2019 · 5eb989d · 5eb989d
1 parent c6509ff
commit 5eb989d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/cloudrun/api.yaml b/products/cloudrun/api.yaml
@@ -368,7 +368,7 @@ objects:
           name: namespace
           description: |-
             In Cloud Run the namespace must be equal to either the
-            project ID or project number.
+            project ID or project number. It will default to the resource's project.
         - !ruby/object:Api::Type::KeyValuePairs
           name: annotations
           description: |-

diff --git a/products/cloudrun/terraform.yaml b/products/cloudrun/terraform.yaml
@@ -95,6 +95,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       spec.template.metadata.namespace: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
         custom_expand: "templates/terraform/custom_expand/default_to_project.go.erb"
+      # Terraform autofills the only required field in metadata
+      metadata: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
+        required: false
       metadata.namespace: !ruby/object:Overrides::Terraform::PropertyOverride
         # marking namepsace as optional so that 1) it can be inferred from the provider
         # project and 2) so customizeDiff can clear the diff when projectNumber == projectName

diff --git a/templates/terraform/encoders/cloud_run_service.go.erb b/templates/terraform/encoders/cloud_run_service.go.erb
@@ -13,10 +13,13 @@
 	# limitations under the License.
 -%>
 name := d.Get("name").(string)
+if obj["metadata"] == nil {
+	obj["metadata"] = make(map[string]interface{})
+}
 metadata := obj["metadata"].(map[string]interface{})
 metadata["name"] = name
 
 // The only acceptable version/kind right now
 obj["apiVersion"] = "serving.knative.dev/v1"
-obj["kind"] = "<%= "#{object.name}" -%>"
+obj["kind"] = "Service"
 return obj, nil
diff --git a/templates/terraform/examples/cloud_run_service_basic.tf.erb b/templates/terraform/examples/cloud_run_service_basic.tf.erb
@@ -2,10 +2,6 @@ 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]['namespace'] %>"
-  }
-
   template {
     spec {
       containers {

diff --git a/templates/terraform/examples/cloud_run_service_noauth.tf.erb b/templates/terraform/examples/cloud_run_service_noauth.tf.erb
@@ -2,10 +2,6 @@ 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 {

diff --git a/templates/terraform/examples/cloud_run_service_sql.tf.erb b/templates/terraform/examples/cloud_run_service_sql.tf.erb
@@ -2,10 +2,6 @@ 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 {