Patch Cloudrun Annotations Diff (#4450) (#2920)

modular-magician · upodroid · web-flow · commit 7e35714fdab5 · 2021-02-01T15:15:24.000-08:00
Co-authored-by: upodroid &lt;cy@borg.dev&gt;
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;

Co-authored-by: upodroid &lt;cy@borg.dev&gt;
diff --git a/.changelog/4450.txt b/.changelog/4450.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cloudrun: supressed `run.googleapis.com/ingress-status` annotation in `google_cloud_run_service`
+```
diff --git a/google-beta/resource_cloud_run_service.go b/google-beta/resource_cloud_run_service.go
@@ -36,7 +36,7 @@ func revisionNameCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v i
 	return nil
 }
 
-var cloudRunGoogleProvidedAnnotations = regexp.MustCompile("serving\\.knative\\.dev/(?:(?:creator)|(?:lastModifier))$")
+var cloudRunGoogleProvidedAnnotations = regexp.MustCompile(`serving\\.knative\\.dev/(?:(?:creator)|(?:lastModifier))$|run\\.googleapis\\.com/(?:(?:ingress-status))$`)
 
 func cloudrunAnnotationDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
 	// Suppress diffs for the annotations provided by Google

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+cloudrun: supressed `run.googleapis.com/ingress-status` annotation in `google_cloud_run_service`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func revisionNameCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v i`
`36`	`36`	`return nil`
`37`	`37`	`}`
`38`	`38`
`39`		`-var cloudRunGoogleProvidedAnnotations = regexp.MustCompile("serving\\.knative\\.dev/(?:(?:creator)\|(?:lastModifier))$")`
	`39`	+var cloudRunGoogleProvidedAnnotations = regexp.MustCompile(`serving\\.knative\\.dev/(?:(?:creator)\|(?:lastModifier))$\|run\\.googleapis\\.com/(?:(?:ingress-status))$`)
`40`	`40`
`41`	`41`	`func cloudrunAnnotationDiffSuppress(k, old, new string, d *schema.ResourceData) bool {`
`42`	`42`	`// Suppress diffs for the annotations provided by Google`