fix: Update avm workflow template (#498)

Azure · Jan 13, 2024 · ec8c5f8 · ec8c5f8
1 parent a9400f4
commit ec8c5f8
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/docs/static/includes/avm.[res-res].template.pattern.yml b/docs/static/includes/avm.[res-res].template.pattern.yml
@@ -1,5 +1,5 @@
-# >>> UPDATE to for example "avm.res.azure.key-vault.vault"
-name: "avm.[res|ptn].[providerNamespace].[resourceType]"
+# >>> UPDATE to for example "avm.res.key-vault.vault"
+name: "avm.[res|ptn].[provider-namespace].[resource-type]"
 
 on:
   schedule:
@@ -28,18 +28,18 @@ on:
     paths:
       - ".github/actions/templates/avm-**"
       - ".github/workflows/avm.template.module.yml"
-        # >>> UPDATE to for example ".github/workflows/avm.res.azure.key-vault.vault"
-      - ".github/workflows/avm.[res|ptn].[providerNamespace].[resourceType]"
+        # >>> UPDATE to for example ".github/workflows/avm.res.key-vault.vault.yml"
+      - ".github/workflows/avm.[res|ptn].[provider-namespace].[resource-type].yml"
         # >>> UPDATE to for example "avm/res/key-vault/vault/**"
-      - "avm/[res|ptn]/[providerNamespace]/[resourceType]/**"
+      - "avm/[res|ptn]/[provider-namespace]/[resource-type]/**"
       - "avm/utilities/pipelines/**"
       - "!*/**/README.md"
 
 env:
   # >>> UPDATE to for example "avm/res/key-vault/vault"
-  modulePath: "avm/[res|ptn]/[providerNamespace]/[resourceType]"
-  # >>> Update to for example ".github/workflows/avm.res.azure.key-vault.vault"
-  workflowPath: ".github/workflows/avm.[res|ptn].[providerNamespace].[resourceType]"
+  modulePath: "avm/[res|ptn]/[provider-namespace]/[resource-type]"
+  # >>> Update to for example ".github/workflows/avm.res.key-vault.vault.yml"
+  workflowPath: ".github/workflows/avm.[res|ptn].[provider-namespace].[resource-type].yml"
 
 concurrency:
   group: ${{ github.workflow }}
@@ -61,26 +61,28 @@ jobs:
         uses: ./.github/actions/templates/avm-getWorkflowInput
         with:
           workflowPath: "${{ env.workflowPath}}"
-      - name: "Get parameter file paths"
+      - name: "Get module test file paths"
         id: get-module-test-file-paths
         uses: ./.github/actions/templates/avm-getModuleTestFiles
         with:
           modulePath: "${{ env.modulePath }}"
     outputs:
       workflowInput: ${{ steps.get-workflow-param.outputs.workflowInput }}
       moduleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }}
+      psRuleModuleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.psRuleModuleTestFilePaths }}
       modulePath: "${{ env.modulePath }}"
 
   ##############################
   #   Call reusable workflow   #
   ##############################
   call-workflow-passing-data:
-    name: "Module"
+    name: "Run"
     needs:
       - job_initialize_pipeline
     uses: ./.github/workflows/avm.template.module.yml
     with:
       workflowInput: "${{ needs.job_initialize_pipeline.outputs.workflowInput }}"
       moduleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.moduleTestFilePaths }}"
+      psRuleModuleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.psRuleModuleTestFilePaths }}"
       modulePath: "${{ needs.job_initialize_pipeline.outputs.modulePath}}"
     secrets: inherit