Skip to content

Commit

Permalink
feat: Removed unused 'owner' metadata from templates including corres…
Browse files Browse the repository at this point in the history
…ponding test (#4046)

## Description

- Removed unused 'owner' metadata from templates including corresponding
test
- Regenerated all templates

## Pipeline Reference

<!-- Insert your Pipeline Status Badge below -->

| Pipeline |
| -------- |
|
[![avm.res.analysis-services.server](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.analysis-services.server.yml/badge.svg?branch=users%2Falsehr%2FremoveOwner&event=workflow_dispatch)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.analysis-services.server.yml)
|
|
[![avm.ptn.aca-lza.hosting-environment](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.ptn.aca-lza.hosting-environment.yml/badge.svg?branch=users%2Falsehr%2FremoveOwner&event=workflow_dispatch)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.ptn.aca-lza.hosting-environment.yml)
(unrelated)|

## Type of Change

<!-- Use the checkboxes [x] on the options that are relevant. -->

- [x] Update to CI Environment or utilities (Non-module affecting
changes)
- [x] Azure Verified Module updates:
- [ ] Bugfix containing backwards-compatible bug fixes, and I have NOT
bumped the MAJOR or MINOR version in `version.json`:
- [ ] Someone has opened a bug report issue, and I have included "Closes
#{bug_report_issue_number}" in the PR description.
- [ ] The bug was found by the module author, and no one has opened an
issue to report it yet.
- [ ] Feature update backwards compatible feature updates, and I have
bumped the MINOR version in `version.json`.
- [ ] Breaking changes and I have bumped the MAJOR version in
`version.json`.
  - [ ] Update to documentation
  • Loading branch information
AlexanderSehr authored Jan 21, 2025
1 parent 77907bb commit 86ca03b
Show file tree
Hide file tree
Showing 885 changed files with 2,021 additions and 3,219 deletions.
1 change: 0 additions & 1 deletion avm/ptn/aca-lza/hosting-environment/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ targetScope = 'subscription'

metadata name = 'Container Apps Landing Zone Accelerator'
metadata description = 'This Azure Container Apps pattern module represents an Azure Container Apps deployment aligned with the cloud adoption framework'
metadata owner = 'Azure/avm-ptn-acalza-hostingenvironment-module-contributors-bicep'

// ------------------
// PARAMETERS
Expand Down
9 changes: 4 additions & 5 deletions avm/ptn/aca-lza/hosting-environment/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "2541695628448359364"
"templateHash": "9242720855517012815"
},
"name": "Container Apps Landing Zone Accelerator",
"description": "This Azure Container Apps pattern module represents an Azure Container Apps deployment aligned with the cloud adoption framework",
"owner": "Azure/avm-ptn-acalza-hostingenvironment-module-contributors-bicep"
"description": "This Azure Container Apps pattern module represents an Azure Container Apps deployment aligned with the cloud adoption framework"
},
"parameters": {
"workloadName": {
Expand Down Expand Up @@ -332,7 +331,7 @@
}
},
"variables": {
"$fxv#0": "{\n // Recommended abreviations: https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations\n \"resourceTypeAbbreviations\": {\n \"applicationGateway\": \"agw\",\n \"applicationInsights\": \"appi\",\n \"appService\": \"app\",\n \"azureFirewall\": \"azfw\",\n \"bastion\": \"bas\",\n \"containerAppsEnvironment\": \"cae\",\n \"containerRegistry\": \"cr\",\n \"cosmosDbNoSql\": \"cosno\",\n \"frontDoor\": \"afd\",\n \"frontDoorEndpoint\": \"fde\",\n \"frontDoorWaf\": \"fdfp\",\n \"keyVault\": \"kv\",\n \"logAnalyticsWorkspace\": \"log\",\n \"managedIdentity\": \"id\",\n \"networkInterface\": \"nic\",\n \"networkSecurityGroup\": \"nsg\",\n \"privateEndpoint\": \"pep\",\n \"privateLinkService\": \"pls\",\n \"publicIpAddress\": \"pip\",\n \"resourceGroup\": \"rg\",\n \"routeTable\": \"rt\",\n \"serviceBus\": \"sb\",\n \"serviceBusQueue\": \"sbq\",\n \"serviceBusTopic\": \"sbt\",\n \"storageAccount\": \"st\",\n \"virtualMachine\": \"vm\",\n \"virtualNetwork\": \"vnet\",\n \"redisCache\": \"redis\",\n \"cognitiveAccount\": \"cog\",\n \"openAiDeployment\": \"oaidep\",\n \"azureAISearch\": \"srch\",\n \"documentIntelligence\": \"di\",\n \"eventGridSystemTopic\": \"egst\",\n \"eventGridSubscription\": \"evgs\"\n },\n //copied from here: https://github.com/nianton/azure-naming/blob/main/datafiles/regionAbbreviations.json\n \"regionAbbreviations\": {\n \"australiacentral\": \"auc\",\n \"australiacentral2\": \"auc2\",\n \"australiaeast\": \"aue\",\n \"australiasoutheast\": \"ause\",\n \"brazilsouth\": \"brs\",\n \"brazilsoutheast\": \"brse\",\n \"canadacentral\": \"canc\",\n \"canadaeast\": \"cane\",\n \"centralindia\": \"cin\",\n \"centralus\": \"cus\",\n \"centraluseuap\": \"cuseuap\",\n \"eastasia\": \"ea\",\n \"eastus\": \"eus\",\n \"eastus2\": \"eus2\",\n \"eastus2euap\": \"eus2euap\",\n \"francecentral\": \"frc\",\n \"francesouth\": \"frs\",\n \"germanynorth\": \"gern\",\n \"germanywestcentral\": \"gerwc\",\n \"japaneast\": \"jae\",\n \"japanwest\": \"jaw\",\n \"jioindiacentral\": \"jioinc\",\n \"jioindiawest\": \"jioinw\",\n \"koreacentral\": \"koc\",\n \"koreasouth\": \"kors\",\n \"northcentralus\": \"ncus\",\n \"northeurope\": \"neu\",\n \"norwayeast\": \"nore\",\n \"norwaywest\": \"norw\",\n \"southafricanorth\": \"san\",\n \"southafricawest\": \"saw\",\n \"southcentralus\": \"scus\",\n \"southeastasia\": \"sea\",\n \"southindia\": \"sin\",\n \"swedencentral\": \"swc\",\n \"switzerlandnorth\": \"swn\",\n \"switzerlandwest\": \"sww\",\n \"uaecentral\": \"uaec\",\n \"uaenorth\": \"uaen\",\n \"uksouth\": \"uks\",\n \"ukwest\": \"ukw\",\n \"westcentralus\": \"wcus\",\n \"westeurope\": \"weu\",\n \"westindia\": \"win\",\n \"westus\": \"wus\",\n \"westus2\": \"wus2\",\n \"westus3\": \"wus3\"\n }\n}",
"$fxv#0": "{\r\n // Recommended abreviations: https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations\r\n \"resourceTypeAbbreviations\": {\r\n \"applicationGateway\": \"agw\",\r\n \"applicationInsights\": \"appi\",\r\n \"appService\": \"app\",\r\n \"azureFirewall\": \"azfw\",\r\n \"bastion\": \"bas\",\r\n \"containerAppsEnvironment\": \"cae\",\r\n \"containerRegistry\": \"cr\",\r\n \"cosmosDbNoSql\": \"cosno\",\r\n \"frontDoor\": \"afd\",\r\n \"frontDoorEndpoint\": \"fde\",\r\n \"frontDoorWaf\": \"fdfp\",\r\n \"keyVault\": \"kv\",\r\n \"logAnalyticsWorkspace\": \"log\",\r\n \"managedIdentity\": \"id\",\r\n \"networkInterface\": \"nic\",\r\n \"networkSecurityGroup\": \"nsg\",\r\n \"privateEndpoint\": \"pep\",\r\n \"privateLinkService\": \"pls\",\r\n \"publicIpAddress\": \"pip\",\r\n \"resourceGroup\": \"rg\",\r\n \"routeTable\": \"rt\",\r\n \"serviceBus\": \"sb\",\r\n \"serviceBusQueue\": \"sbq\",\r\n \"serviceBusTopic\": \"sbt\",\r\n \"storageAccount\": \"st\",\r\n \"virtualMachine\": \"vm\",\r\n \"virtualNetwork\": \"vnet\",\r\n \"redisCache\": \"redis\",\r\n \"cognitiveAccount\": \"cog\",\r\n \"openAiDeployment\": \"oaidep\",\r\n \"azureAISearch\": \"srch\",\r\n \"documentIntelligence\": \"di\",\r\n \"eventGridSystemTopic\": \"egst\",\r\n \"eventGridSubscription\": \"evgs\"\r\n },\r\n //copied from here: https://github.com/nianton/azure-naming/blob/main/datafiles/regionAbbreviations.json\r\n \"regionAbbreviations\": {\r\n \"australiacentral\": \"auc\",\r\n \"australiacentral2\": \"auc2\",\r\n \"australiaeast\": \"aue\",\r\n \"australiasoutheast\": \"ause\",\r\n \"brazilsouth\": \"brs\",\r\n \"brazilsoutheast\": \"brse\",\r\n \"canadacentral\": \"canc\",\r\n \"canadaeast\": \"cane\",\r\n \"centralindia\": \"cin\",\r\n \"centralus\": \"cus\",\r\n \"centraluseuap\": \"cuseuap\",\r\n \"eastasia\": \"ea\",\r\n \"eastus\": \"eus\",\r\n \"eastus2\": \"eus2\",\r\n \"eastus2euap\": \"eus2euap\",\r\n \"francecentral\": \"frc\",\r\n \"francesouth\": \"frs\",\r\n \"germanynorth\": \"gern\",\r\n \"germanywestcentral\": \"gerwc\",\r\n \"japaneast\": \"jae\",\r\n \"japanwest\": \"jaw\",\r\n \"jioindiacentral\": \"jioinc\",\r\n \"jioindiawest\": \"jioinw\",\r\n \"koreacentral\": \"koc\",\r\n \"koreasouth\": \"kors\",\r\n \"northcentralus\": \"ncus\",\r\n \"northeurope\": \"neu\",\r\n \"norwayeast\": \"nore\",\r\n \"norwaywest\": \"norw\",\r\n \"southafricanorth\": \"san\",\r\n \"southafricawest\": \"saw\",\r\n \"southcentralus\": \"scus\",\r\n \"southeastasia\": \"sea\",\r\n \"southindia\": \"sin\",\r\n \"swedencentral\": \"swc\",\r\n \"switzerlandnorth\": \"swn\",\r\n \"switzerlandwest\": \"sww\",\r\n \"uaecentral\": \"uaec\",\r\n \"uaenorth\": \"uaen\",\r\n \"uksouth\": \"uks\",\r\n \"ukwest\": \"ukw\",\r\n \"westcentralus\": \"wcus\",\r\n \"westeurope\": \"weu\",\r\n \"westindia\": \"win\",\r\n \"westus\": \"wus\",\r\n \"westus2\": \"wus2\",\r\n \"westus3\": \"wus3\"\r\n }\r\n}",
"naming": "[json(variables('$fxv#0'))]",
"uniqueIdShort": "[substring(parameters('uniqueId'), 0, 5)]",
"resourceTypeToken": "RES_TYPE",
Expand Down Expand Up @@ -51344,4 +51343,4 @@
"value": "[if(parameters('enableApplicationInsights'), reference(subscriptionResourceId('Microsoft.Resources/deployments', take(format('deploy-containerAppsEnvironment-{0}', deployment().name), 64)), '2022-09-01').outputs.applicationInsightsName.value, '')]"
}
}
}
}
1 change: 0 additions & 1 deletion avm/ptn/ai-platform/baseline/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ metadata name = 'AI Platform Baseline'
metadata description = '''This module provides a secure and scalable environment for deploying AI applications on Azure.
The module encompasses all essential components required for building, managing, and observing AI solutions, including a machine learning workspace, observability tools, and necessary data management services.
By integrating with Microsoft Entra ID for secure identity management and utilizing private endpoints for services like Key Vault and Blob Storage, the module ensures secure communication and data access.'''
metadata owner = 'Azure/module-maintainers'

