Update registry settings, if provided, for 'up' command call (#37)

* Update registry settings, if provided, for 'up' command call

* Resolve review feedback

* Update registry on Container App before updating CA

* Push new image to existing test CAs after builder image is deleted

Author: cormacpayne

.github/workflows/run-validation.yml

@@ -470,6 +470,11 @@ jobs:
         shell: bash
         run: az acr repository delete -n ${{ vars.TEST_ACR_NAME }} -t ${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} -y
 
+      - name: Update Container App with existing image
+        if: ${{ always() }}
+        shell: bash
+        run: az containerapp update -n ${{ env.TEST_CONTAINER_APP_NAME }} -g ${{ vars.TEST_RESOURCE_GROUP_NAME }} -i mcr.microsoft.com/azuredocs/containerapps-helloworld:latest
+
   update-using-image:
 
     name: 'Update app using image'

action.yml

@@ -514,8 +514,26 @@ runs:
           -n ${{ inputs.containerAppName }} \
           --yaml ${{ inputs.yamlConfigPath }}
 
+    - name: Determine whether or not 'update' or 'up' should be used
+      if: ${{ env.CA_GH_ACTION_YAML_PROVIDED != 'true' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' && (inputs.targetPort != '' || inputs.ingress != '') }}
+      shell: bash
+      run: |
+        CA_GH_ACTION_USE_UP="true"
+        echo "CA_GH_ACTION_USE_UP=${CA_GH_ACTION_USE_UP}" >> $GITHUB_ENV
+
+    - name: Update the Container Registry details on the existing Container App
+      if: ${{ env.CA_GH_ACTION_ACR_LOGIN_ARG != '' && env.CA_GH_ACTION_USE_UP != 'true' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' && env.CA_GH_ACTION_YAML_PROVIDED != 'true' }}
+      shell: bash
+      run: |
+        az containerapp registry set \
+          -g ${{ env.CA_GH_ACTION_RESOURCE_GROUP }} \
+          -n ${{ inputs.containerAppName }} \
+          --server ${{ inputs.acrName }}.azurecr.io \
+          --username ${{ inputs.acrUsername }} \
+          --password ${{ inputs.acrPassword }}
+
     - name: Update the existing Container App from provided arguments via 'update' (no ingress values provided)
-      if: ${{ env.CA_GH_ACTION_YAML_PROVIDED != 'true' && inputs.targetPort == '' && inputs.ingress == '' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' }}
+      if: ${{ env.CA_GH_ACTION_USE_UP != 'true' && env.CA_GH_ACTION_YAML_PROVIDED != 'true' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' }}
       shell: bash
       run: |
         az containerapp update \
@@ -525,21 +543,21 @@ runs:
           ${{ env.CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG }}
 
     - name: Reset the ingress argument environment variable if it wasn't provided (use default ingress value)
-      if: ${{ env.CA_GH_ACTION_YAML_PROVIDED != 'true' && inputs.ingress == '' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' }}
+      if: ${{ inputs.ingress == '' && env.CA_GH_ACTION_YAML_PROVIDED != 'true' && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' }}
       shell: bash
       run: |
         CA_GH_ACTION_INGRESS_ARG=""
         echo "CA_GH_ACTION_INGRESS_ARG=${CA_GH_ACTION_INGRESS_ARG}" >> $GITHUB_ENV
 
     - name: Reset the environment variables argument environment variable for the 'up' command
-      if: ${{ env.CA_GH_ACTION_YAML_PROVIDED != 'true' && inputs.environmentVariables != '' }}
+      if: ${{ env.CA_GH_ACTION_USE_UP == 'true' && inputs.environmentVariables != '' }}
       shell: bash
       run: |
         CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG="--env-vars ${{ inputs.environmentVariables }}"
         echo "CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG=${CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG}" >> $GITHUB_ENV
 
     - name: Update the existing Container App from provided arguments via 'up' (ingress values provided)
-      if: ${{ env.CA_GH_ACTION_YAML_PROVIDED != 'true' && (inputs.targetPort != '' || inputs.ingress != '') && env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' }}
+      if: ${{ env.CA_GH_ACTION_USE_UP == 'true' }}
       shell: bash
       run: |
         az containerapp up \
@@ -548,7 +566,8 @@ runs:
           -i ${{ env.CA_GH_ACTION_IMAGE_TO_DEPLOY }} \
           ${{ env.CA_GH_ACTION_TARGET_PORT_ARG }} \
           ${{ env.CA_GH_ACTION_INGRESS_ARG }} \
-          ${{ env.CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG }}
+          ${{ env.CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG }} \
+          ${{ env.CA_GH_ACTION_ACR_LOGIN_ARG }}
 
     - name: Disable ingress on the existing Container App
       if: ${{ env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' && inputs.ingress == 'disabled' && env.CA_GH_ACTION_YAML_PROVIDED != 'true' }}
@@ -558,17 +577,6 @@ runs:
           -g ${{ env.CA_GH_ACTION_RESOURCE_GROUP }} \
           -n ${{ inputs.containerAppName }}
 
-    - name: Update the Container Registry details on the existing Container App
-      if: ${{ env.CA_GH_ACTION_RESOURCE_EXISTS == 'true' && env.CA_GH_ACTION_ACR_LOGIN_ARG != '' && env.CA_GH_ACTION_YAML_PROVIDED != 'true' }}
-      shell: bash
-      run: |
-        az containerapp registry set \
-          -g ${{ env.CA_GH_ACTION_RESOURCE_GROUP }} \
-          -n ${{ inputs.containerAppName }} \
-          --server ${{ inputs.acrName }}.azurecr.io \
-          --username ${{ inputs.acrUsername }} \
-          --password ${{ inputs.acrPassword }}
-
     - name: Mark action as 'succeeded' for telemetry
       if: ${{ inputs.disableTelemetry == 'false' }}
       shell: bash