diff --git a/.github/actions/templates/avm-getModuleTestFiles/action.yml b/.github/actions/templates/avm-getModuleTestFiles/action.yml index 00d8a4f743..16d85a86d8 100644 --- a/.github/actions/templates/avm-getModuleTestFiles/action.yml +++ b/.github/actions/templates/avm-getModuleTestFiles/action.yml @@ -21,13 +21,12 @@ outputs: runs: using: "composite" steps: - - name: "Get parameter file paths" + - name: "Get module test file paths" id: get-module-test-file-paths shell: pwsh run: | # Grouping task logs Write-Output '::group::Get all test files' - # Load used functions # Get the list of parameter file paths $moduleFolderPath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.modulePath }}' diff --git a/.github/workflows/avm.res.network.virtual-network.yml b/.github/workflows/avm.res.network.virtual-network.yml index 6bddce3b9a..ee85402c46 100644 --- a/.github/workflows/avm.res.network.virtual-network.yml +++ b/.github/workflows/avm.res.network.virtual-network.yml @@ -64,6 +64,7 @@ jobs: 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 }}" ############################## @@ -77,5 +78,6 @@ jobs: 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 diff --git a/.github/workflows/avm.template.module.yml b/.github/workflows/avm.template.module.yml index aa7095244a..d0ff60c223 100644 --- a/.github/workflows/avm.template.module.yml +++ b/.github/workflows/avm.template.module.yml @@ -11,6 +11,10 @@ on: type: string description: "List of relative path to the module test files in JSON format" required: true + psRuleModuleTestFilePaths: + type: string + description: "List of relative path to the PSRule module test files in JSON format" + required: true modulePath: type: string description: "Relative path to the module folder" @@ -56,7 +60,7 @@ jobs: strategy: fail-fast: false matrix: - moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + psRuleModuleTestFilePaths: ${{ fromJson(inputs.psRuleModuleTestFilePaths) }} steps: - name: Checkout uses: actions/checkout@v4 @@ -65,7 +69,7 @@ jobs: - name: Set PSRule validation uses: ./.github/actions/templates/avm-validateModulePSRule with: - templateFilePath: "${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}" + templateFilePath: "${{ inputs.modulePath }}/${{ matrix.psRuleModuleTestFilePaths }}" subscriptionId: "${{ secrets.ARM_SUBSCRIPTION_ID }}" managementGroupId: "${{ secrets.ARM_MGMTGROUP_ID }}" psrulePath: "avm/utilities/pipelines/staticValidation/psrule" #'${{ github.workspace }}/avm'