Update application and infrastructure workflows (#65)

* Update application workflow * Update infrastructure workflow
ondfisk · Nov 2, 2024 · 2a42648 · 2a42648
1 parent 87af0b6
commit 2a42648
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/linters/.yaml-lint.yml b/.github/linters/.yaml-lint.yml
@@ -1,7 +1,7 @@
 ---
 rules:
   braces:
-    forbid: true
+    forbid: non-empty
     level: error
   brackets:
     forbid: true

diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -18,8 +18,7 @@ name: Application
       - tests/**
   workflow_dispatch:
 
-permissions:
-  contents: read
+permissions: {}
 
 jobs:
   build:
@@ -30,6 +29,7 @@ jobs:
       CONFIGURATION: Release
 
     permissions:
+      contents: read
       checks: write
       id-token: write
       pull-requests: write
@@ -65,8 +65,8 @@ jobs:
       - name: Azure Login
         uses: azure/login@v2.2.0
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Push Image to Azure Container Registry
@@ -114,8 +114,8 @@ jobs:
       - name: Azure Login
         uses: azure/login@v2.2.0
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Get Connection String
@@ -162,8 +162,8 @@ jobs:
       - name: Azure Login
         uses: azure/login@v2.2.0
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Get Connection String

diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -16,13 +16,14 @@ name: Infrastructure
       - infrastructure/**
   workflow_dispatch:
 
-permissions:
-  contents: read
+permissions: {}
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
       - name: Checkout
@@ -58,6 +59,7 @@ jobs:
     environment: Staging
 
     permissions:
+      contents: read
       id-token: write
 
     steps:
@@ -70,8 +72,8 @@ jobs:
       - name: Azure Login
         uses: azure/login@v2.2.0
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Create Resource Group
@@ -107,6 +109,7 @@ jobs:
     environment: Production
 
     permissions:
+      contents: read
       id-token: write
 
     steps:
@@ -119,8 +122,8 @@ jobs:
       - name: Azure Login
         uses: azure/login@v2.2.0
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Create Resource Group