Skip to content

Commit f064e63

Browse files
dverma-cddverma-cd
authored
Merge pull request #61 from clouddrove/feat/6.2.1
added 6.2.1 version changes
2 parents a7d9a56 + 69c5aad commit f064e63

File tree

15 files changed

+197
-133
lines changed

15 files changed

+197
-133
lines changed

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939

4040
- name: "Run analysis"
41-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
41+
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
4242
with:
4343
results_file: results.sarif
4444
results_format: sarif
@@ -69,6 +69,6 @@ jobs:
6969
# Upload the results to GitHub's code scanning dashboard (optional).
7070
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
72+
uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
7373
with:
7474
sarif_file: results.sarif

‎.github/workflows/update-policy.yml‎

Lines changed: 130 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,131 @@
11
---
2-
name: Update Library Templates
3-
4-
# yamllint disable-line rule:truthy
5-
on:
6-
schedule:
7-
- cron: "0 8 * * 1-5"
8-
workflow_dispatch:
9-
inputs:
10-
enterprise-scale-repository-branch:
11-
description: "The branch to target for the enterprise scale repository"
12-
required: false
13-
default: "main"
14-
15-
env:
16-
remote_repository: "Azure/Enterprise-Scale"
17-
remote_repository_branch: ${{ github.event.inputs.enterprise-scale-repository-branch != 'main' && github.event.inputs.enterprise-scale-repository-branch || 'main' }}
18-
branch_name: "patch-library-${{ github.run_number }}"
19-
pr_title: "Update Library Templates (automated)"
20-
pr_body:
21-
"This is an automated 'pull_request' containing updates to the library templates stored in 'modules/archetypes/lib'.\n
22-
Please review the 'files changed' tab to review changes."
23-
24-
jobs:
25-
update-templates:
26-
name: Update Library Templates
27-
runs-on: ubuntu-latest
28-
permissions:
29-
contents: write
30-
pull-requests: write
31-
steps:
32-
- name: Local repository checkout
33-
uses: actions/checkout@v4
34-
with:
35-
path: ${{ github.repository }}
36-
fetch-depth: 0
37-
38-
- name: Remote repository checkout
39-
uses: actions/checkout@v4
40-
with:
41-
repository: ${{ env.remote_repository }}
42-
path: ${{ env.remote_repository }}
43-
ref: ${{ env.remote_repository_branch }}
44-
45-
- uses: tibdex/github-app-token@v2
46-
id: generate-token
47-
with:
48-
app_id: ${{ secrets.APP_ID }}
49-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
50-
51-
- name: Configure local git
52-
run: |
53-
git config user.name github-actions
54-
git config user.email [email protected]
55-
working-directory: ${{ github.repository }}
56-
57-
- name: Create and checkout branch
58-
run: |
59-
BRANCH_URL="repos/${{ github.repository }}/branches"
60-
JQ_FILTER=".[] | select(.name == \"${{ env.branch_name }}\").name"
61-
CHECK_BRANCH_ORIGIN=$(gh api $BRANCH_URL | jq -r "$JQ_FILTER")
62-
if [ -z "$CHECK_BRANCH_ORIGIN" ]
63-
then
64-
echo "Checkout local branch (create new, no origin)..."
65-
git checkout -b ${{ env.branch_name }}
66-
else
67-
echo "Checkout local branch (create new, track from origin)..."
68-
git checkout -b ${{ env.branch_name }} --track origin/${{ env.branch_name }}
69-
fi
70-
working-directory: ${{ github.repository }}
71-
env:
72-
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
73-
74-
- name: Update library templates
75-
uses: azure/powershell@v2
76-
with:
77-
inlineScript: |
78-
Write-Information "==> Running policy definitions script..." -InformationAction Continue
79-
${{ github.repository }}/.github/scripts/Invoke-LibraryUpdatePolicyDefinitions.ps1 `
80-
-AlzToolsPath "${{ github.workspace }}/${{ env.remote_repository }}/src/Alz.Tools/" `
81-
-TargetPath "${{ github.workspace }}/${{ github.repository }}" `
82-
-SourcePath "${{ github.workspace }}/${{ env.remote_repository }}" `
83-
-Reset
84-
85-
Write-Information "==> Running policy assignments and archetypes script..." -InformationAction Continue
86-
${{ github.repository }}/.github/scripts/Invoke-LibraryUpdatePolicyAssignmentArchetypes.ps1 `
87-
-AlzToolsPath "${{ github.workspace }}/${{ env.remote_repository }}/src/Alz.Tools/" `
88-
-TargetPath "${{ github.workspace }}/${{ github.repository }}" `
89-
-SourcePath "${{ github.workspace }}/${{ env.remote_repository }}"
90-
azPSVersion: "latest"
91-
92-
- name: Check for changes
93-
id: git_status
94-
run: |
95-
mapfile -t "CHECK_GIT_STATUS" < <(git status -s)
96-
printf "%s\n" "${CHECK_GIT_STATUS[@]}"
97-
echo "changes=${#CHECK_GIT_STATUS[@]}" >> "$GITHUB_OUTPUT"
98-
working-directory: ${{ github.repository }}
99-
100-
# - name: Add files, commit and push
101-
# if: steps.git_status.outputs.changes > 0
102-
# run: |
103-
# echo "Pushing changes to origin..."
104-
# git add modules/archetypes/lib
105-
# git commit -m '${{ env.pr_title }}'
106-
# git push origin ${{ env.branch_name }}
107-
# working-directory: ${{ github.repository }}
108-
109-
# - name: Create pull request
110-
# if: steps.git_status.outputs.changes > 0
111-
# run: |
112-
# HEAD_LABEL="${{ github.repository_owner }}:${{ env.branch_name }}"
113-
# BASE_LABEL="${{ github.repository_owner }}:$(echo '${{ github.ref }}' | sed 's:refs/heads/::')"
114-
# PULL_REQUEST_URL="repos/${{ github.repository }}/pulls"
115-
# JQ_FILTER=".[] | select(.head.label == \"$HEAD_LABEL\") | select(.base.label == \"$BASE_LABEL\") | .url"
116-
# CHECK_PULL_REQUEST_URL=$(gh api $PULL_REQUEST_URL | jq -r "$JQ_FILTER")
117-
# if [ -z "$CHECK_PULL_REQUEST_URL" ]
118-
# then
119-
# CHECK_PULL_REQUEST_URL=$(gh pr create \
120-
# --title "${{ env.pr_title }}" \
121-
# --body "${{ env.pr_body }}" \
122-
# --base "${{ github.ref }}" \
123-
# --head "${{ env.branch_name }}" \
124-
# --draft)
125-
# echo "Created new PR: $CHECK_PULL_REQUEST_URL"
126-
# else
127-
# echo "Existing PR found: $CHECK_PULL_REQUEST_URL"
128-
# fi
129-
# working-directory: ${{ github.repository }}
130-
# env:
131-
# GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
132-
2+
name: Update Library Templates
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
schedule:
7+
- cron: "0 8 * * 1-5"
8+
workflow_dispatch:
9+
inputs:
10+
enterprise-scale-repository-branch:
11+
description: "The branch to target for the enterprise scale repository"
12+
required: false
13+
default: "main"
14+
15+
env:
16+
remote_repository: "Azure/Enterprise-Scale"
17+
remote_repository_branch: ${{ github.event.inputs.enterprise-scale-repository-branch != 'main' && github.event.inputs.enterprise-scale-repository-branch || 'main' }}
18+
branch_name: "patch-library-${{ github.run_number }}"
19+
pr_title: "Update Library Templates (automated)"
20+
pr_body:
21+
"This is an automated 'pull_request' containing updates to the library templates stored in 'modules/archetypes/lib'.\n
22+
Please review the 'files changed' tab to review changes."
23+
24+
jobs:
25+
update-templates:
26+
name: Update Library Templates
27+
runs-on: ubuntu-latest
28+
permissions:
29+
contents: write
30+
pull-requests: write
31+
steps:
32+
- name: Local repository checkout
33+
uses: actions/checkout@v4
34+
with:
35+
path: ${{ github.repository }}
36+
fetch-depth: 0
37+
38+
- name: Remote repository checkout
39+
uses: actions/checkout@v4
40+
with:
41+
repository: ${{ env.remote_repository }}
42+
path: ${{ env.remote_repository }}
43+
ref: ${{ env.remote_repository_branch }}
44+
45+
- uses: tibdex/github-app-token@v2
46+
id: generate-token
47+
with:
48+
app_id: ${{ secrets.APP_ID }}
49+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
50+
51+
- name: Configure local git
52+
run: |
53+
git config user.name github-actions
54+
git config user.email [email protected]
55+
working-directory: ${{ github.repository }}
56+
57+
- name: Create and checkout branch
58+
run: |
59+
BRANCH_URL="repos/${{ github.repository }}/branches"
60+
JQ_FILTER=".[] | select(.name == \"${{ env.branch_name }}\").name"
61+
CHECK_BRANCH_ORIGIN=$(gh api $BRANCH_URL | jq -r "$JQ_FILTER")
62+
if [ -z "$CHECK_BRANCH_ORIGIN" ]
63+
then
64+
echo "Checkout local branch (create new, no origin)..."
65+
git checkout -b ${{ env.branch_name }}
66+
else
67+
echo "Checkout local branch (create new, track from origin)..."
68+
git checkout -b ${{ env.branch_name }} --track origin/${{ env.branch_name }}
69+
fi
70+
working-directory: ${{ github.repository }}
71+
env:
72+
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
73+
74+
- name: Update library templates
75+
uses: azure/powershell@v2
76+
with:
77+
inlineScript: |
78+
Write-Information "==> Running policy definitions script..." -InformationAction Continue
79+
${{ github.repository }}/.github/scripts/Invoke-LibraryUpdatePolicyDefinitions.ps1 `
80+
-AlzToolsPath "${{ github.workspace }}/${{ env.remote_repository }}/src/Alz.Tools/" `
81+
-TargetPath "${{ github.workspace }}/${{ github.repository }}" `
82+
-SourcePath "${{ github.workspace }}/${{ env.remote_repository }}" `
83+
-Reset
84+
85+
Write-Information "==> Running policy assignments and archetypes script..." -InformationAction Continue
86+
${{ github.repository }}/.github/scripts/Invoke-LibraryUpdatePolicyAssignmentArchetypes.ps1 `
87+
-AlzToolsPath "${{ github.workspace }}/${{ env.remote_repository }}/src/Alz.Tools/" `
88+
-TargetPath "${{ github.workspace }}/${{ github.repository }}" `
89+
-SourcePath "${{ github.workspace }}/${{ env.remote_repository }}"
90+
azPSVersion: "latest"
91+
92+
- name: Check for changes
93+
id: git_status
94+
run: |
95+
mapfile -t "CHECK_GIT_STATUS" < <(git status -s)
96+
printf "%s\n" "${CHECK_GIT_STATUS[@]}"
97+
echo "changes=${#CHECK_GIT_STATUS[@]}" >> "$GITHUB_OUTPUT"
98+
working-directory: ${{ github.repository }}
99+
100+
# - name: Add files, commit and push
101+
# if: steps.git_status.outputs.changes > 0
102+
# run: |
103+
# echo "Pushing changes to origin..."
104+
# git add modules/archetypes/lib
105+
# git commit -m '${{ env.pr_title }}'
106+
# git push origin ${{ env.branch_name }}
107+
# working-directory: ${{ github.repository }}
108+
109+
# - name: Create pull request
110+
# if: steps.git_status.outputs.changes > 0
111+
# run: |
112+
# HEAD_LABEL="${{ github.repository_owner }}:${{ env.branch_name }}"
113+
# BASE_LABEL="${{ github.repository_owner }}:$(echo '${{ github.ref }}' | sed 's:refs/heads/::')"
114+
# PULL_REQUEST_URL="repos/${{ github.repository }}/pulls"
115+
# JQ_FILTER=".[] | select(.head.label == \"$HEAD_LABEL\") | select(.base.label == \"$BASE_LABEL\") | .url"
116+
# CHECK_PULL_REQUEST_URL=$(gh api $PULL_REQUEST_URL | jq -r "$JQ_FILTER")
117+
# if [ -z "$CHECK_PULL_REQUEST_URL" ]
118+
# then
119+
# CHECK_PULL_REQUEST_URL=$(gh pr create \
120+
# --title "${{ env.pr_title }}" \
121+
# --body "${{ env.pr_body }}" \
122+
# --base "${{ github.ref }}" \
123+
# --head "${{ env.branch_name }}" \
124+
# --draft)
125+
# echo "Created new PR: $CHECK_PULL_REQUEST_URL"
126+
# else
127+
# echo "Existing PR found: $CHECK_PULL_REQUEST_URL"
128+
# fi
129+
# working-directory: ${{ github.repository }}
130+
# env:
131+
# GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- BEGIN_TF_DOCS -->
22
# Azure landing zones Terraform module
33

