Skip to content

[CI Environment] Workaround for Az CLI bug + regenerated docs with fix #1471 #1476

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
AlexanderSehr merged 16 commits into from
Jun 5, 2022
Merged

[CI Environment] Workaround for Az CLI bug + regenerated docs with fix #1471 #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
357c72d
Fixed readme
AlexanderSehr May 21, 2022
d546a44
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 24, 2022
51d558c
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 25, 2022
577129f
Flipped image build deployment
AlexanderSehr May 25, 2022
e520258
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 26, 2022
ba93d7a
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 27, 2022
3a26718
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 29, 2022
3564e81
Undid param change
AlexanderSehr May 29, 2022
4a27ee8
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 29, 2022
8650932
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 29, 2022
419783d
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr May 31, 2022
eccc238
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr Jun 2, 2022
2621960
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr Jun 3, 2022
9bb4c24
Merge branch 'main' of https://github.com/Azure/ResourceModules
AlexanderSehr Jun 3, 2022
411cd06
Implemented --no-restore for workaround
AlexanderSehr Jun 4, 2022
aebb1da
Regenerated readme
AlexanderSehr Jun 4, 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
12 changes: 5 additions & 7 deletions arm/.global/global.module.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Describe 'Readme tests' -Tag Readme {
if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
$templateContent = az bicep build --file $templateFilePath --stdout | ConvertFrom-Json -AsHashtable
$templateContent = az bicep build --file $templateFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
} elseIf (Test-Path (Join-Path $moduleFolderPath 'deploy.json')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.json'
$templateContent = Get-Content $templateFilePath -Raw | ConvertFrom-Json -AsHashtable
Expand Down Expand Up @@ -468,7 +468,7 @@ Describe 'Deployment template tests' -Tag Template {
if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
$templateContent = az bicep build --file $templateFilePath --stdout | ConvertFrom-Json -AsHashtable
$templateContent = az bicep build --file $templateFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
} elseIf (Test-Path (Join-Path $moduleFolderPath 'deploy.json')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.json'
$templateContent = Get-Content $templateFilePath -Raw | ConvertFrom-Json -AsHashtable
Expand Down Expand Up @@ -801,10 +801,8 @@ Describe 'Deployment template tests' -Tag Template {
$templateParameters = $templateContent.parameters.Keys
foreach ($parameter in $templateParameters) {
$data = ($templateContent.parameters.$parameter.metadata).description
switch -regex ($data)
{
'^Conditional. .*'
{
switch -regex ($data) {
'^Conditional. .*' {
if ($data -notmatch '.*\. Required if .*') {
$incorrectParameters += $parameter
}
Expand Down Expand Up @@ -922,7 +920,7 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
if (-not ($convertedTemplates.Keys -contains $moduleFolderPathKey)) {
if (Test-Path (Join-Path $moduleFolderPath 'deploy.bicep')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.bicep'
$templateContent = az bicep build --file $templateFilePath --stdout | ConvertFrom-Json -AsHashtable
$templateContent = az bicep build --file $templateFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
} elseIf (Test-Path (Join-Path $moduleFolderPath 'deploy.json')) {
$templateFilePath = Join-Path $moduleFolderPath 'deploy.json'
$templateContent = Get-Content $templateFilePath -Raw | ConvertFrom-Json -AsHashtable
Expand Down
17 changes: 8 additions & 9 deletions arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@
"name": {
"value": "<<namePrefix>>-wd-aut-encr-001"
},
"encryptionKeySource" : {
"value" : "Microsoft.Keyvault"
"encryptionKeySource": {
"value": "Microsoft.Keyvault"
},
"encryptionUserAssignedIdentity": {
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001" // this identity needs to be one of the identities defined in userAssignedIdentities section
},
"keyName" : {
"value" : "keyEncryptionKey"
"keyName": {
"value": "keyEncryptionKey"
},
"keyvaultUri" : {
"value" : "https://adp-carml-az-kv-nopr-002.vault.azure.net/"
"keyvaultUri": {
"value": "https://adp-carml-az-kv-nopr-002.vault.azure.net/"
},
"keyVersion" : {
"value" : "9917c14be51d4d93b37218de7d326f60"
"keyVersion": {
"value": "9917c14be51d4d93b37218de7d326f60"
},

"userAssignedIdentities": {
"value": {
"/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
Expand Down
17 changes: 1 addition & 16 deletions arm/Microsoft.Compute/virtualMachines/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,22 +1739,7 @@ module virtualMachines './Microsoft.Compute/virtualMachines/deploy.bicep' = {
}
}
adminUsername: 'localAdminUser'
adminPassword: [
{
Value: {
keyVault: {
id: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001'
}
secretName: 'adminPassword'
}
MemberType: 8
IsSettable: true
IsGettable: true
TypeNameOfValue: 'System.Management.Automation.PSCustomObject'
Name: 'reference'
IsInstance: true
}
]
adminPassword: kv1.getSecret('adminPassword')
nicConfigurations: [
{
nicSuffix: '-nic-01'
Expand Down
1 change: 1 addition & 0 deletions arm/Microsoft.EventHub/namespaces/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ userAssignedIdentities: {
module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-namespaces'
params: {

}
```

Expand Down
1 change: 1 addition & 0 deletions arm/Microsoft.KeyVault/vaults/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ privateEndpoints: [
module vaults './Microsoft.KeyVault/vaults/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-vaults'
params: {

}
```

Expand Down
1 change: 1 addition & 0 deletions arm/Microsoft.ServiceBus/namespaces/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ userAssignedIdentities: {
module namespaces './Microsoft.ServiceBus/namespaces/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-namespaces'
params: {

}
```

Expand Down
2 changes: 1 addition & 1 deletion utilities/tools/Set-ModuleReadMe.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ function Set-ModuleReadMe {

if (-not $TemplateFileContent) {
if ((Split-Path -Path $TemplateFilePath -Extension) -eq '.bicep') {
$templateFileContent = az bicep build --file $TemplateFilePath --stdout | ConvertFrom-Json -AsHashtable
$templateFileContent = az bicep build --file $TemplateFilePath --stdout --no-restore | ConvertFrom-Json -AsHashtable
} else {
$templateFileContent = ConvertFrom-Json (Get-Content $TemplateFilePath -Encoding 'utf8' -Raw) -ErrorAction Stop -AsHashtable
}
Expand Down