Cloudrun domain DSF (#4209) (#7764)

* Add DSF from cloudrun annotations to domain annotation * Add beta annotation to domain mapping test Signed-off-by: Modular Magician <[email protected]>
hashicorp · Nov 10, 2020 · 5103805 · 5103805
1 parent d7c5cf3
commit 5103805
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.changelog/4209.txt b/.changelog/4209.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cloudrun: added diff suppress function for `google_cloud_run_domain_mapping` `metadata.annotations` to ignore API-set fields
+```
diff --git a/google/resource_cloud_run_domain_mapping.go b/google/resource_cloud_run_domain_mapping.go
@@ -82,10 +82,11 @@ func resourceCloudRunDomainMapping() *schema.Resource {
 project ID or project number.`,
 						},
 						"annotations": {
-							Type:     schema.TypeMap,
-							Computed: true,
-							Optional: true,
-							ForceNew: true,
+							Type:             schema.TypeMap,
+							Computed:         true,
+							Optional:         true,
+							ForceNew:         true,
+							DiffSuppressFunc: cloudrunAnnotationDiffSuppress,
 							Description: `Annotations is a key value map stored with a resource that
 may be set by external tools to store and retrieve arbitrary metadata. More
 info: http://kubernetes.io/docs/user-guide/annotations`,

diff --git a/google/resource_cloud_run_domain_mapping_generated_test.go b/google/resource_cloud_run_domain_mapping_generated_test.go
@@ -78,6 +78,9 @@ resource "google_cloud_run_domain_mapping" "default" {
 
   metadata {
     namespace = "%{namespace}"
+    annotations = {
+      "run.googleapis.com/launch-stage" = "BETA"
+    }
   }
 
   spec {

diff --git a/website/docs/r/cloud_run_domain_mapping.html.markdown b/website/docs/r/cloud_run_domain_mapping.html.markdown
@@ -64,6 +64,9 @@ resource "google_cloud_run_domain_mapping" "default" {
 
   metadata {
     namespace = "my-project-name"
+    annotations = {
+      "run.googleapis.com/launch-stage" = "BETA"
+    }
   }
 
   spec {