From c6850984b2f57645cddcd5cbc6aa84ca2e3faeff Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 20 Dec 2023 00:45:12 +0100 Subject: [PATCH] feat: Added matrix name to template increasing readability (#727) ## Description Added matrix name to template increasing readability Before: ![image](https://github.com/Azure/bicep-registry-modules/assets/5365358/47e77fc8-708a-43bf-b855-c24ebfb74b43) After: ![image](https://github.com/Azure/bicep-registry-modules/assets/5365358/ebce8bbb-c8f3-484e-8b11-2ce4e8dc1f77) --------- Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../avm-getModuleTestFiles/action.yml | 25 ++++++++++++++----- .../avm.res.api-management.service.yml | 2 +- .../avm.res.automation.automation-account.yml | 2 +- .../workflows/avm.res.batch.batch-account.yml | 2 +- .../avm.res.cognitive-services.account.yml | 2 +- .../avm.res.compute.ssh-public-key.yml | 2 +- .../avm.res.data-factory.factory.yml | 2 +- ...res.db-for-postgre-sql.flexible-server.yml | 2 +- .../avm.res.document-db.database-account.yml | 2 +- .../workflows/avm.res.event-grid.domain.yml | 2 +- .../avm.res.event-grid.system-topic.yml | 2 +- .../workflows/avm.res.event-grid.topic.yml | 2 +- .../avm.res.insights.action-group.yml | 2 +- .../avm.res.insights.activity-log-alert.yml | 2 +- .../workflows/avm.res.insights.component.yml | 2 +- ....res.insights.data-collection-endpoint.yml | 2 +- .../avm.res.insights.data-collection-rule.yml | 2 +- .../avm.res.insights.diagnostic-setting.yml | 2 +- .../avm.res.insights.metric-alert.yml | 2 +- .../avm.res.insights.scheduled-query-rule.yml | 2 +- .../workflows/avm.res.insights.webtest.yml | 2 +- .github/workflows/avm.res.key-vault.vault.yml | 2 +- ...res.kubernetes-configuration.extension.yml | 2 +- ...netes-configuration.flux-configuration.yml | 2 +- .github/workflows/avm.res.logic.workflow.yml | 2 +- ....maintenance.maintenance-configuration.yml | 2 +- ...anaged-identity.user-assigned-identity.yml | 2 +- .../avm.res.network.bastion-host.yml | 2 +- ...avm.res.network.dns-forwarding-ruleset.yml | 2 +- .../avm.res.network.dns-resolver.yml | 2 +- .../workflows/avm.res.network.dns-zone.yml | 2 +- .../avm.res.network.express-route-circuit.yml | 2 +- .../avm.res.network.express-route-gateway.yml | 2 +- .../avm.res.network.load-balancer.yml | 2 +- .../avm.res.network.network-interface.yml | 2 +- ...avm.res.network.network-security-group.yml | 2 +- .../avm.res.network.private-dns-zone.yml | 2 +- .../avm.res.network.private-endpoint.yml | 2 +- .../avm.res.network.public-ip-address.yml | 2 +- .../avm.res.network.public-ip-prefix.yml | 2 +- .../workflows/avm.res.network.route-table.yml | 2 +- .../avm.res.network.trafficmanagerprofile.yml | 2 +- .../avm.res.network.virtual-network.yml | 2 +- ...avm.res.operational-insights.workspace.yml | 2 +- ...avm.res.operations-management.solution.yml | 2 +- .../avm.res.power-bi-dedicated.capacity.yml | 2 +- .../avm.res.resource-graph.query.yml | 2 +- .../avm.res.resources.deployment-script.yml | 2 +- .../avm.res.resources.resource-group.yml | 2 +- .../avm.res.search.search-service.yml | 2 +- .../avm.res.service-bus.namespace.yml | 2 +- .github/workflows/avm.res.sql.server.yml | 2 +- .github/workflows/avm.res.web.serverfarm.yml | 2 +- .github/workflows/avm.template.module.yml | 16 ++++++------ 54 files changed, 79 insertions(+), 66 deletions(-) diff --git a/.github/actions/templates/avm-getModuleTestFiles/action.yml b/.github/actions/templates/avm-getModuleTestFiles/action.yml index 16d85a86d8..e1b00c524e 100644 --- a/.github/actions/templates/avm-getModuleTestFiles/action.yml +++ b/.github/actions/templates/avm-getModuleTestFiles/action.yml @@ -40,12 +40,19 @@ runs: $testFilePaths | ForEach-Object { Write-Verbose "- [$_]" -Verbose } # Output values to be accessed by next jobs - $compressedOutput = $testFilePaths | ConvertTo-Json -Compress - if($compressedOutput -notmatch "\[.*\]") { - $compressedOutput = "[$compressedOutput]" + $deployCompressedOutput = $testFilePaths | ForEach-Object { + @{ + path = $_ + name = Split-Path (Split-Path $_) -Leaf + } + } | ConvertTo-Json -Compress + + # Output values to be accessed by next jobs + if($deployCompressedOutput -notmatch "\[.*\]") { + $deployCompressedOutput = "[$deployCompressedOutput]" } - Write-Verbose "Publishing output: $compressedOutput" -Verbose - Write-Output ('{0}={1}' -f 'moduleTestFilePaths', $compressedOutput) >> $env:GITHUB_OUTPUT + Write-Verbose "Publishing output: $deployCompressedOutput" -Verbose + Write-Output ('{0}={1}' -f 'moduleTestFilePaths', $deployCompressedOutput) >> $env:GITHUB_OUTPUT Write-Output '::endgroup::' @@ -56,7 +63,13 @@ runs: $psRuleTestFilePaths | ForEach-Object { Write-Verbose "- [$_]" -Verbose } # Output values to be accessed by next jobs - $psRuleCompressedOutput = $psRuleTestFilePaths | ConvertTo-Json -Compress + $psRuleCompressedOutput = $psRuleTestFilePaths | ForEach-Object { + @{ + path = $_ + name = Split-Path (Split-Path $_) -Leaf + } + } | ConvertTo-Json -Compress + if($psRuleCompressedOutput -notmatch "\[.*\]") { $psRuleCompressedOutput = "[$psRuleCompressedOutput]" } diff --git a/.github/workflows/avm.res.api-management.service.yml b/.github/workflows/avm.res.api-management.service.yml index 2e722b9ae4..5bd6df82de 100644 --- a/.github/workflows/avm.res.api-management.service.yml +++ b/.github/workflows/avm.res.api-management.service.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.automation.automation-account.yml b/.github/workflows/avm.res.automation.automation-account.yml index 7762033001..b032cbd5c4 100644 --- a/.github/workflows/avm.res.automation.automation-account.yml +++ b/.github/workflows/avm.res.automation.automation-account.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.batch.batch-account.yml b/.github/workflows/avm.res.batch.batch-account.yml index 3d6963efb3..099027bdd3 100644 --- a/.github/workflows/avm.res.batch.batch-account.yml +++ b/.github/workflows/avm.res.batch.batch-account.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.cognitive-services.account.yml b/.github/workflows/avm.res.cognitive-services.account.yml index dc8ecd4f4b..f45ad8dafd 100644 --- a/.github/workflows/avm.res.cognitive-services.account.yml +++ b/.github/workflows/avm.res.cognitive-services.account.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.compute.ssh-public-key.yml b/.github/workflows/avm.res.compute.ssh-public-key.yml index 05b11209b4..e691cc44ff 100644 --- a/.github/workflows/avm.res.compute.ssh-public-key.yml +++ b/.github/workflows/avm.res.compute.ssh-public-key.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.data-factory.factory.yml b/.github/workflows/avm.res.data-factory.factory.yml index 5ce69a5df3..19432db759 100644 --- a/.github/workflows/avm.res.data-factory.factory.yml +++ b/.github/workflows/avm.res.data-factory.factory.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml 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 549b861b35..4e3b72aaf5 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 @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.document-db.database-account.yml b/.github/workflows/avm.res.document-db.database-account.yml index 2a07a478ba..6d88d48846 100644 --- a/.github/workflows/avm.res.document-db.database-account.yml +++ b/.github/workflows/avm.res.document-db.database-account.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.event-grid.domain.yml b/.github/workflows/avm.res.event-grid.domain.yml index 7e38c25ff0..0fc9946285 100644 --- a/.github/workflows/avm.res.event-grid.domain.yml +++ b/.github/workflows/avm.res.event-grid.domain.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.event-grid.system-topic.yml b/.github/workflows/avm.res.event-grid.system-topic.yml index f90ffa705d..222d3c05b9 100644 --- a/.github/workflows/avm.res.event-grid.system-topic.yml +++ b/.github/workflows/avm.res.event-grid.system-topic.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.event-grid.topic.yml b/.github/workflows/avm.res.event-grid.topic.yml index fd0d834d71..cb41aba6a0 100644 --- a/.github/workflows/avm.res.event-grid.topic.yml +++ b/.github/workflows/avm.res.event-grid.topic.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.action-group.yml b/.github/workflows/avm.res.insights.action-group.yml index bb1eede980..923c9faaf5 100644 --- a/.github/workflows/avm.res.insights.action-group.yml +++ b/.github/workflows/avm.res.insights.action-group.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.activity-log-alert.yml b/.github/workflows/avm.res.insights.activity-log-alert.yml index a1bdab6dab..889e24fd65 100644 --- a/.github/workflows/avm.res.insights.activity-log-alert.yml +++ b/.github/workflows/avm.res.insights.activity-log-alert.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.component.yml b/.github/workflows/avm.res.insights.component.yml index d7590c6835..7833395ff3 100644 --- a/.github/workflows/avm.res.insights.component.yml +++ b/.github/workflows/avm.res.insights.component.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.data-collection-endpoint.yml b/.github/workflows/avm.res.insights.data-collection-endpoint.yml index 9b84e9cad3..0e344719f6 100644 --- a/.github/workflows/avm.res.insights.data-collection-endpoint.yml +++ b/.github/workflows/avm.res.insights.data-collection-endpoint.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.data-collection-rule.yml b/.github/workflows/avm.res.insights.data-collection-rule.yml index 52e04acdc3..6dd1a72fee 100644 --- a/.github/workflows/avm.res.insights.data-collection-rule.yml +++ b/.github/workflows/avm.res.insights.data-collection-rule.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.diagnostic-setting.yml b/.github/workflows/avm.res.insights.diagnostic-setting.yml index f44aeeef6e..698655d415 100644 --- a/.github/workflows/avm.res.insights.diagnostic-setting.yml +++ b/.github/workflows/avm.res.insights.diagnostic-setting.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.metric-alert.yml b/.github/workflows/avm.res.insights.metric-alert.yml index 676ca20811..84636384d3 100644 --- a/.github/workflows/avm.res.insights.metric-alert.yml +++ b/.github/workflows/avm.res.insights.metric-alert.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.scheduled-query-rule.yml b/.github/workflows/avm.res.insights.scheduled-query-rule.yml index a2e55dc7dd..35a56fc14c 100644 --- a/.github/workflows/avm.res.insights.scheduled-query-rule.yml +++ b/.github/workflows/avm.res.insights.scheduled-query-rule.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.insights.webtest.yml b/.github/workflows/avm.res.insights.webtest.yml index 5fb825b8fd..d08c9ae084 100644 --- a/.github/workflows/avm.res.insights.webtest.yml +++ b/.github/workflows/avm.res.insights.webtest.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.key-vault.vault.yml b/.github/workflows/avm.res.key-vault.vault.yml index 7c06d7e0da..f90e55714a 100644 --- a/.github/workflows/avm.res.key-vault.vault.yml +++ b/.github/workflows/avm.res.key-vault.vault.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.kubernetes-configuration.extension.yml b/.github/workflows/avm.res.kubernetes-configuration.extension.yml index 73eab58640..b7911222b2 100644 --- a/.github/workflows/avm.res.kubernetes-configuration.extension.yml +++ b/.github/workflows/avm.res.kubernetes-configuration.extension.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml b/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml index e2444826b4..d4e76764fc 100644 --- a/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml +++ b/.github/workflows/avm.res.kubernetes-configuration.flux-configuration.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.logic.workflow.yml b/.github/workflows/avm.res.logic.workflow.yml index 1d420c2152..d97553c831 100644 --- a/.github/workflows/avm.res.logic.workflow.yml +++ b/.github/workflows/avm.res.logic.workflow.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.maintenance.maintenance-configuration.yml b/.github/workflows/avm.res.maintenance.maintenance-configuration.yml index 093da1828f..681e7c7924 100644 --- a/.github/workflows/avm.res.maintenance.maintenance-configuration.yml +++ b/.github/workflows/avm.res.maintenance.maintenance-configuration.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.managed-identity.user-assigned-identity.yml b/.github/workflows/avm.res.managed-identity.user-assigned-identity.yml index ad5c967426..7daa9dc4db 100644 --- a/.github/workflows/avm.res.managed-identity.user-assigned-identity.yml +++ b/.github/workflows/avm.res.managed-identity.user-assigned-identity.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.bastion-host.yml b/.github/workflows/avm.res.network.bastion-host.yml index bc454c869a..5c608d933c 100644 --- a/.github/workflows/avm.res.network.bastion-host.yml +++ b/.github/workflows/avm.res.network.bastion-host.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml b/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml index ddd52b635f..0788dd4262 100644 --- a/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml +++ b/.github/workflows/avm.res.network.dns-forwarding-ruleset.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.dns-resolver.yml b/.github/workflows/avm.res.network.dns-resolver.yml index 67bea4285b..5daa847e13 100644 --- a/.github/workflows/avm.res.network.dns-resolver.yml +++ b/.github/workflows/avm.res.network.dns-resolver.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.dns-zone.yml b/.github/workflows/avm.res.network.dns-zone.yml index 88160e264f..1f572d375d 100644 --- a/.github/workflows/avm.res.network.dns-zone.yml +++ b/.github/workflows/avm.res.network.dns-zone.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.express-route-circuit.yml b/.github/workflows/avm.res.network.express-route-circuit.yml index f41e82b3fc..efa05696cd 100644 --- a/.github/workflows/avm.res.network.express-route-circuit.yml +++ b/.github/workflows/avm.res.network.express-route-circuit.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.express-route-gateway.yml b/.github/workflows/avm.res.network.express-route-gateway.yml index e9963771c2..287e260c87 100644 --- a/.github/workflows/avm.res.network.express-route-gateway.yml +++ b/.github/workflows/avm.res.network.express-route-gateway.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.load-balancer.yml b/.github/workflows/avm.res.network.load-balancer.yml index 7fe8f4f5b9..8b10e951f6 100644 --- a/.github/workflows/avm.res.network.load-balancer.yml +++ b/.github/workflows/avm.res.network.load-balancer.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.network-interface.yml b/.github/workflows/avm.res.network.network-interface.yml index 768d83f9c7..4c148ebf29 100644 --- a/.github/workflows/avm.res.network.network-interface.yml +++ b/.github/workflows/avm.res.network.network-interface.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.network-security-group.yml b/.github/workflows/avm.res.network.network-security-group.yml index 68cc04b7f2..c8e74b6106 100644 --- a/.github/workflows/avm.res.network.network-security-group.yml +++ b/.github/workflows/avm.res.network.network-security-group.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.private-dns-zone.yml b/.github/workflows/avm.res.network.private-dns-zone.yml index 547793820f..9a4903c01e 100644 --- a/.github/workflows/avm.res.network.private-dns-zone.yml +++ b/.github/workflows/avm.res.network.private-dns-zone.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.private-endpoint.yml b/.github/workflows/avm.res.network.private-endpoint.yml index e8610f11b4..6610aa6ec5 100644 --- a/.github/workflows/avm.res.network.private-endpoint.yml +++ b/.github/workflows/avm.res.network.private-endpoint.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.public-ip-address.yml b/.github/workflows/avm.res.network.public-ip-address.yml index b262b54ee7..bccd8ed37d 100644 --- a/.github/workflows/avm.res.network.public-ip-address.yml +++ b/.github/workflows/avm.res.network.public-ip-address.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.public-ip-prefix.yml b/.github/workflows/avm.res.network.public-ip-prefix.yml index 56acf11136..b2d5b4e080 100644 --- a/.github/workflows/avm.res.network.public-ip-prefix.yml +++ b/.github/workflows/avm.res.network.public-ip-prefix.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.route-table.yml b/.github/workflows/avm.res.network.route-table.yml index ec546ead9a..fd2bc0dbfe 100644 --- a/.github/workflows/avm.res.network.route-table.yml +++ b/.github/workflows/avm.res.network.route-table.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.trafficmanagerprofile.yml b/.github/workflows/avm.res.network.trafficmanagerprofile.yml index c58679e44a..d137bfe4ab 100644 --- a/.github/workflows/avm.res.network.trafficmanagerprofile.yml +++ b/.github/workflows/avm.res.network.trafficmanagerprofile.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.network.virtual-network.yml b/.github/workflows/avm.res.network.virtual-network.yml index e9c8b82f20..d23ccba59a 100644 --- a/.github/workflows/avm.res.network.virtual-network.yml +++ b/.github/workflows/avm.res.network.virtual-network.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.operational-insights.workspace.yml b/.github/workflows/avm.res.operational-insights.workspace.yml index 9f534ab614..27136f3a1c 100644 --- a/.github/workflows/avm.res.operational-insights.workspace.yml +++ b/.github/workflows/avm.res.operational-insights.workspace.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.operations-management.solution.yml b/.github/workflows/avm.res.operations-management.solution.yml index a7702f866b..2667e26a53 100644 --- a/.github/workflows/avm.res.operations-management.solution.yml +++ b/.github/workflows/avm.res.operations-management.solution.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.power-bi-dedicated.capacity.yml b/.github/workflows/avm.res.power-bi-dedicated.capacity.yml index 7c3b0cae28..5c3251f495 100644 --- a/.github/workflows/avm.res.power-bi-dedicated.capacity.yml +++ b/.github/workflows/avm.res.power-bi-dedicated.capacity.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.resource-graph.query.yml b/.github/workflows/avm.res.resource-graph.query.yml index 0ca2453b78..6e0710e74f 100644 --- a/.github/workflows/avm.res.resource-graph.query.yml +++ b/.github/workflows/avm.res.resource-graph.query.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.resources.deployment-script.yml b/.github/workflows/avm.res.resources.deployment-script.yml index 0c7d73f865..4776980e5d 100644 --- a/.github/workflows/avm.res.resources.deployment-script.yml +++ b/.github/workflows/avm.res.resources.deployment-script.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.resources.resource-group.yml b/.github/workflows/avm.res.resources.resource-group.yml index 09f62a9174..d127188917 100644 --- a/.github/workflows/avm.res.resources.resource-group.yml +++ b/.github/workflows/avm.res.resources.resource-group.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.search.search-service.yml b/.github/workflows/avm.res.search.search-service.yml index 1504588d1f..d6db567b2e 100644 --- a/.github/workflows/avm.res.search.search-service.yml +++ b/.github/workflows/avm.res.search.search-service.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.service-bus.namespace.yml b/.github/workflows/avm.res.service-bus.namespace.yml index 5f818c9776..ed5566dd07 100644 --- a/.github/workflows/avm.res.service-bus.namespace.yml +++ b/.github/workflows/avm.res.service-bus.namespace.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.sql.server.yml b/.github/workflows/avm.res.sql.server.yml index 3060fa092d..2aa10f2268 100644 --- a/.github/workflows/avm.res.sql.server.yml +++ b/.github/workflows/avm.res.sql.server.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.res.web.serverfarm.yml b/.github/workflows/avm.res.web.serverfarm.yml index 0fd24c8e3f..21e1d143bf 100644 --- a/.github/workflows/avm.res.web.serverfarm.yml +++ b/.github/workflows/avm.res.web.serverfarm.yml @@ -71,7 +71,7 @@ jobs: # Call reusable workflow # ############################## call-workflow-passing-data: - name: "Module" + name: "Run" needs: - job_initialize_pipeline uses: ./.github/workflows/avm.template.module.yml diff --git a/.github/workflows/avm.template.module.yml b/.github/workflows/avm.template.module.yml index 24d865078e..c51d904f40 100644 --- a/.github/workflows/avm.template.module.yml +++ b/.github/workflows/avm.template.module.yml @@ -54,22 +54,22 @@ 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" + name: "PSRule [${{ matrix.testCases.name }}]" runs-on: ubuntu-20.04 if: (fromJson(inputs.workflowInput)).staticValidation == 'true' strategy: fail-fast: false matrix: - psRuleModuleTestFilePaths: ${{ fromJson(inputs.psRuleModuleTestFilePaths) }} + testCases: ${{ fromJson(inputs.psRuleModuleTestFilePaths) }} steps: - name: Checkout uses: actions/checkout@v4 - name: Set environment uses: ./.github/actions/templates/avm-setEnvironment - - name: Set PSRule validation + - name: "Run PSRule validation with [${{ matrix.testCases.path }}]" uses: ./.github/actions/templates/avm-validateModulePSRule with: - templateFilePath: "${{ inputs.modulePath }}/${{ matrix.psRuleModuleTestFilePaths }}" + templateFilePath: "${{ inputs.modulePath }}/${{ matrix.testCases.path }}" subscriptionId: "${{ secrets.ARM_SUBSCRIPTION_ID }}" managementGroupId: "${{ secrets.ARM_MGMTGROUP_ID }}" psrulePath: "avm/utilities/pipelines/staticValidation/psrule" #'${{ github.workspace }}/avm' @@ -78,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: "Deploy" + name: "Deploy [${{ matrix.testCases.name}}]" runs-on: ubuntu-20.04 if: | !cancelled() && @@ -89,7 +89,7 @@ jobs: strategy: fail-fast: false matrix: - moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + testCases: ${{ fromJson(inputs.moduleTestFilePaths) }} steps: - name: "Checkout" uses: actions/checkout@v4 @@ -99,10 +99,10 @@ jobs: uses: ./.github/actions/templates/avm-setEnvironment with: removeDeployment: "${{ fromJson(inputs.workflowInput).removeDeployment }}" - - name: "Using test file [${{ matrix.moduleTestFilePaths }}]" + - name: "Run deployment validation with test file [${{ matrix.testCases.path }}]" uses: ./.github/actions/templates/avm-validateModuleDeployment with: - templateFilePath: "${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}" + templateFilePath: "${{ inputs.modulePath }}/${{ matrix.testCases.path }}" location: "WestEurope" subscriptionId: "${{ secrets.ARM_SUBSCRIPTION_ID }}" managementGroupId: "${{ secrets.ARM_MGMTGROUP_ID }}"