Merge pull request #1 from nlykkei/website-url-env-output

Website URL Output

.github/workflows/build.yml

@@ -1,10 +1,10 @@
-name: Build Application
+name: Build
 
 on:
   workflow_call:
 
 jobs:
-  build-application:
+  build-app:
     name: Build application
     runs-on: ubuntu-latest
     steps:

.github/workflows/deploy-app.yml

@@ -18,7 +18,7 @@ on:
         required: true
 
 jobs:
-  deploy-application:
+  deploy-app:
     name: Deploy application
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
@@ -27,7 +27,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: application
-      - name: Azure Login
+      - name: Login to Azure
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}

.github/workflows/deploy.yml

@@ -18,20 +18,20 @@ on:
         required: true
 
 jobs:
-  validate:
-    name: Validate
+  validate-infra:
+    name: Validate infrastructure
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Azure Login
+      - name: Login to Azure
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Preflight validation
+      - name: Run preflight validation
         uses: azure/arm-deploy@v2
         with:
           deploymentName: ${{ github.run_number }}
@@ -55,8 +55,8 @@ jobs:
           failOnStdErr: false
         if: inputs.environment == 'production'
 
-  deploy:
-    name: Deploy
+  deploy-infra:
+    name: Deploy infrastructure
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
     outputs:
@@ -65,13 +65,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Azure Login
+      - name: Login to Azure
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-      - name: Deploy
+      - name: Deploy infrastructure
         uses: azure/arm-deploy@v2
         id: deploy
         with:
@@ -84,23 +84,23 @@ jobs:
           deploymentMode: Complete
           failOnStdErr: false
       - name: Website URL
-        run: 'echo "Website URL 🚀: https://${{ steps.deploy.outputs.appServiceAppHostName }}" >> "${GITHUB_STEP_SUMMARY}"'
-    needs: [validate]
+        run: 'echo "Website URL (${{ inputs.environment }}) 🚀: https://${{ steps.deploy.outputs.appServiceAppHostName }}" >> "${GITHUB_STEP_SUMMARY}"'
+    needs: [validate-infra]
 
-  deploy-application:
+  deploy-app:
     name: Deploy application
     uses: ./.github/workflows/deploy-app.yml
     with:
       environment: ${{ inputs.environment }}
-      appServiceAppName: ${{ needs.deploy.outputs.appServiceAppName }}
+      appServiceAppName: ${{ needs.deploy-infra.outputs.appServiceAppName }}
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    needs: [deploy]
+    needs: [deploy-infra]
 
   # smoke-test:
-  #   name: Smoke tests
+  #   name: Run smoke tests
   #   runs-on: ubuntu-latest
   #   steps:
   #     - uses: actions/checkout@v4
@@ -113,4 +113,4 @@ jobs:
   #           -Container $container `
   #           -CI
   #       shell: pwsh
-  #   needs: [deploy, deploy-application]
+  #   needs: [deploy-infra, deploy-app]

.github/workflows/lint.yml

@@ -5,11 +5,11 @@ on:
 
 jobs:
   lint:
-    name: Lint
+    name: Lint infrastructure
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Lint
+    - name: Lint infrastructure
       run: |
         az bicep build --file infra/main.bicep

.github/workflows/main.yml

@@ -18,16 +18,16 @@ permissions:
 # https://learn.microsoft.com/en-us/training/modules/manage-end-end-deployment-scenarios-using-bicep-github-actions/3-configure-applications-virtual-machines
 
 jobs:
-  build:
-    name: Build
-    uses: ./.github/workflows/build.yml
-
-  lint:
-    name: Lint
+  lint-infra:
+    name: Lint infrastructure
     uses: ./.github/workflows/lint.yml
 
-  deploy-test:
-    name: Deploy [test]
+  build-app:
+    name: Build application
+    uses: ./.github/workflows/build.yml
+
+  deploy-infra-test:
+    name: Deploy infrastructure [test]
     uses: ./.github/workflows/deploy.yml
     with:
       environment: test
@@ -36,10 +36,10 @@ jobs:
         AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    needs: [build, lint]
+    needs: [lint-infra, build-app]
 
-  deploy-production:
-    name: Deploy [production]
+  deploy-infra-prod:
+    name: Deploy infrastructure [prod]
     uses: ./.github/workflows/deploy.yml
     with:
       environment: production
@@ -48,4 +48,4 @@ jobs:
         AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    needs: [deploy-test]
+    needs: [deploy-infra-test]

.github/workflows/pr-closed.yml

@@ -0,0 +1,37 @@
+name: Todo App PR Closed
+
+concurrency:
+  group: ${{ github.event.number }}
+  cancel-in-progress: false
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [closed]
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  resourceGroupName: pr_${{ github.event.number }}
+
+jobs:
+  delete-infra:
+    name: Delete infrastructure
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      - name: Delete infrastructure
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az group delete \
+              --name ${{ env.resourceGroupName }} \
+              --yes

.github/workflows/pr-validation.yml

@@ -20,16 +20,16 @@ env:
 # https://learn.microsoft.com/en-us/training/modules/automate-azure-infrastructure-change-reviews-using-bicep-github/6-exercise-create-ephemeral-environments-pull-requests
 
 jobs:
-  build:
-    name: Build
-    uses: ./.github/workflows/build.yml
-
-  lint:
-    name: Lint
+  lint-infra:
+    name: Lint infrastructure
     uses: ./.github/workflows/lint.yml
 
-  deploy:
-    name: Deploy
+  build-app:
+    name: Build application
+    uses: ./.github/workflows/build.yml
+
+  deploy-infra:
+    name: Deploy infrastructure
     runs-on: ubuntu-latest
     environment: test
     outputs:
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Azure Login
+      - name: Login to Azure
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -53,27 +53,28 @@ jobs:
               --location ${{ env.resourceGroupLocation }}
       - uses: azure/arm-deploy@v2
         id: deploy
-        name: Deploy
+        name: Deploy infrastructure
         with:
           deploymentName: ${{ github.run_number }}
-          scope: resourceGroup
+          scope: resourcegroup
           resourceGroupName: ${{ env.resourceGroupName }}
-          template: ./deploy/main.bicep
+          template: ./infra/main.bicep
           parameters: >
             environment=test
           deploymentMode: Complete
           failOnStdErr: false
       - name: Website URL
-        run: 'echo "Website URL 🚀: https://${{ steps.deploy.outputs.appServiceAppHostName }}" >> "${GITHUB_STEP_SUMMARY}"'
+        run: 'echo "Website URL (test) 🚀: https://${{ steps.deploy.outputs.appServiceAppHostName }}" >> "${GITHUB_STEP_SUMMARY}"'
+    needs: [lint-infra, build-app]
 
-  deploy-application:
+  deploy-app:
     name: Deploy application
     uses: ./.github/workflows/deploy-app.yml
     with:
       environment: test
-      appServiceAppName: ${{ needs.deploy.outputs.appServiceAppName }}
+      appServiceAppName: ${{ needs.deploy-infra.outputs.appServiceAppName }}
     secrets:
         AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    needs: [deploy]
+    needs: [deploy-infra]