Refactoring workflows

frasermolyneux · Nov 9, 2023 · d7b4a99 · d7b4a99
1 parent 835d6e6
commit d7b4a99
Show file tree

Hide file tree

Showing 6 changed files with 254 additions and 334 deletions.
diff --git a/.github/workflows/codequality.yml b/.github/workflows/codequality.yml
@@ -0,0 +1,69 @@
+name: Code Quality
+
+on: push
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read # This is required for actions/checkout
+  actions: read # Required by CodeQL
+  security-events: write # Required by CodeQL
+
+jobs:
+  code-scanning:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.11
+
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v1
+      with:
+        path: ~\sonar\cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+
+    - name: Install SonarCloud scanners
+      shell: bash
+      run: |
+        cd src
+        dotnet tool install --global dotnet-sonarscanner
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: "csharp"
+
+    - name: Begin SonarScanner
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: |
+        cd src
+        dotnet-sonarscanner begin /k:"frasermolyneux_portal-event-ingest" /o:"frasermolyneux" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+
+    - uses: frasermolyneux/actions/dotnet-func-ci@main
+      with:
+        dotnet-project: "event-ingest-func"
+        dotnet-version: 7.0.x
+        src-folder: "src"
+        majorMinorVersion: "1.1"
+
+    - name: End SonarScanner
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: |
+        cd src
+        dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:'csharp'"
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/[email protected]
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+    - name: Dependabot metadata
+      id: metadata
+      uses: dependabot/[email protected]
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+    - name: Enable auto-merge for Dependabot PRs
+      run: gh pr merge --auto --merge "$PR_URL"
+      env:
+        PR_URL: ${{github.event.pull_request.html_url}}
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/destroy-development.yml b/.github/workflows/destroy-development.yml
@@ -2,8 +2,6 @@ name: Destroy Development
 
 on:
   workflow_dispatch:
-  #schedule:
-  #  - cron: "0 3 * * 1"
 
 permissions:
   id-token: write # This is required for requesting the JWT
@@ -15,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3
 
-      - uses: frasermolyneux/actions/terraform-destroy@main
-        with:
-          terraform-folder: "terraform"
-          terraform-var-file: "tfvars/dev.tfvars"
-          terraform-backend-file: "backends/dev.backend.hcl"
-          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+    - uses: frasermolyneux/actions/terraform-destroy@main
+      with:
+        terraform-folder: "terraform"
+        terraform-var-file: "tfvars/dev.tfvars"
+        terraform-backend-file: "backends/dev.backend.hcl"
+        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
diff --git a/.github/workflows/feature-development.yml b/.github/workflows/feature-development.yml
@@ -7,110 +7,61 @@ on:
       - "feature/*"
 
 permissions:
-  id-token: write # This is required for requesting the JWT
   contents: read # This is required for actions/checkout
-  actions: read # Required by CodeQL
-  security-events: write # Required by CodeQL
 
 jobs:
   dotnet-func-ci:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~\sonar\cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: Install SonarCloud scanners
-        shell: bash
-        run: |
-          cd src
-          dotnet tool install --global dotnet-sonarscanner
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: "csharp"
-
-      - name: Begin SonarScanner
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          cd src
-          dotnet-sonarscanner begin /k:"frasermolyneux_portal-event-ingest" /o:"frasermolyneux" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
-
-      - uses: frasermolyneux/actions/dotnet-func-ci@main
-        with:
-          dotnet-project: "event-ingest-func"
-          dotnet-version: 7.0.x
-          src-folder: "src"
-          majorMinorVersion: "1.1"
-
-      - name: End SonarScanner
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          cd src
-          dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:'csharp'"
+    - uses: actions/checkout@v3
+
+    - uses: frasermolyneux/actions/dotnet-func-ci@main
+      with:
+        dotnet-project: "event-ingest-func"
+        dotnet-version: 7.0.x
+        src-folder: "src"
+        majorMinorVersion: "1.1"
 
   publish-nuget-packages:
     environment: NuGet
     runs-on: ubuntu-latest
     needs: [dotnet-func-ci]
 
     steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3
 
-      - uses: frasermolyneux/actions/publish-nuget-packages@main
-        with:
-          artifact-name: "nuget-packages"
-          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+    - uses: frasermolyneux/actions/publish-nuget-packages@main
+      with:
+        artifact-name: "nuget-packages"
+        NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
 
   terraform-plan-and-apply-dev:
     environment: Development
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: frasermolyneux/actions/terraform-plan-and-apply@main
-        with:
-          terraform-folder: "terraform"
-          terraform-var-file: "tfvars/dev.tfvars"
-          terraform-backend-file: "backends/dev.backend.hcl"
-          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-      - id: terraform-output
-        shell: bash
-        run: |
-          cd terraform
-          echo "function_app_name=$(terraform output -raw function_app_name)" >> $GITHUB_OUTPUT
-        env:
-          ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-          ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-          ARM_USE_OIDC: true
+    - uses: actions/checkout@v3
+
+    - uses: frasermolyneux/actions/terraform-plan-and-apply@main
+      with:
+        terraform-folder: "terraform"
+        terraform-var-file: "tfvars/dev.tfvars"
+        terraform-backend-file: "backends/dev.backend.hcl"
+        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+    - id: terraform-output
+      shell: bash
+      run: |
+        cd terraform
+        echo "function_app_name=$(terraform output -raw function_app_name)" >> $GITHUB_OUTPUT
+      env:
+        ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+        ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+        ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        ARM_USE_OIDC: true
 
     outputs:
       function_app_name: ${{ steps.terraform-output.outputs.function_app_name }}
@@ -121,12 +72,12 @@ jobs:
     needs: [dotnet-func-ci, terraform-plan-and-apply-dev]
 
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: frasermolyneux/actions/deploy-function-app@main
-        with:
-          function-app-artifact-name: "event-ingest-func"
-          function-app-name: ${{ needs.terraform-plan-and-apply-dev.outputs.function_app_name }}
-          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+    - uses: actions/checkout@v3
+
+    - uses: frasermolyneux/actions/deploy-function-app@main
+      with:
+        function-app-artifact-name: "event-ingest-func"
+        function-app-name: ${{ needs.terraform-plan-and-apply-dev.outputs.function_app_name }}
+        AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+        AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+        AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}