Clean up update logic for java archives/debs

.github/workflows/update-deb-package-non-snapshots.yml

@@ -57,7 +57,7 @@ jobs:
           GH_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
         run: |
           BODY_FILE=$(mktemp)
-          printf "Bumping non-snapshot packages to latest stable version\n\`\`\`diff\n$DISTROLESS_DIFF\n\`\`\`\n" >> $BODY_FILE
+          printf "Bumping non-snapshot packages to latest stable version\n" >> $BODY_FILE
           if ! OUTPUT=$(gh pr create -B main -H update-non-snapshots -t "Bumping packages to latest stable versions" --body-file "$BODY_FILE" 2>&1) ; then
             echo $OUTPUT
             if [[ "${OUTPUT}" =~ "already exists" ]]; then

java/testdata/java21_debian12.yaml

@@ -3,11 +3,11 @@ commandTests:
   - name: java
     command: "/usr/lib/jvm/temurin21_jre_amd64/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "21.0.8"']
+    expectedError: ['openjdk version "21.0.9"']
   - name: java-symlink
     command: "/usr/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "21.0.8"']
+    expectedError: ['openjdk version "21.0.9"']
 fileExistenceTests:
   - name: certs
     path: "/etc/ssl/certs/java/cacerts"
@@ -36,4 +36,4 @@ fileExistenceTests:
 metadataTest:
   envVars:
     - key: 'JAVA_VERSION'
-      value: '21.0.8'
+      value: '21.0.9'

java/testdata/java21_debug_debian12.yaml

@@ -3,15 +3,15 @@ commandTests:
   - name: java
     command: "/usr/lib/jvm/temurin21_jdk_amd64/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "21.0.8"']
+    expectedError: ['openjdk version "21.0.9"']
   - name: java-symlink
     command: "/usr/bin/java"
     args: ["-version"]
-    expectedError: ['openjdk version "21.0.8"']
+    expectedError: ['openjdk version "21.0.9"']
   - name: javac
     command: "/usr/lib/jvm/temurin21_jdk_amd64/bin/javac"
     args: ["-version"]
-    expectedOutput: ['javac 21.0.8']
+    expectedOutput: ['javac 21.0.9']
 fileExistenceTests:
   - name: certs
     path: "/etc/ssl/certs/java/cacerts"
@@ -29,4 +29,4 @@ fileExistenceTests:
 metadataTest:
   envVars:
    - key: 'JAVA_VERSION'
-     value: '21.0.8'
+     value: '21.0.9'

knife

@@ -15,6 +15,9 @@ set -o pipefail -o errexit -o nounset
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+source knife.d/update_java_versions.sh
+source knife.d/update_java_archives.sh
+
 if [ $(uname) == "Darwin" ]; then
     echo "WARNING: You are on a macos, you need to run 'brew install coreutils gnu-sed' to install required packages."
     echo ""