@description('Required. Alphanumberic suffix to use for resource naming.')
@minLength(3)
Expand Down
5 changes: 2 additions & 3 deletions avm/ptn/ai-platform/baseline/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "10875530237732240438"
"templateHash": "18011765298164773624"
},
"name": "AI Platform Baseline",
"description": "This module provides a secure and scalable environment for deploying AI applications on Azure.\nThe module encompasses all essential components required for building, managing, and observing AI solutions, including a machine learning workspace, observability tools, and necessary data management services.\nBy integrating with Microsoft Entra ID for secure identity management and utilizing private endpoints for services like Key Vault and Blob Storage, the module ensures secure communication and data access.",
"owner": "Azure/module-maintainers"
"description": "This module provides a secure and scalable environment for deploying AI applications on Azure.\nThe module encompasses all essential components required for building, managing, and observing AI solutions, including a machine learning workspace, observability tools, and necessary data management services.\nBy integrating with Microsoft Entra ID for secure identity management and utilizing private endpoints for services like Key Vault and Blob Storage, the module ensures secure communication and data access."
},
"definitions": {
"logAnalyticsConfigurationType": {
Expand Down
1 change: 0 additions & 1 deletion avm/ptn/app/container-job-toolkit/main.bicep
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Container job toolkit'
metadata description = 'This module deploys a container to run as a job.'
metadata owner = 'Azure/module-maintainers'

// ============== //
// Parameters //
Expand Down
5 changes: 2 additions & 3 deletions avm/ptn/app/container-job-toolkit/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "15354937436558255253"
"templateHash": "2631969094686923970"
},
"name": "Container job toolkit",
"description": "This module deploys a container to run as a job.",
"owner": "Azure/module-maintainers"
"description": "This module deploys a container to run as a job."
},
"definitions": {
"environmentVariableType": {
Expand Down
1 change: 0 additions & 1 deletion avm/ptn/authorization/policy-assignment/main.bicep
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Policy Assignments (All scopes)'
metadata description = 'This module deploys a Policy Assignment at a Management Group, Subscription or Resource Group scope.'
metadata owner = 'Azure/module-maintainers'

targetScope = 'managementGroup'

Expand Down
20 changes: 8 additions & 12 deletions avm/ptn/authorization/policy-assignment/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "3902127955131309221"
"templateHash": "18206582420908895315"
},
"name": "Policy Assignments (All scopes)",
"description": "This module deploys a Policy Assignment at a Management Group, Subscription or Resource Group scope.",
"owner": "Azure/module-maintainers"
"description": "This module deploys a Policy Assignment at a Management Group, Subscription or Resource Group scope."
},
"parameters": {
"name": {
Expand Down Expand Up @@ -254,11 +253,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "7784495768661856271"
"templateHash": "10678509985815740940"
},
"name": "Policy Assignments (Management Group scope)",
"description": "This module deploys a Policy Assignment at a Management Group scope.",
"owner": "Azure/module-maintainers"
"description": "This module deploys a Policy Assignment at a Management Group scope."
},
"parameters": {
"name": {
Expand Down Expand Up @@ -989,11 +987,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "5956652963277088316"
"templateHash": "2523227409976507857"
},
"name": "Policy Assignments (Subscription scope)",
"description": "This module deploys a Policy Assignment at a Subscription scope.",
"owner": "Azure/module-maintainers"
"description": "This module deploys a Policy Assignment at a Subscription scope."
},
"parameters": {
"name": {
Expand Down Expand Up @@ -1244,11 +1241,10 @@
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "15421130529251696480"
"templateHash": "3323049503112762784"
},
"name": "Policy Assignments (Resource Group scope)",
"description": "This module deploys a Policy Assignment at a Resource Group scope.",
"owner": "Azure/module-maintainers"
"description": "This module deploys a Policy Assignment at a Resource Group scope."
},
"parameters": {
"name": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Policy Assignments (Management Group scope)'
metadata description = 'This module deploys a Policy Assignment at a Management Group scope.'
metadata owner = 'Azure/module-maintainers'

targetScope = 'managementGroup'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Policy Assignments (Resource Group scope)'
metadata description = 'This module deploys a Policy Assignment at a Resource Group scope.'
metadata owner = 'Azure/module-maintainers'

targetScope = 'resourceGroup'

Expand Down Expand Up @@ -66,15 +65,18 @@ param subscriptionId string = subscription().subscriptionId
@sys.description('Optional. The Target Scope for the Policy. The name of the resource group for the policy assignment. If not provided, will use the current scope for deployment.')
param resourceGroupName string = resourceGroup().name


var identityVar = identity == 'SystemAssigned' ? {
type: identity
} : identity == 'UserAssigned' ? {
type: identity
userAssignedIdentities: {
'${userAssignedIdentityId}': {}
}
} : null
var identityVar = identity == 'SystemAssigned'
? {
type: identity
}
: identity == 'UserAssigned'
? {
type: identity
userAssignedIdentities: {
'${userAssignedIdentityId}': {}
}
}
: null

resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = {
name: name
Expand All @@ -94,14 +96,16 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01'
identity: identityVar
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
name: guid(subscriptionId, resourceGroupName, roleDefinitionId, location, name)
properties: {
roleDefinitionId: roleDefinitionId
principalId: policyAssignment.identity.principalId
principalType: 'ServicePrincipal'
resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [
for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
name: guid(subscriptionId, resourceGroupName, roleDefinitionId, location, name)
properties: {
roleDefinitionId: roleDefinitionId
principalId: policyAssignment.identity.principalId
principalType: 'ServicePrincipal'
}
}
}]
]

