Skip to content

[Hackathon] Refined PSRule results, uncommented Deploy and Publish jobs and added condition to run deployment if psrule fails #2123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eriqua merged 4 commits into from
Sep 23, 2022
Merged

[Hackathon] Refined PSRule results, uncommented Deploy and Publish jobs and added condition to run deployment if psrule fails #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2776857
Uncommented deploy and publish and added if
elenabatanero Sep 23, 2022
a73a7f0
Uncommented deploy and publish and added if into rg and vnet workflows
elenabatanero Sep 23, 2022
59cebfa
removed vnet-ps-rule.yaml
elenabatanero Sep 23, 2022
c7f8a24
Updated Set-PSRuleOutput.ps1
elenabatanero Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/actions/templates/validateModulePSRule/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ runs:
inputPath: '${{ env.modulePath }}/${{ inputs.moduleTestFilePath }}'
outputFormat: Csv
outputPath: '${{ env.modulePath }}/${{ inputs.moduleTestFilePath }}-output.csv'
# option: '${{ env.modulePath }}/.test/vnet-ps-rule.yaml'

- name: 'Set PSRule Output'
if: always()
Expand Down
125 changes: 63 additions & 62 deletions .github/workflows/ms.keyvault.vaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,66 +104,67 @@ jobs:
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'

# #############################
# # Deployment validation #
# #############################
# job_module_deploy_validation:
# runs-on: ubuntu-20.04
# name: 'Deployment validation'
# needs:
# - job_initialize_pipeline
# - job_module_pester_validation
# - job_psrule_test
# strategy:
# fail-fast: false
# matrix:
# moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
# uses: ./.github/actions/templates/validateModuleDeployment
# with:
# templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
# location: '${{ env.location }}'
# resourceGroupName: '${{ env.resourceGroupName }}'
# subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
# managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
# removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'
#############################
# Deployment validation #
#############################
job_module_deploy_validation:
runs-on: ubuntu-20.04
if: ${{ always() && (needs.job_module_pester_validation.result == 'success') }} # Deployment validation will not be blocked by the failing PSRule validation stage (for the time being). <- Remove the condition block to change behavior
name: 'Deployment validation'
needs:
- job_initialize_pipeline
- job_module_pester_validation
- job_psrule_test
strategy:
fail-fast: false
matrix:
moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
uses: ./.github/actions/templates/validateModuleDeployment
with:
templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
location: '${{ env.location }}'
resourceGroupName: '${{ env.resourceGroupName }}'
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'

# ##################
# # Publishing #
# ##################
# job_publish_module:
# name: 'Publishing'
# if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
# runs-on: ubuntu-20.04
# needs:
# - job_module_deploy_validation
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Publishing'
# uses: ./.github/actions/templates/publishModule
# with:
# templateFilePath: '${{ env.modulePath }}/deploy.bicep'
# templateSpecsRGName: '${{ env.templateSpecsRGName }}'
# templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
# templateSpecsDescription: '${{ env.templateSpecsDescription }}'
# templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
# bicepRegistryName: '${{ env.bicepRegistryName }}'
# bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
# bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
# bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
##################
# Publishing #
##################
job_publish_module:
name: 'Publishing'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
runs-on: ubuntu-20.04
needs:
- job_module_deploy_validation
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Publishing'
uses: ./.github/actions/templates/publishModule
with:
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
templateSpecsRGName: '${{ env.templateSpecsRGName }}'
templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
templateSpecsDescription: '${{ env.templateSpecsDescription }}'
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
bicepRegistryName: '${{ env.bicepRegistryName }}'
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
125 changes: 63 additions & 62 deletions .github/workflows/ms.network.virtualnetworks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,66 +104,67 @@ jobs:
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'

# #############################
# # Deployment validation #
# #############################
# job_module_deploy_validation:
# runs-on: ubuntu-20.04
# name: 'Deployment validation'
# needs:
# - job_initialize_pipeline
# - job_module_pester_validation
# - job_psrule_test
# strategy:
# fail-fast: false
# matrix:
# moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
# uses: ./.github/actions/templates/validateModuleDeployment
# with:
# templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
# location: '${{ env.location }}'
# resourceGroupName: '${{ env.resourceGroupName }}'
# subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
# managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
# removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'
#############################
# Deployment validation #
#############################
job_module_deploy_validation:
runs-on: ubuntu-20.04
if: ${{ always() && (needs.job_module_pester_validation.result == 'success') }} # Deployment validation will not be blocked by the failing PSRule validation stage (for the time being). <- Remove the condition block to change behavior
name: 'Deployment validation'
needs:
- job_initialize_pipeline
- job_module_pester_validation
- job_psrule_test
strategy:
fail-fast: false
matrix:
moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
uses: ./.github/actions/templates/validateModuleDeployment
with:
templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
location: '${{ env.location }}'
resourceGroupName: '${{ env.resourceGroupName }}'
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'

