Fix image diff suppress failures (#15761)

Author: trodge

mmv1/templates/terraform/constants/disk.tmpl

@@ -187,6 +187,14 @@ func diskImageFamilyEquals(imageName, familyName string) bool {
 		return true
 	}
 
+	if suppressFedoraFamilyDiff(imageName, familyName) {
+		return true
+	}
+
+	if suppressSuseFamilyDiff(imageName, familyName) {
+		return true
+	}
+
 	if suppressCosFamilyDiff(imageName, familyName) {
 		return true
 	}
@@ -220,6 +228,26 @@ func suppressCanonicalFamilyDiff(imageName, familyName string) bool {
 	return false
 }
 
+func suppressFedoraFamilyDiff(imageName, familyName string) bool {
+	parts := fedoraImage.FindStringSubmatch(imageName)
+	if len(parts) == 6 {
+		if strings.HasPrefix(familyName, "fedora-") {
+			return true
+		}
+	}
+	return false
+}
+
+func suppressSuseFamilyDiff(imageName, familyName string) bool {
+	parts := suseImage.FindStringSubmatch(imageName)
+	if len(parts) == 4 {
+		if strings.HasPrefix(familyName, "sles-") {
+			return true
+		}
+	}
+	return false
+}
+
 // e.g. image: cos-NN-*, family: cos-NN-lts
 func suppressCosFamilyDiff(imageName, familyName string) bool {
 	parts := cosLtsImage.FindStringSubmatch(imageName)

mmv1/third_party/terraform/services/compute/image.go

@@ -33,6 +33,8 @@ var (
 
 	windowsSqlImage         = regexp.MustCompile("^sql-(?:server-)?([0-9]{4})-([a-z]+)-windows-(?:server-)?([0-9]{4})(?:-r([0-9]+))?-dc-v[0-9]+$")
 	canonicalUbuntuLtsImage = regexp.MustCompile("^ubuntu-(minimal-)?([0-9]+)(?:.*(arm64|amd64))?.*$")
+	fedoraImage             = regexp.MustCompile("^fedora-coreos-([0-9]+)-([0-9]+)-([0-9]+)-([0-9]+)-gcp-(x86-64|aarch64)$")
+	suseImage               = regexp.MustCompile("^sles-([0-9]+)-([0-9]+)-(v[0-9]+)-x86-64$")
 	cosLtsImage             = regexp.MustCompile("^cos-([0-9]+)-")
 )