From 68f0c8b06a0bacb23498ccd67b58bce4b116a79e Mon Sep 17 00:00:00 2001
From: Are Almaas <arealmaas@gmail.com>
Date: Tue, 6 Feb 2024 13:22:21 +0100
Subject: [PATCH] fix(azure): rename and fix outputs and pass correct secrets
 (#416)

---
 .azure/infrastructure/main.bicep         | 2 +-
 .github/workflows/action-deploy-apps.yml | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.azure/infrastructure/main.bicep b/.azure/infrastructure/main.bicep
index 78e8e5570..4ad48b15a 100644
--- a/.azure/infrastructure/main.bicep
+++ b/.azure/infrastructure/main.bicep
@@ -240,5 +240,5 @@ module keyVaultReaderAccessPolicy '../modules/keyvault/addReaderRoles.bicep' = {
 }
 
 output resourceGroupName string = resourceGroup.name
-output containterAppEnvId string = containerAppEnv.outputs.containerAppEnvId
+output containerAppEnvId string = containerAppEnv.outputs.containerAppEnvId
 output environmentKeyVaultName string = keyVaultModule.outputs.name
diff --git a/.github/workflows/action-deploy-apps.yml b/.github/workflows/action-deploy-apps.yml
index a15aa3d13..cfff54300 100644
--- a/.github/workflows/action-deploy-apps.yml
+++ b/.github/workflows/action-deploy-apps.yml
@@ -94,7 +94,7 @@ jobs:
         with:
           azcliversion: 2.56.0
           inlineScript: |
-            az containerapp job start -n ${{ steps.deploy.outputs.migrationJobName }} -g ${{ steps.deploy.outputs.resourceGroupName }}
+            az containerapp job start -n ${{ steps.deploy.outputs.name }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }}
 
       - name: Verify migration
         uses: azure/CLI@v1
@@ -104,7 +104,7 @@ jobs:
         with:
           azcliversion: ${{ env.AZ_CLI_VERSION }}
           inlineScript: |
-            ./.github/tools/containerAppJobVerifier.sh ${{ steps.deploy.outputs.migrationJobName }} ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} ${{ inputs.gitShortSha }}
+            ./.github/tools/containerAppJobVerifier.sh ${{ steps.deploy.outputs.name }} ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} ${{ inputs.gitShortSha }}
 
       - name: Logout from azure
         if: ${{failure() || success()}}
@@ -115,7 +115,6 @@ jobs:
     name: Deploy ${{ matrix.name }} to ${{ inputs.environment }}
     runs-on: ubuntu-latest
     needs: deploy-migration-job
-    if: ${{ !inputs.skip }}
     strategy:
       fail-fast: true
       matrix: