Merge pull request #579 from cloudfoundry/consume-golang-1

use golang-1-* and update vendor packages script
cloudfoundry · Apr 20, 2022 · 2ea8616 · 2ea8616
2 parents 80c19d9 + 9a4ab77
commit 2ea8616
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 31 deletions.
diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml
@@ -0,0 +1,6 @@
+builds:
+  b8021c5bdc377a4807fb1caad8416215032698ae356825afb427c7efc5ef76c1:
+    version: b8021c5bdc377a4807fb1caad8416215032698ae356825afb427c7efc5ef76c1
+    blobstore_id: 1085db26-f5ec-42d3-7389-5750b941602a
+    sha1: sha256:2a2785460af04aee276c3c2b38dd914c8e1cbefbf52cb14da130207e82e86289
+format-version: "2"
diff --git a/.final_builds/packages/golang-1.18-linux/index.yml b/.final_builds/packages/golang-1.18-linux/index.yml
diff --git a/.tool-versions b/.tool-versions
@@ -1,5 +1,5 @@
-golang 1.18
-java adoptopenjdk-11.0.12+7
+golang 1.18.1
+java openjdk-11
 ruby 2.7.4
 maven 3.6.3
 nodejs 16.10.0

diff --git a/jobs/golangapiserver/spec b/jobs/golangapiserver/spec
@@ -32,7 +32,7 @@ templates:
   hooks/post-start.sh.erb: bin/hooks/post-start.sh
   hooks/post-stop.sh.erb: bin/hooks/post-stop.sh
 packages:
-  - golang-1.18-linux
+  - golang-1-linux
   - golangapiserver
   - db
   - openjdk-11

diff --git a/packages/changeloglockcleaner/packaging b/packages/changeloglockcleaner/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/changeloglockcleaner/spec b/packages/changeloglockcleaner/spec
@@ -2,7 +2,7 @@
 name: changeloglockcleaner
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 

diff --git a/packages/eventgenerator/packaging b/packages/eventgenerator/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/eventgenerator/spec b/packages/eventgenerator/spec
@@ -2,7 +2,7 @@
 name: eventgenerator
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1-linux
+fingerprint: b8021c5bdc377a4807fb1caad8416215032698ae356825afb427c7efc5ef76c1
diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit
@@ -0,0 +1 @@
+a7d96582bcd53009f6db424ec6868c728d02a6af
diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version
@@ -0,0 +1 @@
+1.18.1
diff --git a/packages/golang-1.18-linux/spec.lock b/packages/golang-1.18-linux/spec.lock
diff --git a/packages/golangapiserver/packaging b/packages/golangapiserver/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/golangapiserver/spec b/packages/golangapiserver/spec
@@ -2,7 +2,7 @@
 name: golangapiserver
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/metricsforwarder/packaging b/packages/metricsforwarder/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/metricsforwarder/spec b/packages/metricsforwarder/spec
@@ -2,7 +2,7 @@
 name: metricsforwarder
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/metricsgateway/packaging b/packages/metricsgateway/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/metricsgateway/spec b/packages/metricsgateway/spec
@@ -2,7 +2,7 @@
 name: metricsgateway
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/metricsserver/packaging b/packages/metricsserver/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/metricsserver/spec b/packages/metricsserver/spec
@@ -2,7 +2,7 @@
 name: metricsserver
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/openjdk-11/vendored-commit b/packages/openjdk-11/vendored-commit
@@ -0,0 +1 @@
+dbdec67b4bf923f584f65dc88a247a568d46a9b0
diff --git a/packages/operator/packaging b/packages/operator/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/operator/spec b/packages/operator/spec
@@ -2,7 +2,7 @@
 name: operator
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/packages/scalingengine/packaging b/packages/scalingengine/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.18-linux)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang-1-linux)
 export PATH=$GOROOT/bin:$PATH
 export GOPATH=${BOSH_COMPILE_TARGET}
 export GOCACHE=/tmp/gocache

diff --git a/packages/scalingengine/spec b/packages/scalingengine/spec
@@ -2,7 +2,7 @@
 name: scalingengine
 
 dependencies:
-- golang-1.18-linux
+- golang-1-linux
 
 files:
 - autoscaler/*

diff --git a/scripts/update_vendor_packages b/scripts/update_vendor_packages
@@ -2,19 +2,41 @@
 
 set -euo pipefail
 
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
 function vendor-package {
   local release=${1}
   local package=${2}
 
   local tmpdir_name="/tmp/${release}-${RANDOM}"
-  mkdir -p ${tmpdir_name}
+  mkdir -p "${tmpdir_name}"
   trap "rm -r -f ${tmpdir_name}" EXIT
 
-  pushd ${tmpdir_name}
+  pushd "${tmpdir_name}"
     git clone --depth 1 "https://github.com/bosh-packages/${release}.git" .
+    vendored_commit=$(git rev-parse HEAD)
   popd
-  bosh vendor-package ${package} ${tmpdir_name}
+
+  bosh vendor-package "${package}" "${tmpdir_name}"
+  echo "${vendored_commit}" >> "${script_dir}/../packages/${package}/vendored-commit"
+
+  package_version_file="${tmpdir_name}/packages/${package}/version"
+  if [[ -f "${package_version_file}" ]]; then
+    cp "${package_version_file}" "${script_dir}/../packages/${package}"
+  fi
 }
 
-vendor-package golang-release golang-1.18-linux
+vendor-package golang-release golang-1-linux
 vendor-package java-release openjdk-11
+
+golang_version=$( cat "${script_dir}/../packages/golang-1-linux/version")
+stripped_go_version=$(echo "${golang_version}" | cut -d . -f -2)
+
+sed -i '' "s/go 1.*/go $stripped_go_version/g" "${script_dir}/../src/acceptance/go.mod"
+sed -i '' "s/go 1.*/go $stripped_go_version/g" "${script_dir}/../src/autoscaler/go.mod"
+sed -i '' "s/go 1.*/go $stripped_go_version/g" "${script_dir}/../src/changelog/go.mod"
+sed -i '' "s/go 1.*/go $stripped_go_version/g" "${script_dir}/../src/changeloglockcleaner/go.mod"
+
+sed -i '' "s/golang 1.*/golang $golang_version/g" "${script_dir}/../.tool-versions"
+
+