feat(76471): fixes after PR review

Author: bogdandina

.github/workflows/ci-cd-java.yml

@@ -44,6 +44,7 @@ jobs:
 
       # Required since custom scripts from /scripts are being used
       - name: Resolve shared workflow ref
+        id: resolve_shared_workflow_ref
         run: |
           set -euo pipefail
           SHARED_WORKFLOW_REF=$(grep -roh \
@@ -57,13 +58,13 @@ jobs:
           fi
 
           echo "Resolved shared workflow ref: ${SHARED_WORKFLOW_REF}"
-          echo "SHARED_WORKFLOW_REF=${SHARED_WORKFLOW_REF}" >> "$GITHUB_ENV"
+          echo "shared_workflow_ref=${SHARED_WORKFLOW_REF}" >> "$GITHUB_OUTPUT"
 
       - name: Checkout shared workflow scripts
         uses: actions/checkout@v4
         with:
           repository: HSLdevcom/transitdata-shared-workflows
-          ref: ${{ env.SHARED_WORKFLOW_REF }}
+          ref: ${{ steps.resolve_shared_workflow_ref.outputs.shared_workflow_ref }}
           path: .shared-workflows
 
       - name: Setup JDK

scripts/test_validate_java_version_consistency.py

@@ -145,15 +145,6 @@ def test_simple_jre_tag(self, tmp_path):
         assert version == "25"
         assert "1.0.2-25-java-jre" in image_ref
 
-    def test_arg_substitution(self, tmp_path):
-        dockerfile = tmp_path / "Dockerfile"
-        dockerfile.write_text(
-            "ARG BASE_TAG=1.0.2-25-java-jre\n"
-            "FROM hsldevcom/infodevops-docker-base-images:${BASE_TAG}\n"
-        )
-        version, _ = parse_docker_java_version(str(dockerfile))
-        assert version == "25"
-
     def test_multistage_uses_last_non_scratch(self, tmp_path):
         dockerfile = tmp_path / "Dockerfile"
         dockerfile.write_text(
@@ -236,16 +227,6 @@ def test_standard_multistage_returns_first_real_from(self, tmp_path):
         image = parse_docker_jdk_image(str(dockerfile))
         assert image == "hsldevcom/infodevops-docker-base-images:1.0.2-25-java-jdk"
 
-    def test_arg_substitution(self, tmp_path):
-        dockerfile = tmp_path / "Dockerfile"
-        dockerfile.write_text(
-            "ARG BASE_TAG=1.0.2-25-java-jdk\n"
-            "FROM hsldevcom/infodevops-docker-base-images:${BASE_TAG} AS base\n"
-            "FROM hsldevcom/infodevops-docker-base-images:1.0.2-25-java-jre\n"
-        )
-        image = parse_docker_jdk_image(str(dockerfile))
-        assert "1.0.2-25-java-jdk" in image
-
     def test_single_stage_returns_only_image(self, tmp_path):
         dockerfile = tmp_path / "Dockerfile"
         dockerfile.write_text(

scripts/validate_java_version_consistency.py

@@ -69,11 +69,6 @@ def parse_docker_jdk_image(dockerfile_path):
             if not line:
                 continue
 
-            arg_match = re.match(r'^ARG\s+([A-Za-z_][A-Za-z0-9_]*)=(.+)$', line, re.IGNORECASE)
-            if arg_match:
-                args[arg_match.group(1)] = arg_match.group(2).strip()
-                continue
-
             from_match = re.match(r'^FROM\s+([^\s]+)', line, re.IGNORECASE)
             if from_match:
                 image = resolve_args(from_match.group(1).strip(), args)