4+
> [!IMPORTANT]
5+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
6+
> Please see the documentation at <https://aka.ms/alz/tf>.
7+
> This module will continue to be supported for existing deployments.
8+
49
[![Build Status](https://dev.azure.com/mscet/CAE-ALZ-Terraform/_apis/build/status/Tests/E2E?branchName=refs%2Ftags%2Fv6.0.0)](https://dev.azure.com/mscet/CAE-ALZ-Terraform/_build/latest?definitionId=26&branchName=refs%2Ftags%2Fv6.0.0)
510
![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/Azure/terraform-azurerm-caf-enterprise-scale?style=flat&logo=github)
611
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/terraform-azurerm-caf-enterprise-scale.svg)](http://isitmaintained.com/project/azure/terraform-azurerm-caf-enterprise-scale "Average time to resolve an issue")

‎_README_header.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Azure landing zones Terraform module
22

3+
> [!IMPORTANT]
4+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
5+
> Please see the documentation at <https://aka.ms/alz/tf>.
6+
> This module will continue to be supported for existing deployments.
7+
38
[![Build Status](https://dev.azure.com/mscet/CAE-ALZ-Terraform/_apis/build/status/Tests/E2E?branchName=refs%2Ftags%2Fv6.0.0)](https://dev.azure.com/mscet/CAE-ALZ-Terraform/_build/latest?definitionId=26&branchName=refs%2Ftags%2Fv6.0.0)
49
![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/Azure/terraform-azurerm-caf-enterprise-scale?style=flat&logo=github)
510
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/terraform-azurerm-caf-enterprise-scale.svg)](http://isitmaintained.com/project/azure/terraform-azurerm-caf-enterprise-scale "Average time to resolve an issue")

‎docs/wiki/_Header.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!-- markdownlint-disable MD041 -->
2+
> [!IMPORTANT]
3+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
4+
> Please see the documentation at <https://aka.ms/alz/tf>.
5+
> This module will continue to be supported for existing deployments.

‎modules/archetypes/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- BEGIN_TF_DOCS -->
22
# Archetypes sub-module
33

4+
> [!IMPORTANT]
5+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
6+
> Please see the documentation at <https://aka.ms/alz/tf>.
7+
> This module will continue to be supported for existing deployments.
8+
49
## Documentation
510
<!-- markdownlint-disable MD033 -->
611

‎modules/archetypes/_README_header.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
# Archetypes sub-module
2+
3+
> [!IMPORTANT]
4+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
5+
> Please see the documentation at <https://aka.ms/alz/tf>.
6+
> This module will continue to be supported for existing deployments.

‎modules/connectivity/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- BEGIN_TF_DOCS -->
22
# Connectivity sub-module
33

4+
> [!IMPORTANT]
5+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
6+
> Please see the documentation at <https://aka.ms/alz/tf>.
7+
> This module will continue to be supported for existing deployments.
8+
49
## Documentation
510
<!-- markdownlint-disable MD033 -->
611

‎modules/connectivity/_README_header.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
# Connectivity sub-module
2+
3+
> [!IMPORTANT]
4+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
5+
> Please see the documentation at <https://aka.ms/alz/tf>.
6+
> This module will continue to be supported for existing deployments.

‎modules/identity/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- BEGIN_TF_DOCS -->
22
# Identity sub-module
33

4+
> [!IMPORTANT]
5+
> For new deployments we now recommend using Azure Verified Modules for Platform Landing Zones.
6+
> Please see the documentation at <https://aka.ms/alz/tf>.
7+
> This module will continue to be supported for existing deployments.
8+
49
## Documentation
510
<!-- markdownlint-disable MD033 -->
611

0 commit comments

Comments
 (0)