# ##################
# # Publishing #
# ##################
# job_publish_module:
# name: 'Publishing'
# if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
# runs-on: ubuntu-20.04
# needs:
# - job_module_deploy_validation
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Publishing'
# uses: ./.github/actions/templates/publishModule
# with:
# templateFilePath: '${{ env.modulePath }}/deploy.bicep'
# templateSpecsRGName: '${{ env.templateSpecsRGName }}'
# templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
# templateSpecsDescription: '${{ env.templateSpecsDescription }}'
# templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
# bicepRegistryName: '${{ env.bicepRegistryName }}'
# bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
# bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
# bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
##################
# Publishing #
##################
job_publish_module:
name: 'Publishing'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
runs-on: ubuntu-20.04
needs:
- job_module_deploy_validation
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Publishing'
uses: ./.github/actions/templates/publishModule
with:
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
templateSpecsRGName: '${{ env.templateSpecsRGName }}'
templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
templateSpecsDescription: '${{ env.templateSpecsDescription }}'
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
bicepRegistryName: '${{ env.bicepRegistryName }}'
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
125 changes: 63 additions & 62 deletions .github/workflows/ms.resources.resourcegroups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,66 +104,67 @@ jobs:
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'

# #############################
# # Deployment validation #
# #############################
# job_module_deploy_validation:
# runs-on: ubuntu-20.04
# name: 'Deployment validation'
# needs:
# - job_initialize_pipeline
# - job_module_pester_validation
# - job_psrule_test
# strategy:
# fail-fast: false
# matrix:
# moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
# uses: ./.github/actions/templates/validateModuleDeployment
# with:
# templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
# location: '${{ env.location }}'
# resourceGroupName: '${{ env.resourceGroupName }}'
# subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
# managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
# removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'
#############################
# Deployment validation #
#############################
job_module_deploy_validation:
runs-on: ubuntu-20.04
if: ${{ always() && (needs.job_module_pester_validation.result == 'success') }} # Deployment validation will not be blocked by the failing PSRule validation stage (for the time being). <- Remove the condition block to change behavior
name: 'Deployment validation'
needs:
- job_initialize_pipeline
- job_module_pester_validation
- job_psrule_test
strategy:
fail-fast: false
matrix:
moduleTestFilePaths: ${{ fromJSON(needs.job_initialize_pipeline.outputs.moduleTestFilePaths) }}
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
uses: ./.github/actions/templates/validateModuleDeployment
with:
templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
location: '${{ env.location }}'
resourceGroupName: '${{ env.resourceGroupName }}'
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
removeDeployment: '${{ needs.job_initialize_pipeline.outputs.removeDeployment }}'

# ##################
# # Publishing #
# ##################
# job_publish_module:
# name: 'Publishing'
# if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
# runs-on: ubuntu-20.04
# needs:
# - job_module_deploy_validation
# steps:
# - name: 'Checkout'
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - name: Set environment variables
# uses: ./.github/actions/templates/setEnvironmentVariables
# with:
# variablesPath: ${{ env.variablesPath }}
# - name: 'Publishing'
# uses: ./.github/actions/templates/publishModule
# with:
# templateFilePath: '${{ env.modulePath }}/deploy.bicep'
# templateSpecsRGName: '${{ env.templateSpecsRGName }}'
# templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
# templateSpecsDescription: '${{ env.templateSpecsDescription }}'
# templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
# bicepRegistryName: '${{ env.bicepRegistryName }}'
# bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
# bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
# bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
##################
# Publishing #
##################
job_publish_module:
name: 'Publishing'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
runs-on: ubuntu-20.04
needs:
- job_module_deploy_validation
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set environment variables
uses: ./.github/actions/templates/setEnvironmentVariables
with:
variablesPath: ${{ env.variablesPath }}
- name: 'Publishing'
uses: ./.github/actions/templates/publishModule
with:
templateFilePath: '${{ env.modulePath }}/deploy.bicep'
templateSpecsRGName: '${{ env.templateSpecsRGName }}'
templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
templateSpecsDescription: '${{ env.templateSpecsDescription }}'
templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
bicepRegistryName: '${{ env.bicepRegistryName }}'
bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
Loading