From 64e2186d89459bfef9d1090ed69154c6ec58f37e Mon Sep 17 00:00:00 2001 From: Arjen Huitema Date: Fri, 19 Jul 2024 17:40:03 +0200 Subject: [PATCH 1/3] Update alz-pattern-update-policies.yml --- .github/workflows/alz-pattern-update-policies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alz-pattern-update-policies.yml b/.github/workflows/alz-pattern-update-policies.yml index 988bc1606..85ca7a76d 100644 --- a/.github/workflows/alz-pattern-update-policies.yml +++ b/.github/workflows/alz-pattern-update-policies.yml @@ -38,11 +38,11 @@ jobs: runs-on: ubuntu-latest if: | ( - github.event.pull_request.head.repo.full_name == 'Azure/azure-monitor-baseline-alerts' + github.event.pull_request.head.repo.full_name == 'arjenhuitema/azure-monitor-baseline-alerts' ) || ( - github.event.pull_request.head.repo.full_name != 'Azure/azure-monitor-baseline-alerts' + github.event.pull_request.head.repo.full_name != 'arjenhuitema/azure-monitor-baseline-alerts' && contains(github.event.pull_request.labels.*.name, 'PR: Safe to test :test_tube:') ) From bc1ecc4c606ce7dd290c1823585c128f55907260 Mon Sep 17 00:00:00 2001 From: Arjen Huitema Date: Fri, 19 Jul 2024 17:51:05 +0200 Subject: [PATCH 2/3] Update alz-pattern-update-policies.yml --- .../workflows/alz-pattern-update-policies.yml | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/alz-pattern-update-policies.yml b/.github/workflows/alz-pattern-update-policies.yml index 85ca7a76d..28914e485 100644 --- a/.github/workflows/alz-pattern-update-policies.yml +++ b/.github/workflows/alz-pattern-update-policies.yml @@ -76,44 +76,41 @@ jobs: echo "git user email : $github_email" git config --global user.email "$github_email" - - name: Update policies + - name: Update Automation policies run: bicep build ./patterns/alz/templates/policies-Automation.bicep --outfile ./patterns/alz/policyDefinitions/policies-Automation.json - - name: Update policy set definitions (initiatives) + - name: Update Compute policies run: bicep build ./patterns/alz/templates/policies-Compute.bicep --outfile ./patterns/alz/policyDefinitions/policies-Compute.json - - name: Update policy set definitions (initiatives) + - name: Update Hybrid policies run: bicep build ./patterns/alz/templates/policies-Hybrid.bicep --outfile ./patterns/alz/policyDefinitions/policies-Hybrid.json - - name: Update policy set definitions (initiatives) + - name: Update Key Management policies run: bicep build ./patterns/alz/templates/policies-KeyManagement.bicep --outfile ./patterns/alz/policyDefinitions/policies-KeyManagement.json - - name: Update policy set definitions (initiatives) + - name: Update Monitoring policies run: bicep build ./patterns/alz/templates/policies-Monitoring.bicep --outfile ./patterns/alz/policyDefinitions/policies-Monitoring.json - - name: Update policy set definitions (initiatives) + - name: Update Network policies run: bicep build ./patterns/alz/templates/policies-Network.bicep --outfile ./patterns/alz/policyDefinitions/policies-Network.json - - name: Update policy set definitions (initiatives) + - name: Update Notification Assets policies run: bicep build ./patterns/alz/templates/policies-NotificationAssets.bicep --outfile ./patterns/alz/policyDefinitions/policies-NotificationAssets.json - - name: Update policy set definitions (initiatives) + - name: Update Recovery Services policies run: bicep build ./patterns/alz/templates/policies-RecoveryServices.bicep --outfile ./patterns/alz/policyDefinitions/policies-RecoveryServices.json - - name: Update policy set definitions (initiatives) + - name: Update Resource Management policies run: bicep build ./patterns/alz/templates/policies-ServiceHealth.bicep --outfile ./patterns/alz/policyDefinitions/policies-ServiceHealth.json - - name: Update policy set definitions (initiatives) + - name: Update Security policies run: bicep build ./patterns/alz/templates/policies-Storage.bicep --outfile ./patterns/alz/policyDefinitions/policies-Storage.json - - name: Update policy set definitions (initiatives) + - name: Update Web policies run: bicep build ./patterns/alz/templates/policies-Web.bicep --outfile ./patterns/alz/policyDefinitions/policies-Web.json - - name: Update policy set definitions (initiatives) - run: bicep build ./patterns/alz/templates/policySets.bicep --outfile ./patterns/alz/policyDefinitions/policySets.json - - - name: Update policy set definitions (initiatives) - run: bicep build ./src/templates/initiatives.bicep --outfile ./eslzArm/managementGroupTemplates/policyDefinitions/initiatives.json + - name: Update policy set definitions + run: bicep build ./patterns/alz/templates/policySets.bicep --outfile ./patterns/alz/policyDefinitions/policySets.json - name: Check git status run: | From 72d45e9ddc939f3bb1edc44cf26e3040c594cd9e Mon Sep 17 00:00:00 2001 From: Arjen Huitema Date: Fri, 19 Jul 2024 22:12:23 +0200 Subject: [PATCH 3/3] Update alz-pattern-update-policies.yml --- .github/workflows/alz-pattern-update-policies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alz-pattern-update-policies.yml b/.github/workflows/alz-pattern-update-policies.yml index 28914e485..81b7d79bf 100644 --- a/.github/workflows/alz-pattern-update-policies.yml +++ b/.github/workflows/alz-pattern-update-policies.yml @@ -120,11 +120,11 @@ jobs: - name: Stage changes run: | echo "==> Stage changes..." - mapfile -t STATUS_LOG < <(git status --short | grep eslzArm/) + mapfile -t STATUS_LOG < <(git status --short | grep patterns/alz) if [ ${#STATUS_LOG[@]} -gt 0 ]; then echo "Found changes to the following files:" printf "%s\n" "${STATUS_LOG[@]}" - git add --all ./eslzArm + git add --all ./patterns/alz else echo "No changes to add." fi