CCM-11938: try

Author: sidnhs

.github/actions/build-proxies/action.yml

@@ -103,15 +103,15 @@ runs:
       run: |
         #Change this back to proxy-deploy.yaml after testing
         .github/scripts/dispatch_internal_repo_workflow.sh \
-          --infraRepoName "$(echo ${{ github.repository }} | cut -d'/' -f2)" \
           --internalRef "feature/CCM-11938_workflow" \
-          --targetWorkflow "proxy-deploy.yaml" \
+          --targetWorkflow "dispatch-deploy-notify-account-provisioning.yaml" \
           --targetEnvironment "${{ inputs.environment }}" \
           --runId "${{ inputs.runId }}" \
           --buildSandbox ${{ inputs.buildSandbox }} \
           --apimEnvironment "${{ inputs.apimEnv }}" \
           --boundedContext "notify-supplier" \
-          --targetDomain "$TARGET_DOMAIN"
+          --targetDomain "$TARGET_DOMAIN" \
+          --version "${{ inputs.version }}"
 
     # - name: Set docker tag
     #   shell: bash

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -100,6 +100,10 @@ while [[ $# -gt 0 ]]; do
       targetDomain="$2"
       shift 2
       ;;
+    --version) # Version (optional)
+      version="$2"
+      shift 2
+      ;;
     *)
     echo "[ERROR] Unknown argument: $1"
       exit 1
@@ -141,6 +145,10 @@ if [[ -z "$targetDomain" ]]; then
   targetDomain=""
 fi
 
+if [[ -z "$version" ]]; then
+  version=""
+fi
+
 echo "==================== Workflow Dispatch Parameters ===================="
 echo "  infraRepoName:      $infraRepoName"
 echo "  releaseVersion:     $releaseVersion"
@@ -159,6 +167,7 @@ echo "  buildSandbox:        $buildSandbox"
 echo "  apimEnvironment:     $apimEnvironment"
 echo "  boundedContext:       $boundedContext"
 echo "  targetDomain:         $targetDomain"
+echo "  version:              $version"
 
 DISPATCH_EVENT=$(jq -ncM \
   --arg infraRepoName "$infraRepoName" \
@@ -177,6 +186,7 @@ DISPATCH_EVENT=$(jq -ncM \
   --arg apimEnvironment "$apimEnvironment" \
   --arg boundedContext "$boundedContext" \
   --arg targetDomain "$targetDomain" \
+  --arg version "$version" \
   '{
     "ref": "'"$internalRef"'",
     "inputs": (
@@ -193,6 +203,7 @@ DISPATCH_EVENT=$(jq -ncM \
       (if $apimEnvironment != "" then { "apimEnvironment": $apimEnvironment } else {} end) +
       (if $boundedContext != "" then { "boundedContext": $boundedContext } else {} end) +
       (if $targetDomain != "" then { "targetDomain": $targetDomain } else {} end) +
+      (if $version != "" then { "version": $version } else {} end) +
       { "targetEnvironment": $targetEnvironment } +
       { "targetAccountGroup": $targetAccountGroup }
     )

.github/workflows/manual-proxy-environment-deploy.yaml

@@ -3,6 +3,10 @@ name: Deploy proxy to environment
 on:
   workflow_dispatch:
     inputs:
+      version:
+        description: Version number
+        required: true
+        type: string
       environment:
         description: Name of the environment to deploy
         required: true
@@ -53,24 +57,29 @@ jobs:
 
       - name: Set APIM_ENV
         shell: bash
+        env:
+          ENVIRONMENT: ${{ inputs.environment }}
+          PR_NUMBER: ${{ steps.pr_exists.outputs.pr_number }}
         run: |
-          if [ -z "${{ steps.pr_exists.outputs.pr_number }}" ]; then
-            echo "APIM_ENV=${{ inputs.environment }}" >> $GITHUB_ENV
+          if [ -z "$PR_NUMBER" ]; then
+            echo "APIM_ENV=$ENVIRONMENT" >> $GITHUB_ENV
           else
-            echo "APIM_ENV=${{ inputs.environment }}-pr" >> $GITHUB_ENV
+            echo "APIM_ENV=${ENVIRONMENT}-pr" >> $GITHUB_ENV
           fi
       - name: Build environment oas
         working-directory: .
         shell: bash
-        run: make build-json-oas-spec APIM_ENV=${{ env.APIM_ENV }}
+        env:
+          APIM_ENV: ${{ env.APIM_ENV }}
+        run: make build-json-oas-spec APIM_ENV=$APIM_ENV
       - name: "Build proxies"
         uses: ./.github/actions/build-proxies
         with:
           version: "${{ inputs.version }}"
           environment: "${{ env.APIM_ENV }}"
-          apim_env: "${{ env.APIM_ENV }}"
-          run_id: "${{ github.run_id }}"
-          build_sandbox: false
+          apimEnv: "${{ env.APIM_ENV }}"
+          runId: "${{ github.run_id }}"
+          buildSandbox: false
 
       # - name: Set target and cert
       #   shell: bash