Skip to content

Commit

Permalink
Merge branch 'users/alsehr/devApiAndDiag' of https://github.com/Azure…
Browse files Browse the repository at this point in the history
…/ResourceModules into users/alsehr/devApiAndDiag
  • Loading branch information
AlexanderSehr committed Aug 27, 2023
2 parents 5a8431e + 728a639 commit 1c607ce
Show file tree
Hide file tree
Showing 546 changed files with 9,487 additions and 7,610 deletions.
108 changes: 54 additions & 54 deletions modules/aad/domain-service/.test/common/dependencies.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -17,75 +17,75 @@ var certPWSecretName = 'pfxCertificatePassword'
var certSecretName = 'pfxBase64Certificate'
var addressPrefix = '10.0.0.0/16'

resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = {
name: virtualNetworkName
location: location
properties: {
addressSpace: {
addressPrefixes: [
addressPrefix
]
}
subnets: [
{
name: 'defaultSubnet'
properties: {
addressPrefix: addressPrefix
}
}
]
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
name: virtualNetworkName
location: location
properties: {
addressSpace: {
addressPrefixes: [
addressPrefix
]
}
subnets: [
{
name: 'defaultSubnet'
properties: {
addressPrefix: addressPrefix
}
}
]
}
}

resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
name: keyVaultName
location: location
properties: {
sku: {
family: 'A'
name: 'standard'
}
tenantId: tenant().tenantId
enablePurgeProtection: null
enabledForTemplateDeployment: true
enabledForDiskEncryption: true
enabledForDeployment: true
enableRbacAuthorization: true
accessPolicies: []
name: keyVaultName
location: location
properties: {
sku: {
family: 'A'
name: 'standard'
}
tenantId: tenant().tenantId
enablePurgeProtection: null
enabledForTemplateDeployment: true
enabledForDiskEncryption: true
enabledForDeployment: true
enableRbacAuthorization: true
accessPolicies: []
}
}

resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
name: managedIdentityName
location: location
name: managedIdentityName
location: location
}

resource keyPermissions 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid('msi-${managedIdentity.name}-KeyVault-Admin-RoleAssignment')
scope: keyVault
properties: {
principalId: managedIdentity.properties.principalId
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483') // Key Vault Administrator
principalType: 'ServicePrincipal'
}
name: guid('msi-${managedIdentity.name}-KeyVault-Admin-RoleAssignment')
scope: keyVault
properties: {
principalId: managedIdentity.properties.principalId
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '00482a5a-887f-4fb3-b363-3b7fe8e74483') // Key Vault Administrator
principalType: 'ServicePrincipal'
}
}

resource certDeploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
name: certDeploymentScriptName
location: location
kind: 'AzurePowerShell'
identity: {
type: 'UserAssigned'
userAssignedIdentities: {
'${managedIdentity.id}': {}
}
}
properties: {
azPowerShellVersion: '3.0'
retentionInterval: 'P1D'
arguments: ' -KeyVaultName "${keyVault.name}" -ResourceGroupName "${resourceGroup().name}" -CertPWSecretName "${certPWSecretName}" -CertSecretName "${certSecretName}"'
scriptContent: loadTextContent('../../../../.shared/.scripts/Set-PfxCertificateInKeyVault.ps1')
name: certDeploymentScriptName
location: location
kind: 'AzurePowerShell'
identity: {
type: 'UserAssigned'
userAssignedIdentities: {
'${managedIdentity.id}': {}
}
}
properties: {
azPowerShellVersion: '3.0'
retentionInterval: 'P1D'
arguments: ' -KeyVaultName "${keyVault.name}" -ResourceGroupName "${resourceGroup().name}" -CertPWSecretName "${certPWSecretName}" -CertSecretName "${certSecretName}"'
scriptContent: loadTextContent('../../../../.shared/.scripts/Set-PfxCertificateInKeyVault.ps1')
}
}