@sys.description('Policy Assignment Name.')
output name string = policyAssignment.name
Expand Down
37 changes: 21 additions & 16 deletions avm/ptn/authorization/policy-assignment/modules/subscription.bicep
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Policy Assignments (Subscription scope)'
metadata description = 'This module deploys a Policy Assignment at a Subscription scope.'
metadata owner = 'Azure/module-maintainers'

targetScope = 'subscription'

Expand Down Expand Up @@ -63,14 +62,18 @@ param resourceSelectors array = []
@sys.description('Optional. The Target Scope for the Policy. The subscription ID of the subscription for the policy assignment. If not provided, will use the current scope for deployment.')
param subscriptionId string = subscription().subscriptionId

var identityVar = identity == 'SystemAssigned' ? {
type: identity
} : identity == 'UserAssigned' ? {
type: identity
userAssignedIdentities: {
'${userAssignedIdentityId}': {}
}
} : null
var identityVar = identity == 'SystemAssigned'
? {
type: identity
}
: identity == 'UserAssigned'
? {
type: identity
userAssignedIdentities: {
'${userAssignedIdentityId}': {}
}
}
: null

resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = {
name: name
Expand All @@ -90,14 +93,16 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01'
identity: identityVar
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
name: guid(subscriptionId, roleDefinitionId, location, name)
properties: {
roleDefinitionId: roleDefinitionId
principalId: policyAssignment.identity.principalId
principalType: 'ServicePrincipal'
resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [
for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
name: guid(subscriptionId, roleDefinitionId, location, name)
properties: {
roleDefinitionId: roleDefinitionId
principalId: policyAssignment.identity.principalId
principalType: 'ServicePrincipal'
}
}
}]
]

@sys.description('Policy Assignment Name.')
output name string = policyAssignment.name
Expand Down
1 change: 0 additions & 1 deletion avm/ptn/authorization/policy-exemption/main.bicep
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
metadata name = 'Policy Exemptions (All scopes)'
metadata description = 'This module deploys a Policy Exemption at a Management Group, Subscription or Resource Group scope.'
metadata owner = 'Azure/module-maintainers'

targetScope = 'managementGroup'

Expand Down
Loading

0 comments on commit 86ca03b

Please sign in to comment.