From 8d833405d885716777053a3283f09c6911256c59 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 1 Feb 2023 17:25:54 +0100 Subject: [PATCH 1/5] update rg rbac name --- .../resourceGroups/.bicep/nested_roleAssignments.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep index 217c4a6b8d..c504d8b807 100644 --- a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep +++ b/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep @@ -226,7 +226,7 @@ var builtInRoleNames = { } resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { - name: guid(last(split(resourceId, '/')), principalId, roleDefinitionIdOrName) + name: guid(resourceId, principalId, roleDefinitionIdOrName) properties: { description: description roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName From c3f3a7f1b439d2999b96af5c1f5f396ebef09828 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 1 Feb 2023 17:33:53 +0100 Subject: [PATCH 2/5] show bicep cli --- utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 index 0162f5ee41..a1dd67db26 100644 --- a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 +++ b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 @@ -156,8 +156,11 @@ function Set-EnvironmentOnAgent { # Bicep CLI is pre-installed on GitHub hosted runners. # https://github.com/actions/virtual-environments#available-environments - Write-Verbose 'Bicep CLI version:' -Verbose + Write-Verbose 'Bicep CLI version (bicep --version):' -Verbose bicep --version + + Write-Verbose 'Bicep CLI version (az bicep version):' -Verbose + az bicep version <# Write-Verbose ("Install bicep start") -Verbose # Fetch the latest Bicep CLI binary From ede6c79286b061db725a1baff943ba69c0935099 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 1 Feb 2023 17:43:16 +0100 Subject: [PATCH 3/5] show bicep cli back --- utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 index a1dd67db26..70cf913498 100644 --- a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 +++ b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 @@ -156,11 +156,9 @@ function Set-EnvironmentOnAgent { # Bicep CLI is pre-installed on GitHub hosted runners. # https://github.com/actions/virtual-environments#available-environments - Write-Verbose 'Bicep CLI version (bicep --version):' -Verbose + Write-Verbose 'Bicep CLI version:' -Verbose bicep --version - Write-Verbose 'Bicep CLI version (az bicep version):' -Verbose - az bicep version <# Write-Verbose ("Install bicep start") -Verbose # Fetch the latest Bicep CLI binary From 148469d71176b020cd6f6f369bc2b7ced55cac71 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 1 Feb 2023 17:49:51 +0100 Subject: [PATCH 4/5] show bicep cli back cleanup --- utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 index 70cf913498..0162f5ee41 100644 --- a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 +++ b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 @@ -158,7 +158,6 @@ function Set-EnvironmentOnAgent { Write-Verbose 'Bicep CLI version:' -Verbose bicep --version - <# Write-Verbose ("Install bicep start") -Verbose # Fetch the latest Bicep CLI binary From c69c0b268820ea1370b8db15fb25ce77aa770b15 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 1 Feb 2023 18:11:38 +0100 Subject: [PATCH 5/5] version --- modules/Microsoft.Resources/resourceGroups/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Resources/resourceGroups/version.json b/modules/Microsoft.Resources/resourceGroups/version.json index 56f8d9ca40..badc0a2285 100644 --- a/modules/Microsoft.Resources/resourceGroups/version.json +++ b/modules/Microsoft.Resources/resourceGroups/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" + "version": "0.5" }