Add regex to handle image link in universes (#14154) (#10129)

[upstream:b745b64db2ca68a03b980a4f991ee3894b8b0c13]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google-beta/services/compute/image.go

@@ -29,8 +29,9 @@ import (
 )
 
 const (
-	resolveImageFamilyRegex = "[-_a-zA-Z0-9]*"
-	resolveImageImageRegex  = "[-_a-zA-Z0-9]*"
+	resolveImageFamilyRegex   = "[-_a-zA-Z0-9]*"
+	resolveImageImageRegex    = "[-_a-zA-Z0-9]*"
+	resolveImageUniverseRegex = "[-_a-zA-Z0-9.]*"
 )
 
 var (
@@ -44,6 +45,7 @@ var (
 	resolveImageFamily                 = regexp.MustCompile(fmt.Sprintf("^(%s)$", resolveImageFamilyRegex))
 	resolveImageImage                  = regexp.MustCompile(fmt.Sprintf("^(%s)$", resolveImageImageRegex))
 	resolveImageLink                   = regexp.MustCompile(fmt.Sprintf("^https://www.googleapis.com/compute/[a-z0-9]+/projects/(%s)/global/images/(%s)", verify.ProjectRegex, resolveImageImageRegex))
+	resolveImageUniverseLink           = regexp.MustCompile(fmt.Sprintf("^https://compute.%s/compute/[a-z0-9]+/projects/(%s)/global/images/(%s)", resolveImageUniverseRegex, verify.ProjectRegex, resolveImageImageRegex))
 
 	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))?.*$")
@@ -122,12 +124,12 @@ func ResolveImage(c *transport_tpg.Config, project, name, userAgent string) (str
 			break
 		}
 	}
-	if c.UniverseDomain != "" && c.UniverseDomain != "googleapis.com" {
-		resolveImageLink = regexp.MustCompile(fmt.Sprintf("^https://compute.%s/compute/[a-z0-9]+/projects/(%s)/global/images/(%s)", c.UniverseDomain, verify.ProjectRegex, resolveImageImageRegex))
-	}
+
 	switch {
 	case resolveImageLink.MatchString(name): // https://www.googleapis.com/compute/v1/projects/xyz/global/images/xyz
 		return name, nil
+	case resolveImageUniverseLink.MatchString(name): // https://compute.xyz/compute/[a-z0-9]+/projects/xyz/global/images/xyz
+		return name, nil
 	case resolveImageProjectImage.MatchString(name): // projects/xyz/global/images/xyz
 		res := resolveImageProjectImage.FindStringSubmatch(name)
 		if err := sanityTestRegexMatches(2, res, "project image", name); err != nil {

google-beta/services/compute/resource_compute_disk.go

@@ -78,6 +78,20 @@ func IsDiskShrinkage(_ context.Context, old, new, _ interface{}) bool {
 	return new.(int) < old.(int)
 }
 
+func matchImageLink(old string) (string, string, bool) {
+	// 'old' is read from the API.
+	// In GCP It has the format 'https://www.googleapis.com/compute/v1/projects/(%s)/global/images/(%s)'
+	matches := resolveImageLink.FindStringSubmatch(old)
+	if matches == nil {
+		// In alternate universes, it has the format https://compute.%s/compute/[a-z0-9]+/projects/(%s)/global/images/(%s)
+		matches = resolveImageUniverseLink.FindStringSubmatch(old)
+		if matches == nil {
+			return "", "", false
+		}
+	}
+	return matches[1], matches[2], true
+}
+
 // We cannot suppress the diff for the case when family name is not part of the image name since we can't
 // make a network call in a DiffSuppressFunc.
 func DiskImageDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
@@ -88,15 +102,10 @@ func DiskImageDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
 	// In order to keep this maintainable, we need to ensure that the positive and negative examples
 	// in resource_compute_disk_test.go are as complete as possible.
 
-	// 'old' is read from the API.
-	// It always has the format 'https://www.googleapis.com/compute/v1/projects/(%s)/global/images/(%s)'
-	matches := resolveImageLink.FindStringSubmatch(old)
-	if matches == nil {
-		// Image read from the API doesn't have the expected format. In practice, it should never happen
+	oldProject, oldName, matched := matchImageLink(old)
+	if matched == false {
 		return false
 	}
-	oldProject := matches[1]
-	oldName := matches[2]
 
 	// Partial or full self link family
 	if resolveImageProjectFamily.MatchString(new) {