@@ -32,13 +35,15 @@ function cmd_lock_snapshots() {
     echo ""
     local repos=$(grep -l snapshot.debian.org ./private/repos/deb/*.yaml | xargs -L 1 basename | cut -d. -f 1)
     _cmd_lock "$repos"
+    update_java_versions_debian12
 }
 
 function cmd_lock_non_snapshots() {
     echo "🚧 Querying for non_snapshot repos"
     echo ""
     local repos=$(grep -lL snapshot.debian.org ./private/repos/deb/*.yaml | xargs -L 1 basename | cut -d. -f 1)
     _cmd_lock "$repos"
+    update_java_versions_debian13
 }
 
 function _cmd_lock() {
@@ -150,11 +155,8 @@ function cmd_lint () {
 
 # deprecate with debian12
 function cmd_update_java_archives () {
-    source knife.d/update_java_archives.sh
-    old_version=$(get_java_version 21)
     generate_java_archives 21 > private/repos/java_temurin/java_21.MODULE.bazel
-    new_version=$(get_java_version 21)
-    update_test_versions_java21 $old_version $new_version
+    update_test_versions_java21_debian12
 }
 
 function cmd_update_node_archives () {
@@ -240,7 +242,7 @@ update-node-archives)
 	cmd_update_node_archives
 	;;
 ~~nocmd) # no command provided
-    echo "provide a command: lock, update-snapshots, github-update-snapshots, update-java-archives, test, deb-versions, update-node-archives"
+    echo "provide a command: lock, update-snapshots, github-update-snapshots, update-non-snapshots, update-java-archives, test, deb-versions, update-node-archives"
     exit 1
     ;;
 *) # unknown command

knife.d/update_java_archives.sh

@@ -17,9 +17,7 @@ set -o pipefail -o errexit -o nounset
 # a collection of functions to use when updating java archives from the knife utility
 
 function get_java_version() {
-  : "${1:?Error: java major version required}"
-  local major_version=$1
-  grep "#VERSION " "./private/repos/java_temurin/java_${major_version}.MODULE.bazel" | cut -d" " -f2
+  grep "#VERSION " "./private/repos/java_temurin/java_21.MODULE.bazel" | cut -d" " -f2
 }
 
 function underscore_encode() {
@@ -37,8 +35,8 @@ function generate_java_archives() {
   release_name=$(echo "$latest_release" | jq -r '.name')
   version=${release_name#jdk-}
   plain_version=$([[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]] && echo "${BASH_REMATCH[0]}")
-  archs=("x64" "aarch64" "ppc64le")
-  archs_deb=("amd64" "arm64" "ppc64le")
+  archs=("x64" "aarch64" "s390x" "ppc64le")
+  archs_deb=("amd64" "arm64" "s390x" "ppc64le")
   variants=("jre" "jdk")
 
 cat << EOM
@@ -85,14 +83,7 @@ EOM
   done
 }
 
-function update_test_versions_java21() {
-  local old_version=${1?:"no old version set in param 1"}
-  local new_version=${2?:"no new version set in param 2"}
-  sed -i -e "s/$old_version/$new_version/g" java/testdata/java21_*
-}
-
-function update_test_versions_java17() {
-  local old_version=${1?:"no old version set in param 1"}
-  local new_version=${2?:"no new version set in param 2"}
-  sed -i -e "s/$old_version/$new_version/g" java/testdata/java17_debian13
+function update_test_versions_java21_debian12() {
+  local new_version=$(get_java_version)
+  sed -i -r -e "s/21\\.[0-9]+\\.[0-9]+/${new_version}/g" java/testdata/java21*debian12.yaml
 }

knife.d/update_java_versions.sh

@@ -0,0 +1,36 @@
+set -o pipefail -o errexit -o nounset
+
+# Copyright 2024 Google Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# a collection of functions to use when updating java archives from the knife utility
+
+
+function update_java_versions_debian13() {
+  local java_versions=("21" "25")
+
+  for java_version in "${java_versions[@]}"; do
+    local version=$(jq -r --arg jv "temurin-${java_version}-jre" '.packages.[] | select((.arch=="amd64") and (.name==$jv)) | .version | split(".") | .[0:3] | join(".")' private/repos/deb/trixie_adoptium.lock.json)
+    local major_version=$(echo "$version" | cut -d. -f 1)
+    sed -i -r -e "s/${major_version}\\.[0-9]+\\.[0-9]+/${version}/g" java/testdata/java${major_version}*debian13.yaml
+  done
+}
+
+# deprecatd with debian12
+function update_java_versions_debian12() {
+  # java17 only
+  local version=$(jq -r '.packages.[] | select((.arch=="amd64") and (.name=="openjdk-17-jre-headless")) | .version | split("+")[0]' private/repos/deb/bookworm_java.lock.json)
+  local major_version=$(echo "$version" | cut -d. -f 1)
+  sed -i -r -e "s/${major_version}\\.[0-9]+\\.[0-9]+/${version}/g" java/testdata/java17*debian12.yaml
+}

private/repos/deb/trixie_adoptium.lock.json

@@ -135,46 +135,46 @@
 		{
 			"arch": "ppc64el",
 			"dependencies": [],
-			"key": "temurin-21-jre_21.0.8.0.0-p-9-0_ppc64el",
+			"key": "temurin-21-jre_21.0.9.0.0-p-10-0_ppc64el",
 			"name": "temurin-21-jre",
-			"sha256": "fb83cb94deca76fdb3ceaaa57bdfa756d66d8f7ec97da1901fd22eb65f170973",
+			"sha256": "f40ad7eb1378e66a065756bbcf35ad2ec9e151051c142ba201ab85541300894c",
 			"urls": [
-				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.8.0.0+9-0_ppc64el.deb"
+				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.9.0.0+10-0_ppc64el.deb"
 			],
-			"version": "21.0.8.0.0+9-0"
+			"version": "21.0.9.0.0+10-0"
 		},
 		{
 			"arch": "ppc64el",
 			"dependencies": [],
-			"key": "temurin-21-jdk_21.0.8.0.0-p-9-0_ppc64el",
+			"key": "temurin-21-jdk_21.0.9.0.0-p-10-0_ppc64el",
 			"name": "temurin-21-jdk",
-			"sha256": "01966a8b86a7973fe12c1578e22e09ccee679e415e987dccc870d25d8480cb7b",
+			"sha256": "41f019c0a41d0dde233776cb14c93343022685f4c038283a4523a278f2d4e652",
 			"urls": [
-				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.8.0.0+9-0_ppc64el.deb"
+				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.9.0.0+10-0_ppc64el.deb"
 			],
-			"version": "21.0.8.0.0+9-0"
+			"version": "21.0.9.0.0+10-0"
 		},
 		{
 			"arch": "ppc64el",
 			"dependencies": [],
-			"key": "temurin-25-jre_25.0.0.0.0-p-36-0_ppc64el",
+			"key": "temurin-25-jre_25.0.1.0.0-p-8-0_ppc64el",
 			"name": "temurin-25-jre",
-			"sha256": "193f646166bb7dd5dc15b9ebe2f18bfa7b8d2fc2baee72245bbd5dc09b06e235",
+			"sha256": "44989715a380bc9ede0a8221f5d5b3052243bef48e8c1733ea150bc44d399880",
 			"urls": [
-				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jre_25.0.0.0.0+36-0_ppc64el.deb"
+				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jre_25.0.1.0.0+8-0_ppc64el.deb"
 			],
-			"version": "25.0.0.0.0+36-0"
+			"version": "25.0.1.0.0+8-0"
 		},
 		{
 			"arch": "ppc64el",
 			"dependencies": [],
-			"key": "temurin-25-jdk_25.0.0.0.0-p-36-0_ppc64el",
+			"key": "temurin-25-jdk_25.0.1.0.0-p-8-0_ppc64el",
 			"name": "temurin-25-jdk",
-			"sha256": "9cfc8b38378c89ccc97a50f6156eacc1a0ed5e523fe54c375bc1d0d1fdbbbeb0",
+			"sha256": "8d2f1f8b0c3fb77564f1192777def40644962d6f1963caf50b7eea34d2102f55",
 			"urls": [
-				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jdk_25.0.0.0.0+36-0_ppc64el.deb"
+				"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jdk_25.0.1.0.0+8-0_ppc64el.deb"
 			],
-			"version": "25.0.0.0.0+36-0"
+			"version": "25.0.1.0.0+8-0"
 		}
 	],
 	"version": 1

private/repos/java_temurin/java_21.MODULE.bazel

@@ -1,85 +1,77 @@
 "repositories for java 21"
 
-#VERSION 21.0.8
+#VERSION 21.0.9
 
 java = use_extension("//private/extensions:java.bzl", "java")
-
-# amd64 JRE and JDK
 java.archive(
     name = "temurin21_jre_amd64",
     architecture = "amd64",
-    plain_version = "21.0.8",
-    sha256 = "968c283e104059dae86ea1d670672a80170f27a39529d815843ec9c1f0fa2a03",
-    strip_prefix = "jdk-21.0.8+9-jre",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "aeab55d064a1a27a3744b0880b9b414077b4ed2b1790817eea3df60aec946431",
+    strip_prefix = "jdk-21.0.9+10-jre",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jre_x64_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
 java.archive(
     name = "temurin21_jdk_amd64",
     architecture = "amd64",
-    plain_version = "21.0.8",
-    sha256 = "f2dc5418092c43003db8f9005c4a286e1c0104fea96ccdd49e8ebd037cac9219",
-    strip_prefix = "jdk-21.0.8+9",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "810d3773df7e0d6c4394e4e244b264c8b30e0b05a0acf542d065fd78a6b65c2f",
+    strip_prefix = "jdk-21.0.9+10",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_x64_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
-
-# arm64 JRE and JDK
 java.archive(
     name = "temurin21_jre_arm64",
     architecture = "arm64",
-    plain_version = "21.0.8",
-    sha256 = "f54f6e2a907c4aef95ce6d7388474c6d5d87ae87899dd309561672bcfda9121e",
-    strip_prefix = "jdk-21.0.8+9-jre",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "1d041073c65e834bdb4da732485a54ff829859dcd1549e7992f15bd73341be29",
+    strip_prefix = "jdk-21.0.9+10-jre",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
 java.archive(
     name = "temurin21_jdk_arm64",
     architecture = "arm64",
-    plain_version = "21.0.8",
-    sha256 = "e5c41a1ab0865ea5de9b4529bf8526005f1d4593090845387d14fe450ce39c33",
-    strip_prefix = "jdk-21.0.8+9",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "edf0da4debe7cf475dbe320d174d6eed81479eb363f41e38a2efb740428c603a",
+    strip_prefix = "jdk-21.0.9+10",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
-
-# s390x JRE and JDK
 java.archive(
     name = "temurin21_jre_s390x",
     architecture = "s390x",
-    plain_version = "21.0.8",
-    sha256 = "7f2f9e48cc0e970b671b4ee8c69bf98002e27e4546e0c33071a2ecac38a8154c",
-    strip_prefix = "jdk-21.0.8+9-jre",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_s390x_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "951eb9fd40e4478b0a7069b672bc0307f59045d756dd3ca6ed0b1ea12ab41ca2",
+    strip_prefix = "jdk-21.0.9+10-jre",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jre_s390x_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
 java.archive(
     name = "temurin21_jdk_s390x",
     architecture = "s390x",
-    plain_version = "21.0.8",
-    sha256 = "a84e3cbf8bb5f8a313e06b790c7bc388687ba00262e981f5e33432ebd4d34356",
-    strip_prefix = "jdk-21.0.8+9",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "e8ede0fb48aaa3a0cc1ac7c8522f8ca7938bdbb8be0d603b61134de7f898aff4",
+    strip_prefix = "jdk-21.0.9+10",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
-
-# ppc64le JRE and JDK
 java.archive(
     name = "temurin21_jre_ppc64le",
     architecture = "ppc64le",
-    plain_version = "21.0.8",
-    sha256 = "12c351c7a6906ca4ddd3f158cbd9ebf2733bab2dc432dc3f9d5685476b16b7bc",
-    strip_prefix = "jdk-21.0.8+9-jre",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
+    plain_version = "21.0.9",
+    sha256 = "4973d6a43393854ccabd32bf7a1306788831586166fc8f5fa34a9df428366014",
+    strip_prefix = "jdk-21.0.9+10-jre",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
 )
 java.archive(
     name = "temurin21_jdk_ppc64le",
     architecture = "ppc64le",
-    plain_version = "21.0.8",
-    sha256 = "a24e869b8e563fd7b9f7776f6686ca5d737c8d1c3c33c9b72836935709b44a34",
-    strip_prefix = "jdk-21.0.8+9",
-    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.8%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.8_9.tar.gz"],
-    version = "21.0.8+9",
-)
+    plain_version = "21.0.9",
+    sha256 = "ac5a0394a234269b4e20459649ac93cb702cde29b3e46a0bcf3aa53958f2d4a4",
+    strip_prefix = "jdk-21.0.9+10",
+    urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.9_10.tar.gz"],
+    version = "21.0.9+10",
+)