Add Concurrency in Workflow & TF Unlock

Author: marvinbuss

.github/workflows/_functionAppDeployTemplate.yml

@@ -43,6 +43,9 @@ jobs:
     runs-on: [self-hosted]
     continue-on-error: false
     environment: ${{ inputs.environment }}
+    concurrency:
+      group: function-${{ inputs.function_name }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     steps:
       # Check Out Repository

.github/workflows/_terraformEnvironmentTemplate.yml

@@ -100,6 +100,9 @@ jobs:
     continue-on-error: false
     environment: ${{ inputs.environment }}
     needs: [lint]
+    concurrency:
+      group: terraform-${{ inputs.config }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     env:
       ARM_TENANT_ID: ${{ inputs.tenant_id }}
@@ -188,13 +191,25 @@ jobs:
               body: output
             })
 
+      # Terraform State Unlock
+      - name: Terraform State Unlock
+        working-directory: ${{ inputs.working_directory }}
+        if: cancelled()
+        run: |
+          LOCK_ID=`jq -r '.ID' .terraform.tfstate.lock.info`
+          echo $LOCK_ID
+          terraform force-unlock -force $LOCK_ID
+
   apply:
     name: Terraform Apply
     runs-on: [self-hosted]
     continue-on-error: false
     environment: ${{ inputs.environment }}
     if: github.event_name == 'push' || github.event_name == 'release'
     needs: [plan]
+    concurrency:
+      group: terraform-${{ inputs.config }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     env:
       ARM_TENANT_ID: ${{ inputs.tenant_id }}
@@ -240,3 +255,12 @@ jobs:
         env:
           CONFIG: ${{ inputs.config }}
           TF_VAR_my_secret: ${{ secrets.MY_SAMPLE_SECRET }}
+
+      # Terraform State Unlock
+      - name: Terraform State Unlock
+        working-directory: ${{ inputs.working_directory }}
+        if: cancelled()
+        run: |
+          LOCK_ID=`jq -r '.ID' .terraform.tfstate.lock.info`
+          echo $LOCK_ID
+          terraform force-unlock -force $LOCK_ID