From 1ced523b7a770f6516f676cd9458b81dd5ba3c33 Mon Sep 17 00:00:00 2001 From: Erika Gressi <56914614+eriqua@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:51:54 +0000 Subject: [PATCH] feat: Filter PSRule validation on required test files (#684) ## Description - Filter PSRule validation only on defaults and waf-aligned test files - Added filter as action input regex default value - Updated job names for more readability ![image](https://github.com/Azure/bicep-registry-modules/assets/56914614/1107a27b-0d54-4bfa-9062-09ef37bf2b28) | Pipeline | | - | | [![avm.res.network.virtual-network](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.network.virtual-network.yml/badge.svg)](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.network.virtual-network.yml) | | [![avm.res.network.private-endpoint](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.network.private-endpoint.yml/badge.svg)](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.network.private-endpoint.yml) | | [![avm.res.event-grid.domain](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.event-grid.domain.yml/badge.svg)](https://github.com/eriqua/bicep-registry-modules/actions/workflows/avm.res.event-grid.domain.yml) | --------- Co-authored-by: Alexander Sehr Co-authored-by: ChrisSidebotham-MSFT <48600046+ChrisSidebotham@users.noreply.github.com> --- .../avm-getModuleTestFiles/action.yml | 33 ++++++++++++++++--- .../workflows/avm.res.batch.batch-account.yml | 4 ++- .../avm.res.cognitive-services.account.yml | 4 ++- .../avm.res.compute.ssh-public-key.yml | 4 ++- ...res.db-for-postgre-sql.flexible-server.yml | 4 ++- .../workflows/avm.res.event-grid.domain.yml | 4 ++- .../avm.res.event-grid.system-topic.yml | 4 ++- .../workflows/avm.res.event-grid.topic.yml | 4 ++- .../avm.res.insights.action-group.yml | 4 ++- .../workflows/avm.res.insights.component.yml | 4 ++- .../avm.res.insights.diagnostic-setting.yml | 4 ++- .github/workflows/avm.res.key-vault.vault.yml | 4 ++- ...res.kubernetes-configuration.extension.yml | 4 ++- ...netes-configuration.flux-configuration.yml | 4 ++- .github/workflows/avm.res.logic.workflow.yml | 4 ++- ...avm.res.network.dns-forwarding-ruleset.yml | 4 ++- .../avm.res.network.dns-resolver.yml | 4 ++- .../workflows/avm.res.network.dns-zone.yml | 4 ++- .../avm.res.network.express-route-circuit.yml | 4 ++- .../avm.res.network.express-route-gateway.yml | 4 ++- .../avm.res.network.load-balancer.yml | 4 ++- .../avm.res.network.network-interface.yml | 4 ++- .../avm.res.network.private-dns-zone.yml | 4 ++- .../avm.res.network.private-endpoint.yml | 4 ++- .../avm.res.network.public-ip-address.yml | 4 ++- .../workflows/avm.res.network.route-table.yml | 4 ++- .../avm.res.network.virtual-network.yml | 4 ++- ...avm.res.operational-insights.workspace.yml | 4 ++- ...avm.res.operations-management.solution.yml | 4 ++- .../avm.res.power-bi-dedicated.capacity.yml | 4 ++- .../avm.res.resource-graph.query.yml | 4 ++- .../avm.res.resources.deployment-script.yml | 4 ++- .../avm.res.search.search-service.yml | 4 ++- .github/workflows/avm.res.sql.server.yml | 4 ++- .github/workflows/avm.template.module.yml | 12 ++++--- 35 files changed, 135 insertions(+), 42 deletions(-) diff --git a/.github/actions/templates/avm-getModuleTestFiles/action.yml b/.github/actions/templates/avm-getModuleTestFiles/action.yml index 2e0a37ebe2..16d85a86d8 100644 --- a/.github/actions/templates/avm-getModuleTestFiles/action.yml +++ b/.github/actions/templates/avm-getModuleTestFiles/action.yml @@ -5,32 +5,38 @@ inputs: modulePath: description: "The path to the module's folder" required: true + psRuleFilterRegex: + description: "The regex used to filter PSRule compliant files" + required: true + default: "(defaults|waf-aligned)" outputs: moduleTestFilePaths: description: "The module test files to use for template evaluation" value: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }} + psRuleModuleTestFilePaths: + description: "The module test files to use for PSRule evaluation" + value: ${{ steps.get-module-test-file-paths.outputs.psRuleModuleTestFilePaths }} 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 parameter files' - # Load used functions + Write-Output '::group::Get all test files' # Get the list of parameter file paths $moduleFolderPath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.modulePath }}' - $testFilePaths = (Get-ChildItem -Path $moduleFolderPath -Recurse -Filter 'main.test.bicep').FullName | Sort-Object + $testFilePaths = (Get-ChildItem -Path $moduleFolderPath -Recurse -Filter 'main.test.bicep').FullName | Sort-Object $testFilePaths = $testFilePaths | ForEach-Object { $_.Replace($moduleFolderPath, '').Trim('\').Trim('/') } - Write-Verbose 'Found module test files' -Verbose + Write-Verbose 'Found all module test files' -Verbose $testFilePaths | ForEach-Object { Write-Verbose "- [$_]" -Verbose } # Output values to be accessed by next jobs @@ -40,4 +46,21 @@ runs: } Write-Verbose "Publishing output: $compressedOutput" -Verbose Write-Output ('{0}={1}' -f 'moduleTestFilePaths', $compressedOutput) >> $env:GITHUB_OUTPUT + + Write-Output '::endgroup::' + + Write-Output '::group::Get PSRule test files' + $psRuleTestFilePaths = $testFilePaths | Where-Object { $_ -match '${{ inputs.psRuleFilterRegex }}' } + + Write-Verbose 'Found PSRule module test files' -Verbose + $psRuleTestFilePaths | ForEach-Object { Write-Verbose "- [$_]" -Verbose } + + # Output values to be accessed by next jobs + $psRuleCompressedOutput = $psRuleTestFilePaths | ConvertTo-Json -Compress + if($psRuleCompressedOutput -notmatch "\[.*\]") { + $psRuleCompressedOutput = "[$psRuleCompressedOutput]" + } + Write-Verbose "Publishing output: $psRuleCompressedOutput" -Verbose + Write-Output ('{0}={1}' -f 'psRuleModuleTestFilePaths', $psRuleCompressedOutput) >> $env:GITHUB_OUTPUT + Write-Output '::endgroup::' diff --git a/.github/workflows/avm.res.batch.batch-account.yml b/.github/workflows/avm.res.batch.batch-account.yml index 5f07ffab60..3d6963efb3 100644 --- a/.github/workflows/avm.res.batch.batch-account.yml +++ b/.github/workflows/avm.res.batch.batch-account.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.cognitive-services.account.yml b/.github/workflows/avm.res.cognitive-services.account.yml index b8a3acb019..dc8ecd4f4b 100644 --- a/.github/workflows/avm.res.cognitive-services.account.yml +++ b/.github/workflows/avm.res.cognitive-services.account.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.compute.ssh-public-key.yml b/.github/workflows/avm.res.compute.ssh-public-key.yml index f0c1fdd5d5..05b11209b4 100644 --- a/.github/workflows/avm.res.compute.ssh-public-key.yml +++ b/.github/workflows/avm.res.compute.ssh-public-key.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.db-for-postgre-sql.flexible-server.yml b/.github/workflows/avm.res.db-for-postgre-sql.flexible-server.yml index a2fee2b4e0..549b861b35 100644 --- a/.github/workflows/avm.res.db-for-postgre-sql.flexible-server.yml +++ b/.github/workflows/avm.res.db-for-postgre-sql.flexible-server.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.event-grid.domain.yml b/.github/workflows/avm.res.event-grid.domain.yml index 5edb93b540..7e38c25ff0 100644 --- a/.github/workflows/avm.res.event-grid.domain.yml +++ b/.github/workflows/avm.res.event-grid.domain.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.event-grid.system-topic.yml b/.github/workflows/avm.res.event-grid.system-topic.yml index 35a2bf90d1..f90ffa705d 100644 --- a/.github/workflows/avm.res.event-grid.system-topic.yml +++ b/.github/workflows/avm.res.event-grid.system-topic.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.event-grid.topic.yml b/.github/workflows/avm.res.event-grid.topic.yml index 3eb80d2bac..fd0d834d71 100644 --- a/.github/workflows/avm.res.event-grid.topic.yml +++ b/.github/workflows/avm.res.event-grid.topic.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.insights.action-group.yml b/.github/workflows/avm.res.insights.action-group.yml index 71dbd20b0f..bb1eede980 100644 --- a/.github/workflows/avm.res.insights.action-group.yml +++ b/.github/workflows/avm.res.insights.action-group.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.insights.component.yml b/.github/workflows/avm.res.insights.component.yml index f08d42b78c..d7590c6835 100644 --- a/.github/workflows/avm.res.insights.component.yml +++ b/.github/workflows/avm.res.insights.component.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.insights.diagnostic-setting.yml b/.github/workflows/avm.res.insights.diagnostic-setting.yml index d9921b5c51..f44aeeef6e 100644 --- a/.github/workflows/avm.res.insights.diagnostic-setting.yml +++ b/.github/workflows/avm.res.insights.diagnostic-setting.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.key-vault.vault.yml b/.github/workflows/avm.res.key-vault.vault.yml index a1b6732fc9..7c06d7e0da 100644 --- a/.github/workflows/avm.res.key-vault.vault.yml +++ b/.github/workflows/avm.res.key-vault.vault.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.kubernetes-configuration.extension.yml b/.github/workflows/avm.res.kubernetes-configuration.extension.yml index 2b677abc15..73eab58640 100644 --- a/.github/workflows/avm.res.kubernetes-configuration.extension.yml +++ b/.github/workflows/avm.res.kubernetes-configuration.extension.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.kubernetes-configuration.flux-configuration.yml b/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml index e2b030e430..e2444826b4 100644 --- a/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml +++ b/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.logic.workflow.yml b/.github/workflows/avm.res.logic.workflow.yml index a5c7bc2bc7..1d420c2152 100644 --- a/.github/workflows/avm.res.logic.workflow.yml +++ b/.github/workflows/avm.res.logic.workflow.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.dns-forwarding-ruleset.yml b/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml index 0466115f8b..ddd52b635f 100644 --- a/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml +++ b/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.dns-resolver.yml b/.github/workflows/avm.res.network.dns-resolver.yml index e16affaed8..67bea4285b 100644 --- a/.github/workflows/avm.res.network.dns-resolver.yml +++ b/.github/workflows/avm.res.network.dns-resolver.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.dns-zone.yml b/.github/workflows/avm.res.network.dns-zone.yml index 7ea7e1a99f..88160e264f 100644 --- a/.github/workflows/avm.res.network.dns-zone.yml +++ b/.github/workflows/avm.res.network.dns-zone.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.express-route-circuit.yml b/.github/workflows/avm.res.network.express-route-circuit.yml index bc4e20a727..f41e82b3fc 100644 --- a/.github/workflows/avm.res.network.express-route-circuit.yml +++ b/.github/workflows/avm.res.network.express-route-circuit.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.express-route-gateway.yml b/.github/workflows/avm.res.network.express-route-gateway.yml index 7a0e195db6..e9963771c2 100644 --- a/.github/workflows/avm.res.network.express-route-gateway.yml +++ b/.github/workflows/avm.res.network.express-route-gateway.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.load-balancer.yml b/.github/workflows/avm.res.network.load-balancer.yml index d20b73c3e7..7fe8f4f5b9 100644 --- a/.github/workflows/avm.res.network.load-balancer.yml +++ b/.github/workflows/avm.res.network.load-balancer.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.network-interface.yml b/.github/workflows/avm.res.network.network-interface.yml index e8c80c2b15..768d83f9c7 100644 --- a/.github/workflows/avm.res.network.network-interface.yml +++ b/.github/workflows/avm.res.network.network-interface.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.private-dns-zone.yml b/.github/workflows/avm.res.network.private-dns-zone.yml index d2560f4586..547793820f 100644 --- a/.github/workflows/avm.res.network.private-dns-zone.yml +++ b/.github/workflows/avm.res.network.private-dns-zone.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.private-endpoint.yml b/.github/workflows/avm.res.network.private-endpoint.yml index c417943020..e8610f11b4 100644 --- a/.github/workflows/avm.res.network.private-endpoint.yml +++ b/.github/workflows/avm.res.network.private-endpoint.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.public-ip-address.yml b/.github/workflows/avm.res.network.public-ip-address.yml index 51e2dc0f6d..b262b54ee7 100644 --- a/.github/workflows/avm.res.network.public-ip-address.yml +++ b/.github/workflows/avm.res.network.public-ip-address.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.route-table.yml b/.github/workflows/avm.res.network.route-table.yml index d2614340da..ec546ead9a 100644 --- a/.github/workflows/avm.res.network.route-table.yml +++ b/.github/workflows/avm.res.network.route-table.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.network.virtual-network.yml b/.github/workflows/avm.res.network.virtual-network.yml index 6bddce3b9a..e9c8b82f20 100644 --- a/.github/workflows/avm.res.network.virtual-network.yml +++ b/.github/workflows/avm.res.network.virtual-network.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.operational-insights.workspace.yml b/.github/workflows/avm.res.operational-insights.workspace.yml index 4647b3de74..9f534ab614 100644 --- a/.github/workflows/avm.res.operational-insights.workspace.yml +++ b/.github/workflows/avm.res.operational-insights.workspace.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.operations-management.solution.yml b/.github/workflows/avm.res.operations-management.solution.yml index 6378665a69..a7702f866b 100644 --- a/.github/workflows/avm.res.operations-management.solution.yml +++ b/.github/workflows/avm.res.operations-management.solution.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.power-bi-dedicated.capacity.yml b/.github/workflows/avm.res.power-bi-dedicated.capacity.yml index 2966314f0b..7c3b0cae28 100644 --- a/.github/workflows/avm.res.power-bi-dedicated.capacity.yml +++ b/.github/workflows/avm.res.power-bi-dedicated.capacity.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.resource-graph.query.yml b/.github/workflows/avm.res.resource-graph.query.yml index 356e0e2769..0ca2453b78 100644 --- a/.github/workflows/avm.res.resource-graph.query.yml +++ b/.github/workflows/avm.res.resource-graph.query.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.resources.deployment-script.yml b/.github/workflows/avm.res.resources.deployment-script.yml index c8f0d7b2ea..0c7d73f865 100644 --- a/.github/workflows/avm.res.resources.deployment-script.yml +++ b/.github/workflows/avm.res.resources.deployment-script.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.search.search-service.yml b/.github/workflows/avm.res.search.search-service.yml index 0e03e78372..1504588d1f 100644 --- a/.github/workflows/avm.res.search.search-service.yml +++ b/.github/workflows/avm.res.search.search-service.yml @@ -56,7 +56,7 @@ 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: @@ -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.res.sql.server.yml b/.github/workflows/avm.res.sql.server.yml index f2dad4ff0f..3060fa092d 100644 --- a/.github/workflows/avm.res.sql.server.yml +++ b/.github/workflows/avm.res.sql.server.yml @@ -56,7 +56,7 @@ 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: @@ -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..24d865078e 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" @@ -50,13 +54,13 @@ jobs: # PSRule validation # ######################### job_psrule_test: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - name: "PSRule validation" + name: "PSRule" runs-on: ubuntu-20.04 if: (fromJson(inputs.workflowInput)).staticValidation == 'true' 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' @@ -74,7 +78,7 @@ jobs: # Deployment validation # ############################# job_module_deploy_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - name: "Deployment validation" + name: "Deploy" runs-on: ubuntu-20.04 if: | !cancelled() &&