updatecli: use .go-version (#335)

Author: v1v

.buildkite/pipeline.yml

@@ -2,7 +2,6 @@
 
 env:
   SETUP_GVM_VERSION: "v0.5.1"
-  GOLANG_VERSION: "1.21.3"
   IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
   IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
   DOCKER_REGISTRY: "docker.elastic.co"

.buildkite/scripts/common.sh

@@ -3,26 +3,31 @@
 set -euo pipefail
 
 REPO="golang-crossbuild"
-WORKSPACE="$(pwd)/bin"
+WORKSPACE="$(pwd)"
+BIN="${WORKSPACE}/bin"
 HW_TYPE="$(uname -m)"
 PLATFORM_TYPE="$(uname)"
 TMP_FOLDER="tmp.${REPO}"
 GOOGLE_CREDENTIALS_FILENAME="google-cloud-credentials.json"
 
+if [[ -z "${GOLANG_VERSION-""}" ]]; then
+    export GOLANG_VERSION=$(cat "${WORKSPACE}/.go-version")
+fi
+
 add_bin_path() {
     echo "Adding PATH to the environment variables..."
-    create_workspace
-    export PATH="${PATH}:${WORKSPACE}"
+    create_bin
+    export PATH="${PATH}:${BIN}"
 }
 
 with_go() {
     local go_version="${1}"
     echo "Setting up the Go environment..."
-    create_workspace
+    create_bin
     check_platform_architecture
-    retry 5 curl -sL -o ${WORKSPACE}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${PLATFORM_TYPE}-${arch_type}"
-    export PATH="${PATH}:${WORKSPACE}"
-    chmod +x ${WORKSPACE}/gvm
+    retry 5 curl -sL -o ${BIN}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${PLATFORM_TYPE}-${arch_type}"
+    export PATH="${PATH}:${BIN}"
+    chmod +x ${BIN}/gvm
     eval "$(gvm "$go_version")"
     go version
     which go
@@ -37,15 +42,15 @@ with_mage() {
             "github.com/jstemmer/go-junit-report"
             "gotest.tools/gotestsum"
     )
-    create_workspace
+    create_bin
     for pkg in "${install_packages[@]}"; do
         go install "${pkg}@latest"
     done
 }
 
-create_workspace() {
-    if [[ ! -d "${WORKSPACE}" ]]; then
-    mkdir -p ${WORKSPACE}
+create_bin() {
+    if [[ ! -d "${BIN}" ]]; then
+    mkdir -p ${BIN}
     fi
 }
 
@@ -87,7 +92,7 @@ retry() {
 }
 
 google_cloud_auth() {
-    local gsUtilLocation=$(mktemp -d -p ${WORKSPACE} -t "${TMP_FOLDER}.XXXXXXXXX")
+    local gsUtilLocation=$(mktemp -d -p ${BIN} -t "${TMP_FOLDER}.XXXXXXXXX")
     local secretFileLocation=${gsUtilLocation}/${GOOGLE_CREDENTIALS_FILENAME}
     echo "${PRIVATE_CI_GCS_CREDENTIALS_SECRET}" > ${secretFileLocation}
     gcloud auth activate-service-account --key-file ${secretFileLocation} 2> /dev/null
@@ -118,7 +123,7 @@ google_cloud_logout_active_account() {
 
 cleanup() {
   echo "Deleting temporary files..."
-  rm -rf ${WORKSPACE}/${TMP_FOLDER}.*
+  rm -rf ${BIN}/${TMP_FOLDER}.*
   echo "Done."
 }
 

.ci/bump-go-release-version.sh

@@ -24,8 +24,6 @@ GOLANG_DOWNLOAD_SHA256_ARM=$(curl -s -L https://golang.org/dl/\?mode\=json | jq
 GOLANG_DOWNLOAD_SHA256_AMD=$(curl -s -L https://golang.org/dl/\?mode\=json | jq -r ".[] | select( .version | contains(\"go${GO_RELEASE_VERSION}\")) | .files[] | select (.filename | contains(\"go${GO_RELEASE_VERSION}.linux-amd64.tar.gz\")) | .sha256")
 
 echo "Update go version ${GO_RELEASE_VERSION}"
-${SED} -E -e "s#(VERSION[[:space:]]+):= .*#\1:= ${GO_RELEASE_VERSION}#g" "go/Makefile.common"
-${SED} -E -e "s#(GO_VERSION[[:space:]]+)= .*#\1= '${GO_RELEASE_VERSION}'#g" Jenkinsfile
 
 find "go" -type f -name Dockerfile.tmpl -print0 |
     while IFS= read -r -d '' line; do

.ci/bump-golang.yml

@@ -74,10 +74,30 @@ conditions:
     failwhen: true
 
 targets:
+  update-go-version:
+    name: "Update .go-version"
+    sourceid: latestGoVersion
+    scmid: githubConfig
+    kind: file
+    spec:
+      content: '{{ source "latestGoVersion" }}'
+      file: .go-version
+      matchpattern: '\d+.\d+.\d+'
+  update-go-makefile.common:
+    name: "Update go/Makefile.common"
+    sourceid: latestGoVersion
+    scmid: githubConfig
+    kind: file
+    spec:
+      content: '{{ source "latestGoVersion" }}'
+      file: go/Makefile.common
+      matchpattern: '\d+.\d+.\d+'
   update-go-versions:
     name: 'Update go version {{ source "latestGoVersion" }}'
     kind: shell
     sourceid: latestGoVersion
     scmid: githubConfig
     spec:
       command: .ci/bump-go-release-version.sh
+      environments:
+        - name: PATH

.go-version

@@ -0,0 +1 @@
+1.21.4

Jenkinsfile

@@ -29,7 +29,6 @@ pipeline {
     DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod'
     DOCKER_REGISTRY = 'docker.elastic.co'
     STAGING_IMAGE = "${env.DOCKER_REGISTRY}/observability-ci"
-    GO_VERSION = '1.21.4'
     BUILDX = "1"
   }
   options {
@@ -52,6 +51,9 @@ pipeline {
         deleteDir()
         gitCheckout(basedir: BASE_DIR)
         stash name: 'source', useDefaultExcludes: false
+        dir("${BASE_DIR}"){
+          setEnvVar('GO_VERSION', readFile(".go-version").trim())
+        }
       }
     }
     stage('Package'){