@description('The resource ID of the created Virtual Network Subnet.')
Expand Down
23 changes: 13 additions & 10 deletions modules/aad/domain-service/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "7212864402192809754"
}
"version": "0.20.4.51522",
"templateHash": "12721378436248791893"
},
"name": "Azure Active Directory Domain Services",
"description": "This module deploys an Azure Active Directory Domain Services (AADDS).",
"owner": "Azure/module-maintainers"
},
"parameters": {
"name": {
Expand Down Expand Up @@ -235,8 +238,8 @@
"diagnosticLogsRetentionInDays": {
"type": "int",
"defaultValue": 365,
"maxValue": 365,
"minValue": 0,
"maxValue": 365,
"metadata": {
"description": "Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely."
}
Expand All @@ -251,14 +254,14 @@
"lock": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. Specify the type of lock."
},
"allowedValues": [
"",
"CanNotDelete",
"ReadOnly"
]
],
"metadata": {
"description": "Optional. Specify the type of lock."
}
},
"roleAssignments": {
"type": "array",
Expand Down Expand Up @@ -420,8 +423,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "1835196590744677033"
"version": "0.20.4.51522",
"templateHash": "1057451730185252367"
}
},
"parameters": {
Expand Down
23 changes: 13 additions & 10 deletions modules/analysis-services/server/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "9546583248614187167"
}
"version": "0.20.4.51522",
"templateHash": "430189201191579276"
},
"name": "Analysis Services Servers",
"description": "This module deploys an Analysis Services Server.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"name": {
Expand Down Expand Up @@ -55,8 +58,8 @@
"diagnosticLogsRetentionInDays": {
"type": "int",
"defaultValue": 365,
"maxValue": 365,
"minValue": 0,
"maxValue": 365,
"metadata": {
"description": "Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely."
}
Expand Down Expand Up @@ -92,14 +95,14 @@
"lock": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. Specify the type of lock."
},
"allowedValues": [
"",
"CanNotDelete",
"ReadOnly"
]
],
"metadata": {
"description": "Optional. Specify the type of lock."
}
},
"roleAssignments": {
"type": "array",
Expand Down Expand Up @@ -282,8 +285,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "11608096580745695876"
"version": "0.20.4.51522",
"templateHash": "15590714007425491246"
}
},
"parameters": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/api-version-set/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "5488393470456105245"
}
"version": "0.20.4.51522",
"templateHash": "9352626903654043411"
},
"name": "API Management Service API Version Sets",
"description": "This module deploys an API Management Service API Version Set.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
18 changes: 12 additions & 6 deletions modules/api-management/service/api/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "2877903221973830932"
}
"version": "0.20.4.51522",
"templateHash": "9074052005199170712"
},
"name": "API Management Service APIs",
"description": "This module deploys an API Management Service API.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"name": {
Expand Down Expand Up @@ -281,9 +284,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "14535247884365099462"
}
"version": "0.20.4.51522",
"templateHash": "5031714372762112092"
},
"name": "API Management Service APIs Policies",
"description": "This module deploys an API Management Service API Policy.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/api/policy/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "14535247884365099462"
}
"version": "0.20.4.51522",
"templateHash": "5031714372762112092"
},
"name": "API Management Service APIs Policies",
"description": "This module deploys an API Management Service API Policy.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/authorization-server/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "16113108844531678160"
}
"version": "0.20.4.51522",
"templateHash": "8155815469027179886"
},
"name": "API Management Service Authorization Servers",
"description": "This module deploys an API Management Service Authorization Server.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"name": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/backend/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "10485477109069205796"
}
"version": "0.20.4.51522",
"templateHash": "1669725941639871055"
},
"name": "API Management Service Backends",
"description": "This module deploys an API Management Service Backend.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/cache/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "14901031265236109470"
}
"version": "0.20.4.51522",
"templateHash": "17031319637382778576"
},
"name": "API Management Service Caches",
"description": "This module deploys an API Management Service Cache.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
9 changes: 6 additions & 3 deletions modules/api-management/service/identity-provider/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.19.5.34762",
"templateHash": "5110602870020980101"
}
"version": "0.20.4.51522",
"templateHash": "17041253664250888675"
},
"name": "API Management Service Identity Providers",
"description": "This module deploys an API Management Service Identity Provider.",
"owner": "Azure/module-maintainers"
},
"parameters": {
"apiManagementServiceName": {
Expand Down
Loading

0 comments on commit 1c607ce

Please sign in to comment.