fix: address Copilot review comments on PR #1335

- Fix JAVA_HOME/install-jdk-17 ordering in test:native-android and
  build-and-upload:app so JDK 17 is installed before the Android SDK
  snippet relies on it
- Centralize the duplicated tart VM image string into a TART_VM_IMAGE
  variable in .gitlab-ci.yml and benchmarks/.benchmarks-ci.yml
- Check the exit status of `aws configure export-credentials` before
  eval'ing its output in get-secret.sh, instead of failing silently

Author: alee1246

.gitlab-ci.yml

@@ -6,6 +6,7 @@ include:
 variables:
     GIT_DEPTH: 5
     DEVELOP_BRANCH: 'develop'
+    TART_VM_IMAGE: '486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest'
     ANDROID_SDK_VERSION: 'commandlinetools-mac-11076708_latest'
     EMULATOR_NAME: 'android_emulator'
     ANDROID_ARCH: 'arm64-v8a'
@@ -48,7 +49,7 @@ stages:
 
 test:lint:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
@@ -59,7 +60,7 @@ test:lint:
 
 test:js:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
@@ -71,7 +72,7 @@ test:js:
 
 test:build:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
@@ -82,14 +83,14 @@ test:build:
 
 test:native-android:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
     timeout: 1h
     script:
-        - !reference [.snippets, install-android-sdk]
         - !reference [.snippets, install-jdk-17]
+        - !reference [.snippets, install-android-sdk]
         - /opt/homebrew/opt/openjdk@17/bin/java --version
         - echo "org.gradle.java.home=/opt/homebrew/opt/openjdk@17" >> packages/core/android/gradle.properties
         - echo "org.gradle.java.home=/opt/homebrew/opt/openjdk@17" >> packages/react-native-session-replay/android/gradle.properties
@@ -101,7 +102,7 @@ test:native-android:
 
 test:native-ios:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
@@ -113,7 +114,7 @@ test:native-ios:
 
 test:native-ios-sr:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'
@@ -125,7 +126,7 @@ test:native-ios-sr:
 
 test:native-ios-newarch:
     tags: ['macos:tart']
-    image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+    image: "$TART_VM_IMAGE"
     stage: test
     rules:
         - if: '$BUILD_BENCHMARK != "true"'

benchmarks/.benchmarks-ci.yml

@@ -5,6 +5,7 @@ include:
 variables:
   GIT_DEPTH: 5
   NODE_VERSION: '22.5.1'
+  TART_VM_IMAGE: '486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest'
   ANDROID_SDK_VERSION: 'commandlinetools-mac-11076708_latest'
   EMULATOR_NAME: 'android_emulator'
   ANDROID_ARCH: 'arm64-v8a'
@@ -63,11 +64,11 @@ stages:
 build-and-upload:app:
   stage: build-and-upload
   tags: ['macos:tart']
-  image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-reactnative-sonoma-latest"
+  image: "$TART_VM_IMAGE"
   script:
     - !reference [.snippets, install-node]
-    - !reference [.snippets, install-android-sdk]
     - !reference [.snippets, install-jdk-17]
+    - !reference [.snippets, install-android-sdk]
     - !reference [.snippets, check-versions]
 
     - echo $(pwd)

benchmarks/scripts/secrets/get-secret.sh

@@ -10,7 +10,12 @@ get_secret() {
     export VAULT_ADDR=$DD_VAULT_ADDR
     if [ "$CI" = "true" ]; then
         if [ -z "${AWS_ACCESS_KEY_ID:-}" ] || [ -z "${AWS_SECRET_ACCESS_KEY:-}" ]; then
-            eval "$(aws configure export-credentials --format env)"
+            local aws_env
+            if ! aws_env="$(aws configure export-credentials --format env)"; then
+                echo "Error: Failed to export AWS credentials via 'aws configure export-credentials'." >&2
+                exit 1
+            fi
+            eval "$aws_env"
         fi
         vault login -method=aws -no-print
     else