From 18582ab5621e385bf4cc4b79192c2c97cbc42067 Mon Sep 17 00:00:00 2001
From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
Date: Thu, 5 Sep 2024 00:52:06 -0700
Subject: [PATCH] Add Go 1.23 to final stage in builder-base Dockerfile

---
 builder-base/Dockerfile                       | 2 ++
 builder-base/scripts/check_upstream_golang.sh | 4 ++--
 builder-base/scripts/validate_components.sh   | 2 ++
 builder-base/versions.yaml                    | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/builder-base/Dockerfile b/builder-base/Dockerfile
index cb6c254e2..f99809b1f 100644
--- a/builder-base/Dockerfile
+++ b/builder-base/Dockerfile
@@ -606,6 +606,8 @@ COPY --link --from=golang-1.21 /golang-1.21 /
 COPY --link --from=go-licenses-1.21 /go-licenses-1.21 /
 COPY --link --from=golang-1.22 /golang-1.22 /
 COPY --link --from=go-licenses-1.22 /go-licenses-1.22 /
+COPY --link --from=golang-1.23 /golang-1.23 /
+COPY --link --from=go-licenses-1.23 /go-licenses-1.23 /
 COPY --link --from=go-vuln-check /go-vuln-check /
 # add the default golang verison last so its /usr/bin/go
 # takes precendent
diff --git a/builder-base/scripts/check_upstream_golang.sh b/builder-base/scripts/check_upstream_golang.sh
index 43c16518c..6f4f2a2e1 100755
--- a/builder-base/scripts/check_upstream_golang.sh
+++ b/builder-base/scripts/check_upstream_golang.sh
@@ -28,14 +28,14 @@ function update::go::version {
 
   local -r cur_builder_base_version=$(cat "${VERSIONS_YAML}" | grep -E "^GOLANG_VERSION_${majorversion//./}")
 
-  sed -i "s/${cur_builder_base_version}/GOLANG_VERSION_${majorversion//./}: ${version}-0/g" "${VERSIONS_YAML}"
+  yq eval -i -P ".GOLANG_VERSION_${majorversion//./} = \"${version}-0\" | sort_keys(.)" "${VERSIONS_YAML}"
 }
 
 function add::go::version {
   local -r version=$1
   local -r majorversion=$(if [[ $(echo "$version" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${version%.*}; else echo ${version%-*}; fi)
 
-  echo "GOLANG_VERSION_${majorversion//./}: $version-0" >>$VERSIONS_YAML
+  yq eval -i -P ".GOLANG_VERSION_${majorversion//./} = \"${version}-0\" | sort_keys(.)" "${VERSIONS_YAML}"
 }
 
 # Using YQ allows us to modify the existing tag or add the correct tag if it doesn't exist
diff --git a/builder-base/scripts/validate_components.sh b/builder-base/scripts/validate_components.sh
index 2d75f11de..0ac5585b3 100755
--- a/builder-base/scripts/validate_components.sh
+++ b/builder-base/scripts/validate_components.sh
@@ -71,6 +71,8 @@ if [ "${FINAL_STAGE_BASE}" = "full-copy-stage" ]; then
   /go/go1.21/bin/go-licenses --help
   /go/bin/go1.22 version
   /go/go1.22/bin/go-licenses --help
+  /go/bin/go1.23 version
+  /go/go1.23/bin/go-licenses --help
 
   gcc --version
 
diff --git a/builder-base/versions.yaml b/builder-base/versions.yaml
index 4738c9be3..a95a3f39f 100644
--- a/builder-base/versions.yaml
+++ b/builder-base/versions.yaml
@@ -8,10 +8,11 @@ GOLANG_VERSION_119: 1.19.13-14
 GOLANG_VERSION_120: 1.20.14-16
 GOLANG_VERSION_121: 1.21.13-0
 GOLANG_VERSION_122: 1.22.6-0
-GO_LICENSES_VERSION: v1.6.0
+GOLANG_VERSION_123: 1.23.0-0
+GOSS_VERSION: 3.1.4
 GOVC_VERSION: 0.34.2
+GO_LICENSES_VERSION: v1.6.0
 GO_VULN_CHECK_VERSION: v1.0.1
-GOSS_VERSION: 3.1.4
 HELM_VERSION: 3.8.1
 HUGO_VERSION: 0.85.0
 LINUXKIT_VERSION: v0.0.0-20220415093837-b710224cdf9a
@@ -19,12 +20,11 @@ NODEJS_VERSION: v16.18.1
 NOTATION_VERSION: 1.0.1
 ORAS_VERSION: 1.1.0
 OVERRIDE_BASH_VERSION: 4.3
-PACKER_VERSION: 1.9.5
 PACKER_ANSIBLE_PLUGIN: v1.1.1
+PACKER_VERSION: 1.9.5
 PYWINRM_VERSION: 0.4.1
 SEVENZIP_VERSION: 24.06
 SKOPEO_VERSION: v1.5.2
 SKOPEO_VERSION_AL23: v1.13.3
 UPX_VERSION: 4.2.0
 YQ_VERSION: v4.30.6
-GOLANG_VERSION_123: 1.23.0-0