fix inconsistencies

Author: metal-messiah

.github/workflows/deploy-environment.yml

@@ -39,6 +39,9 @@ jobs:
       version_label: ${{ steps.set-version.outputs.version_label }}
       region_name: ${{ steps.env-details.outputs.region_name }}
       env_id: ${{ steps.env-details.outputs.env_id }}
+      nrba_app_id: ${{ steps.env-details.outputs.nrba_app_id }}
+      entity_guid: ${{ steps.env-details.outputs.entity_guid }}
+      application_name: ${{ steps.env-details.outputs.application_name }}
     steps:
       - uses: actions/checkout@v4
 
@@ -85,7 +88,40 @@ jobs:
           [[ "$NR_ENV" != "dev" ]] && NOTIFY="true" || NOTIFY="false"
           echo "send_notification=${NOTIFY}" >> $GITHUB_OUTPUT
           
+          # Derive environment-specific secrets (computed once, used multiple times)
+          case "$ENV_ID" in
+            dev)
+              NRBA_APP_ID="${{ secrets.INTERNAL_DEV_APPLICATION_ID }}"
+              ENTITY_GUID="${{ secrets.NR_ENTITY_GUID_NR1_DEV }}"
+              APP_NAME="Browser Agent NR1 Dev"
+              ;;
+            staging)
+              NRBA_APP_ID="${{ secrets.INTERNAL_STAGING_APPLICATION_ID }}"
+              ENTITY_GUID="${{ secrets.NR_ENTITY_GUID_NR1_STAGING }}"
+              APP_NAME="Browser Agent NR1 Staging"
+              ;;
+            eu-prod)
+              NRBA_APP_ID="${{ secrets.INTERNAL_EU_PRODUCTION_APPLICATION_ID }}"
+              ENTITY_GUID="${{ secrets.NR_ENTITY_GUID_NR1_EU_PROD }}"
+              APP_NAME="Browser Agent NR1 EU Production"
+              ;;
+            jp-prod)
+              NRBA_APP_ID="${{ secrets.INTERNAL_JP_PRODUCTION_APPLICATION_ID }}"
+              ENTITY_GUID="${{ secrets.NR_ENTITY_GUID_NR1_JP_PROD }}"
+              APP_NAME="Browser Agent NR1 JP Production"
+              ;;
+            *)
+              NRBA_APP_ID="${{ secrets.INTERNAL_PRODUCTION_APPLICATION_ID }}"
+              ENTITY_GUID="${{ secrets.NR_ENTITY_GUID_NR1_US_PROD }}"
+              APP_NAME="Browser Agent NR1 US Production"
+              ;;
+          esac
+          echo "nrba_app_id=${NRBA_APP_ID}" >> $GITHUB_OUTPUT
+          echo "entity_guid=${ENTITY_GUID}" >> $GITHUB_OUTPUT
+          echo "application_name=${APP_NAME}" >> $GITHUB_OUTPUT
+          
           echo "🏷️  Environment: ${NR_ENV}, Bucket: ${BUCKET_DIR}, Region: ${REGION}, Branch Suffix: ${APPEND_BRANCH}, NRDB Upload: ${UPLOAD_NRDB}, Notify: ${NOTIFY}"
+          echo "🔐 App ID: ${NRBA_APP_ID}, Application: ${APP_NAME}"
       
       # Determine branch name for version suffix (only dev)
       - name: Determine branch name for version
@@ -115,7 +151,7 @@ jobs:
           branch_name: ${{ steps.env-details.outputs.append_branch_name == 'true' && steps.branch-name.outputs.branch_name || '' }}
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws_role: ${{ steps.env-details.outputs.env_id == 'dev' && secrets.INTERNAL_DEV_APPLICATION_ID || steps.env-details.outputs.env_id == 'staging' && secrets.INTERNAL_STAGING_APPLICATION_ID || steps.env-details.outputs.env_id == 'eu-prod' && secrets.INTERNAL_EU_PRODUCTION_APPLICATION_ID || steps.env-details.outputs.env_id == 'jp-prod' && secrets.INTERNAL_JP_PRODUCTION_APPLICATION_ID || secrets.INTERNAL_PRODUCTION_APPLICATION_ID }}
+          aws_role: ${{ secrets.AWS_ROLE_ARN }}
           aws_bucket_name: ${{ secrets.AWS_BUCKET }}
           fastly_key: ${{ secrets.FASTLY_PURGE_KEY }}
 
@@ -125,7 +161,7 @@ jobs:
         with:
           nr_environment: ${{ inputs.nr_environment }}
           nrba_released_script_url: ${{ inputs.script_url == '' && steps.deploy-rc.outputs.script_url || inputs.script_url }}
-          nrba_app_id: ${{ steps.env-details.outputs.env_id == 'dev' && secrets.INTERNAL_DEV_APPLICATION_ID || steps.env-details.outputs.env_id == 'staging' && secrets.INTERNAL_STAGING_APPLICATION_ID || steps.env-details.outputs.env_id == 'eu-prod' && secrets.INTERNAL_EU_PRODUCTION_APPLICATION_ID || steps.env-details.outputs.env_id == 'jp-prod' && secrets.INTERNAL_JP_PRODUCTION_APPLICATION_ID || secrets.INTERNAL_PRODUCTION_APPLICATION_ID }}
+          nrba_app_id: ${{ steps.env-details.outputs.nrba_app_id }}
           nrba_license_key: ${{ secrets.INTERNAL_LICENSE_KEY }}
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -181,9 +217,9 @@ jobs:
         uses: ./.github/actions/change-tracking
         with:
           accountId: '1067061'
-          entityGuid: ${{ needs.deploy.outputs.env_id == 'dev' && secrets.NR_ENTITY_GUID_NR1_DEV || needs.deploy.outputs.env_id == 'staging' && secrets.NR_ENTITY_GUID_NR1_STAGING || needs.deploy.outputs.env_id == 'eu-prod' && secrets.NR_ENTITY_GUID_NR1_EU_PROD || needs.deploy.outputs.env_id == 'jp-prod' && secrets.NR_ENTITY_GUID_NR1_JP_PROD || secrets.NR_ENTITY_GUID_NR1_US_PROD }}
+          entityGuid: ${{ needs.deploy.outputs.entity_guid }}
           apiKey: ${{ secrets.NR_CHANGE_TRACKING_API_KEY_NR1 }}
-          region: ${{ needs.deploy.outputs.region_name }}
+          application: ${{ needs.deploy.outputs.application_name }}
           version: ${{ needs.deploy.outputs.version_label }}
           type: Rolling
           description: '${{ needs.deploy.outputs.region_name }} promoted to ${{ needs.deploy.outputs.version_label }}'