Merge pull request #80 from joelbyford/oidc

OIDC

Author: joelbyford

.github/workflows/main-pr.yml

@@ -15,6 +15,30 @@ jobs:
     steps:
     - name: Git checkout
       uses: actions/checkout@v2
+    
+    # Installs the CLI-beta in a python venv
+    - name: Installing CLI-beta for OpenID Connect
+      run: |
+        cd ../..
+        CWD="$(pwd)"
+        python3 -m venv oidc-venv
+        . oidc-venv/bin/activate
+        echo "activated environment"
+        python3 -m pip install -q --upgrade pip
+        echo "started installing cli beta"
+        pip install -q --extra-index-url https://azcliprod.blob.core.windows.net/beta/simple/ azure-cli
+        echo "***************installed cli beta*******************"
+        echo "$CWD/oidc-venv/bin" >> $GITHUB_PATH
+
+    # Logs into Azure via OIDC (note no password)
+    - name: 'Az OIDC CLI login'
+      uses: azure/[email protected]
+      with:
+        client-id: ${{ secrets.AZURE_CLIENTID }}
+        tenant-id: ${{ secrets.AZURE_TENANTID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTIONID }}
+        # Name of the environment. Supported values are azurecloud, azurestack, azureusgovernment, azurechinacloud, azuregermancloud. Default being azurecloud
+        # environment: azurecloud
 
     - name: Setup dotnet 6.0.x
       uses: actions/setup-dotnet@v1
@@ -35,16 +59,6 @@ jobs:
         cd ${{env.DOTNET_ROOT}}/myapp
         zip -r myapp.zip .
       
-    # Logs into Azure via OIDC (note no password)
-    - name: 'Az OIDC CLI login'
-      uses: azure/[email protected]
-      with:
-        client-id: ${{ secrets.AZURE_CLIENTID }}
-        tenant-id: ${{ secrets.AZURE_TENANTID }}
-        subscription-id: ${{ secrets.AZURE_SUBSCRIPTIONID }}
-        # Name of the environment. Supported values are azurecloud, azurestack, azureusgovernment, azurechinacloud, azuregermancloud. Default being azurecloud
-        # environment: azurecloud
-    
     - name: Azure CLI Publish
       run: az webapp deployment source config-zip -g rgDoNotDeleteDemos -n ${{secrets.APP_NAME}} --slot test --src ${{env.DOTNET_ROOT}}/myapp/myapp.zip
 

.github/workflows/main-push.yml

@@ -22,6 +22,30 @@ jobs:
     - name: Git checkout
       uses: actions/checkout@v2
 
+    # Installs the CLI-beta in a python venv
+    - name: Installing CLI-beta for OpenID Connect
+      run: |
+        cd ../..
+        CWD="$(pwd)"
+        python3 -m venv oidc-venv
+        . oidc-venv/bin/activate
+        echo "activated environment"
+        python3 -m pip install -q --upgrade pip
+        echo "started installing cli beta"
+        pip install -q --extra-index-url https://azcliprod.blob.core.windows.net/beta/simple/ azure-cli
+        echo "***************installed cli beta*******************"
+        echo "$CWD/oidc-venv/bin" >> $GITHUB_PATH
+
+    # Logs into Azure via OIDC (note no password)
+    - name: 'Az OIDC CLI login'
+      uses: azure/[email protected]
+      with:
+        client-id: ${{ secrets.AZURE_CLIENTID }}
+        tenant-id: ${{ secrets.AZURE_TENANTID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTIONID }}
+        # Name of the environment. Supported values are azurecloud, azurestack, azureusgovernment, azurechinacloud, azuregermancloud. Default being azurecloud
+        # environment: azurecloud
+
     - name: Setup dotnet 6.0.x
       uses: actions/setup-dotnet@v1
       with:
@@ -40,16 +64,6 @@ jobs:
       run: |
         cd ${{env.DOTNET_ROOT}}/myapp
         zip -r myapp.zip .
-    
-    # Logs into Azure via OIDC (note no password)
-    - name: 'Az OIDC CLI login'
-      uses: azure/login@v1
-      with:
-        client-id: ${{ secrets.AZURE_CLIENTID }}
-        tenant-id: ${{ secrets.AZURE_TENANTID }}
-        subscription-id: ${{ secrets.AZURE_SUBSCRIPTIONID }}
-        # Name of the environment. Supported values are azurecloud, azurestack, azureusgovernment, azurechinacloud, azuregermancloud. Default being azurecloud
-        # environment: azurecloud
 
     # Publishes the app to the staging slot
     - name: Azure CLI Publish
@@ -81,8 +95,23 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
+      # Installs the CLI-beta in a python venv
+      - name: Installing CLI-beta for OpenID Connect
+        run: |
+          cd ../..
+          CWD="$(pwd)"
+          python3 -m venv oidc-venv
+          . oidc-venv/bin/activate
+          echo "activated environment"
+          python3 -m pip install -q --upgrade pip
+          echo "started installing cli beta"
+          pip install -q --extra-index-url https://azcliprod.blob.core.windows.net/beta/simple/ azure-cli
+          echo "***************installed cli beta*******************"
+          echo "$CWD/oidc-venv/bin" >> $GITHUB_PATH
+
+      # Logs into Azure via OIDC (note no password)
       - name: 'Az OIDC CLI login'
-        uses: azure/login@v1
+        uses: azure/login@v1.4.0
         with:
           client-id: ${{ secrets.AZURE_CLIENTID }}
           tenant-id: ${{ secrets.AZURE_TENANTID }}
@@ -91,10 +120,7 @@ jobs:
           # environment: azurecloud
 
       - name: Azure Publish to Staging
-        uses: Azure/[email protected]
-        with:
-          # Specify the script here
-          inlineScript: az webapp deployment slot swap  --name ${{secrets.APP_NAME}} --resource-group ${{secrets.APP_RG}} --slot stage --target-slot production
+        run: az webapp deployment slot swap  --name ${{secrets.APP_NAME}} --resource-group ${{secrets.APP_RG}} --slot stage --target-slot production