From 3c17f3a6a4c6f458f8aa96e739708c0effbc0fcb Mon Sep 17 00:00:00 2001
From: Curt Bushko <cbushko@gmail.com>
Date: Mon, 12 Jun 2023 18:42:24 +0000
Subject: [PATCH] backport of commit 6422414d9b90b55a9739a2a5efe551b38264a931

---
 Makefile                                              |  4 ++++
 control-plane/build-support/functions/10-util.sh      | 11 +++--------
 .../scripts/consul-enterprise-version.sh              | 11 +++++++++++
 control-plane/build-support/scripts/consul-version.sh |  4 ++++
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100755 control-plane/build-support/scripts/consul-enterprise-version.sh

diff --git a/Makefile b/Makefile
index 628b13e2f9..9547fd3547 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 VERSION = $(shell ./control-plane/build-support/scripts/version.sh control-plane/version/version.go)
 CONSUL_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-version.sh charts/consul/values.yaml)
+CONSUL_ENTERPRISE_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-enterprise-version.sh charts/consul/values.yaml)
 CONSUL_DATAPLANE_IMAGE_VERSION = $(shell ./control-plane/build-support/scripts/consul-dataplane-version.sh charts/consul/values.yaml)
 
 # ===========> Helm Targets
@@ -180,6 +181,9 @@ version:
 consul-version:
 	@echo $(CONSUL_IMAGE_VERSION)
 
+consul-enterprise-version:
+	@echo $(CONSUL_ENTERPRISE_IMAGE_VERSION)
+
 consul-dataplane-version:
 	@echo $(CONSUL_DATAPLANE_IMAGE_VERSION)
 
diff --git a/control-plane/build-support/functions/10-util.sh b/control-plane/build-support/functions/10-util.sh
index 9ba6c26da9..72ce91720c 100644
--- a/control-plane/build-support/functions/10-util.sh
+++ b/control-plane/build-support/functions/10-util.sh
@@ -631,13 +631,8 @@ function update_version_helm {
 	sed_i ${SED_EXT} -e "s/(version:[[:space:]]*)[^\"]*/\1${full_version}/g" "${cfile}"
 	sed_i ${SED_EXT} -e "s/(appVersion:[[:space:]]*)[^\"]*/\1${full_consul_version}/g" "${cfile}"
 	sed_i ${SED_EXT} -e "s/(image:.*\/consul-k8s-control-plane:)[^\"]*/image: $4${full_version}/g" "${cfile}"
-	if ! test -z "$3"; then
-		sed_i ${SED_EXT} -e "s/(image:.*\/consul:)[^\"]*/image: $6:${full_consul_version}/g" "${cfile}"
-		sed_i ${SED_EXT} -e "s/(image:.*\/consul:)[^\"]*/image: $6:${full_consul_version}/g" "${vfile}"
-	else
-		sed_i ${SED_EXT} -e "s/(image:.*\/consul-enterprise:)[^\"]*/image: $6:${full_consul_version}/g" "${cfile}"
-		sed_i ${SED_EXT} -e "s/(image:.*\/consul-enterprise:)[^\"]*/image: $6:${full_consul_version}/g" "${vfile}"
-	fi
+	sed_i ${SED_EXT} -e "s/(image:.*\/consul:)[^\"]*/image: $6:${full_consul_version}/g" "${cfile}"
+	sed_i ${SED_EXT} -e "s/(image:.*\/consul:)[^\"]*/image: $6:${full_consul_version}/g" "${vfile}"
 
 	if test -z "$3"; then
 		sed_i ${SED_EXT} -e "s/(artifacthub.io\/prerelease:[[:space:]]*)[^\"]*/\1false/g" "${cfile}"
@@ -774,7 +769,7 @@ function prepare_dev {
 	#   * - error
 
 	echo "prepare_dev: dir:$1 consul-k8s:$5 consul:$6 date:"$3" mode:dev"
-	set_version "$1" "$5" "$3" "dev" "docker.mirror.hashicorp.services\/hashicorppreview\/consul-k8s-control-plane:" "$6" "docker.mirror.hashicorp.services\/hashicorppreview\/consul-enterprise"
+	set_version "$1" "$5" "$3" "dev" "docker.mirror.hashicorp.services\/hashicorppreview\/consul-k8s-control-plane:" "$6" "docker.mirror.hashicorp.services\/hashicorppreview\/consul"
 
 	return 0
 }
diff --git a/control-plane/build-support/scripts/consul-enterprise-version.sh b/control-plane/build-support/scripts/consul-enterprise-version.sh
new file mode 100755
index 0000000000..6b48bb4678
--- /dev/null
+++ b/control-plane/build-support/scripts/consul-enterprise-version.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+FILE=$1
+VERSION=$(yq .global.image $FILE)
+
+if [[ !"${VERSION}" == *"consul:"* ]]; then
+	VERSION=$(echo ${VERSION} | sed "s/consul:/consul-enterprise:/g")
+fi
+
+echo "${VERSION}"
diff --git a/control-plane/build-support/scripts/consul-version.sh b/control-plane/build-support/scripts/consul-version.sh
index e245e2a239..faaed33b20 100755
--- a/control-plane/build-support/scripts/consul-version.sh
+++ b/control-plane/build-support/scripts/consul-version.sh
@@ -4,4 +4,8 @@
 FILE=$1
 VERSION=$(yq .global.image $FILE)
 
+if [[ "${VERSION}" == *"consul-enterprise:"* ]]; then
+	VERSION=$(echo ${VERSION} | sed "s/consul-enterprise:/consul:/g")
+fi
+
 echo "${VERSION}"