Cherry pick: Restrict annotation ignores to the specific annotation Cloud Run adds

Author: c2thorn

.changelog/4202.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/resource_cloud_run_service.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"log"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -35,11 +36,11 @@ func revisionNameCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v i
 	return nil
 }
 
-const cloudRunGoogleProvidedAnnotation = "serving.knative.dev"
+var cloudRunGoogleProvidedAnnotations = regexp.MustCompile("serving\\.knative\\.dev/(?:(?:creator)|(?:lastModifier))$")
 
 func cloudrunAnnotationDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
 	// Suppress diffs for the annotations provided by Google
-	if strings.Contains(k, cloudRunGoogleProvidedAnnotation) && new == "" {
+	if cloudRunGoogleProvidedAnnotations.MatchString(k) && new == "" {
 		return true
 	}
 

google-beta/resource_cloud_run_service_test.go

@@ -46,7 +46,10 @@ resource "google_cloud_run_service" "default" {
   location = "us-central1"
 
   metadata {
-    namespace = "%s"
+  namespace = "%s"
+  annotations = {
+      generated-by = "magic-modules"
+    }
   }
 
   template {