From 909590bc9d2ea6d203af050e036f5907e076e75b Mon Sep 17 00:00:00 2001
From: Michael Zalimeni <michael.zalimeni@hashicorp.com>
Date: Fri, 28 Jul 2023 10:23:01 -0400
Subject: [PATCH] Fix default Ent image tag in acceptance tests

Rather than hard-coding the Docker repository and parsing the non-Ent
image tag for a version, simply replace the image name and retain other
coordinates. This is consistent with our tagging scheme introduced in
https://github.com/hashicorp/consul/pull/13541 and will allow for using
`hashicorppreview` images seamlessly regardless of whether OSS or Ent is
being tested.
---
 acceptance/framework/config/config.go      | 21 ++++++----------
 acceptance/framework/config/config_test.go | 29 ++++++++++++++--------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/acceptance/framework/config/config.go b/acceptance/framework/config/config.go
index ee07df63fd..a638732c37 100644
--- a/acceptance/framework/config/config.go
+++ b/acceptance/framework/config/config.go
@@ -217,21 +217,16 @@ func (t *TestConfig) entImage() (string, error) {
 	}
 
 	// Otherwise, assume that we have an image tag with a version in it.
-	consulImageSplits := strings.Split(v.Global.Image, ":")
-	if len(consulImageSplits) != 2 {
-		return "", fmt.Errorf("could not determine consul version from global.image: %s", v.Global.Image)
-	}
-	consulImageVersion := consulImageSplits[1]
-
-	var preRelease string
-	// Handle versions like 1.9.0-rc1.
-	if strings.Contains(consulImageVersion, "-") {
-		split := strings.Split(consulImageVersion, "-")
-		consulImageVersion = split[0]
-		preRelease = fmt.Sprintf("-%s", split[1])
+	// Use the same Docker repository and tagging scheme, but replace 'consul' with 'consul-enterprise'.
+	imageTag := strings.Replace(v.Global.Image, "/consul:", "/consul-enterprise:", 1)
+
+	// We currently add an '-ent' suffix to release versions of enterprise images (nightly previews
+	// do not include this suffix).
+	if strings.HasPrefix(imageTag, "hashicorp/consul-enterprise:") {
+		imageTag = fmt.Sprintf("%s-ent", imageTag)
 	}
 
-	return fmt.Sprintf("hashicorp/consul-enterprise:%s%s-ent", consulImageVersion, preRelease), nil
+	return imageTag, nil
 }
 
 func (c *TestConfig) SkipWhenOpenshiftAndCNI(t *testing.T) {
diff --git a/acceptance/framework/config/config_test.go b/acceptance/framework/config/config_test.go
index df981e26fa..4d432da3b0 100644
--- a/acceptance/framework/config/config_test.go
+++ b/acceptance/framework/config/config_test.go
@@ -137,25 +137,34 @@ func TestConfig_HelmValuesFromConfig_EntImage(t *testing.T) {
 		expErr      string
 	}{
 		{
-			consulImage: "hashicorp/consul:1.9.0",
-			expImage:    "hashicorp/consul-enterprise:1.9.0-ent",
+			consulImage: "hashicorp/consul:1.15.3",
+			expImage:    "hashicorp/consul-enterprise:1.15.3-ent",
 		},
 		{
-			consulImage: "hashicorp/consul:1.8.5-rc1",
-			expImage:    "hashicorp/consul-enterprise:1.8.5-rc1-ent",
+			consulImage: "hashicorp/consul:1.16.0-rc1",
+			expImage:    "hashicorp/consul-enterprise:1.16.0-rc1-ent",
 		},
 		{
-			consulImage: "hashicorp/consul:1.7.0-beta3",
-			expImage:    "hashicorp/consul-enterprise:1.7.0-beta3-ent",
-		},
-		{
-			consulImage: "invalid",
-			expErr:      "could not determine consul version from global.image: invalid",
+			consulImage: "hashicorp/consul:1.14.0-beta1",
+			expImage:    "hashicorp/consul-enterprise:1.14.0-beta1-ent",
 		},
 		{
 			consulImage: "hashicorp/consul@sha256:oioi2452345kjhlkh",
 			expImage:    "hashicorp/consul@sha256:oioi2452345kjhlkh",
 		},
+		// Nightly tags differ from release tags ('-ent' suffix is omitted)
+		{
+			consulImage: "docker.mirror.hashicorp.services/hashicorppreview/consul:1.17-dev",
+			expImage:    "docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.17-dev",
+		},
+		{
+			consulImage: "docker.mirror.hashicorp.services/hashicorppreview/consul:1.17-dev-ubi",
+			expImage:    "docker.mirror.hashicorp.services/hashicorppreview/consul-enterprise:1.17-dev-ubi",
+		},
+		{
+			consulImage: "docker.mirror.hashicorp.services/hashicorppreview/consul@sha256:oioi2452345kjhlkh",
+			expImage:    "docker.mirror.hashicorp.services/hashicorppreview/consul@sha256:oioi2452345kjhlkh",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.consulImage, func(t *testing.T) {