Skip to content

Commit 48d5feb

Browse files
oZakarioZakari
authored
Merge branch 'main' into avm-bicep
2 parents c19e427 + f714ed9 commit 48d5feb

48 files changed

Lines changed: 478 additions & 997 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
trim_trailing_whitespace = true
6+
insert_final_newline = true
7+
8+
[*.{ps1,psm1,psd1}]
9+
indent_style = space
10+
indent_size = 4
11+
12+

‎.github/workflows/Prerelease.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
# Drafts your next Release notes as Pull Requests are merged into "master"
2424
- name: Check out repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2626
with:
2727
fetch-depth: 0
2828
- name: Display the path
@@ -38,18 +38,18 @@ jobs:
3838
shell: pwsh
3939
run: Invoke-Build -File .\src\ALZ.build.ps1
4040
- name: Upload pester results
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4242
with:
4343
name: pester-results
4444
path: .\src\Artifacts\testOutput
4545
if-no-files-found: warn
4646
- name: Upload zip module archive build
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4848
with:
4949
name: zip-archive
5050
path: .\src\Archive
5151
if-no-files-found: warn
52-
- uses: release-drafter/release-drafter@v5
52+
- uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.25.0
5353
id: create_release
5454
with:
5555
config-name: prerelease-drafter.yml
@@ -60,18 +60,18 @@ jobs:
6060
run: |
6161
$tag_version = "${{ steps.create_release.outputs.tag_name }}".Replace("-alpha", "")
6262
./package_ALZ.ps1 -version $tag_version -prerelease alpha
63-
- uses: montudor/action-zip@v1
63+
- uses: montudor/action-zip@a8e75c9faefcd80fac3baf53ef40b9b119d5b702 # v1
6464
with:
6565
args: zip -qq -r ALZ.zip ALZ
66-
- uses: actions/upload-release-asset@v1.0.1
66+
- uses: actions/upload-release-asset@64e5e85fc528f162d7ba7ce2d15a3bb67efb3d80 # v1.0.1
6767
env:
6868
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6969
with:
7070
upload_url: ${{ steps.create_release.outputs.upload_url }}
7171
asset_path: ./ALZ.zip
7272
asset_name: ALZ.zip
7373
asset_content_type: application/zip
74-
- uses: eregon/publish-release@v1
74+
- uses: eregon/publish-release@01df127f5e9a3c26935118e22e738d95b59d10ce # v1.0.6
7575
env:
7676
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7777
with:

‎.github/workflows/PullRequest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
pwsh: ['7.1.3']
16+
pwsh: ['7.1.3', '7.5.0']
1717
steps:
1818
- name: Check out repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2020
with:
2121
fetch-depth: 0
2222
- name: Display the path
@@ -32,7 +32,7 @@ jobs:
3232
shell: pwsh
3333
run: Invoke-Build -File .\src\ALZ.build.ps1
3434
- name: Upload pester results
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3636
with:
3737
name: pester-results
3838
path: .\src\Artifacts\testOutput

‎.github/workflows/Release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
# Drafts your next Release notes as Pull Requests are merged into "master"
2121
- name: Check out repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2323
with:
2424
fetch-depth: 0
2525
- name: Display the path
@@ -35,18 +35,18 @@ jobs:
3535
shell: pwsh
3636
run: Invoke-Build -File .\src\ALZ.build.ps1
3737
- name: Upload pester results
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3939
with:
4040
name: pester-results
4141
path: .\src\Artifacts\testOutput
4242
if-no-files-found: warn
4343
- name: Upload zip module archive build
44-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4545
with:
4646
name: zip-archive
4747
path: .\src\Archive
4848
if-no-files-found: warn
49-
- uses: release-drafter/release-drafter@v5
49+
- uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.25.0
5050
id: create_release
5151
with:
5252
config-name: release-drafter.yml
@@ -56,18 +56,18 @@ jobs:
5656
shell: pwsh
5757
run: |
5858
./package_ALZ.ps1 -version ${{ steps.create_release.outputs.tag_name }}
59-
- uses: montudor/action-zip@v1
59+
- uses: montudor/action-zip@a8e75c9faefcd80fac3baf53ef40b9b119d5b702 # v1
6060
with:
6161
args: zip -qq -r ALZ.zip ALZ
62-
- uses: actions/upload-release-asset@v1.0.1
62+
- uses: actions/upload-release-asset@64e5e85fc528f162d7ba7ce2d15a3bb67efb3d80 # v1.0.1
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565
with:
6666
upload_url: ${{ steps.create_release.outputs.upload_url }}
6767
asset_path: ./ALZ.zip
6868
asset_name: ALZ.zip
6969
asset_content_type: application/zip
70-
- uses: eregon/publish-release@v1
70+
- uses: eregon/publish-release@01df127f5e9a3c26935118e22e738d95b59d10ce # v1.0.6
7171
env:
7272
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7373
with:

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
pull-requests: write
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/labeler@v5
16+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

‎.github/workflows/pr-title-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
name: Validate PR Title
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: amannn/action-semantic-pull-request@v5
15+
- uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/super-linter.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
name: super linter
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1919
- name: Setup Terraform
20-
uses: hashicorp/setup-terraform@v3
20+
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
2121
with:
2222
terraform_version: latest
2323
terraform_wrapper: false
2424
- name: Run github/super-linter/slim
25-
uses: github/super-linter/slim@v5
25+
uses: github/super-linter/slim@45fc0d88288beee4701c62761281edfee85655d7 # v5.0.0
2626
env:
2727
# Lint all code
2828
VALIDATE_ALL_CODEBASE: true
@@ -42,6 +42,7 @@ jobs:
4242
# VALIDATE_TERRAFORM_TERRASCAN: true # disabled for now as does not support TF 1.3 optional(type, default)
4343
VALIDATE_TERRAFORM_TFLINT: true
4444
VALIDATE_YAML: true
45+
VALIDATE_EDITORCONFIG: true
4546
# VALIDATE_GO: true # Disabled because it down not work :(
4647
# Additional settings:
4748
# If a shell script is not executable, the bash-exec

‎.github/workflows/wiki-sync.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout Source Repo
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2929
with:
3030
repository: ${{ env.wiki_source_repo }}
3131
path: ${{ env.wiki_source_repo }}
3232

3333
- name: Checkout Wiki Repo
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
3535
with:
3636
repository: ${{ env.wiki_target_repo }}
3737
path: ${{ env.wiki_target_repo }}

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ templates/.test_azuredevops
5454
templates/.test_github
5555
.vscode/settings.json
5656
/ALZ
57-
.tools
57+
.tools

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/Azure/ALZ-PowerShell-Module)
77
![GitHub contributors](https://img.shields.io/github/contributors/Azure/ALZ-PowerShell-Module)
88

9-
![Logo](./docs/wiki/media/Logo.png)
10-
119
## Introduction
1210

1311
This repository contains the PowerShell module and documentation for the Azure landing zones Accelerators for Bicep and Terraform. The accelerators are an opinionated implementation of the Azure Landing Zones modules, with Azure DevOps or GitHub bootstrapping.
@@ -41,7 +39,7 @@ To check the requirements, run these commands:
4139

4240
```pwsh
4341
Install-Module -Name ALZ
44-
Test-AcceleratorRequirements
42+
Test-AcceleratorRequirement
4543
```
4644

4745
## Contributing

0 commit comments

Comments
 (0)