Skip to content

Commit ed5e62c

Browse files
fix: Watnings fixed and added comments
1 parent f2559c3 commit ed5e62c

File tree

10 files changed

+243
-368
lines changed

10 files changed

+243
-368
lines changed

infra/main.bicep

Lines changed: 145 additions & 79 deletions
Large diffs are not rendered by default.

infra/main.json

Lines changed: 73 additions & 206 deletions
Large diffs are not rendered by default.

infra/modules/core/security/keyvault.bicep

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ param subnetResourceId string = 'null'
3535
@description('Conditional. Resource ID of the Private DNS Zone. Required if enablePrivateNetworking is true.')
3636
param privateDnsZoneResourceId string = ''
3737

38-
@description('Conditional. Module output contract supplying the Private DNS Zone. Required if enablePrivateNetworking is true.')
39-
param avmPrivateDnsZone object = {}
40-
4138
@description('Optional. Object ID (principalId) of an additional principal to assign Key Vault Secrets User role.')
4239
param principalId string = ''
4340

infra/modules/document-db/database-account/main.bicep

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@ param maxStalenessPrefix int = 100000
6464
@description('Optional. The maximum lag time in minutes. Required for "BoundedStaleness" consistency level. Valid ranges, Single Region: 5 to 84600. Multi Region: 300 to 86400. Defaults to 300.')
6565
param maxIntervalInSeconds int = 300
6666

67-
@description('Optional. Specifies the MongoDB server version to use if using Azure Cosmos DB for MongoDB RU. Defaults to "4.2".')
68-
@allowed([
69-
'3.2'
70-
'3.6'
71-
'4.0'
72-
'4.2'
73-
'5.0'
74-
'6.0'
75-
'7.0'
76-
])
77-
param serverVersion string = '4.2'
78-
7967
@description('Optional. Configuration for databases when using Azure Cosmos DB for NoSQL.')
8068
param sqlDatabases sqlDatabaseType[]?
8169

@@ -89,16 +77,9 @@ import { lockType } from 'br/public:avm/utl/types/avm-common-types:0.6.0'
8977
@description('Optional. The lock settings of the service.')
9078
param lock lockType?
9179

92-
import { roleAssignmentType } from 'br/public:avm/utl/types/avm-common-types:0.5.1'
93-
@description('Optional. An array of control plane Azure role-based access control assignments.')
94-
param roleAssignments roleAssignmentType[]?
95-
9680
@description('Optional. Configurations for Azure Cosmos DB for NoSQL native role-based access control definitions. Allows the creations of custom role definitions.')
9781
param dataPlaneRoleDefinitions dataPlaneRoleDefinitionType[]?
9882

99-
@description('Optional. Configurations for Azure Cosmos DB for NoSQL native role-based access control assignments.')
100-
param dataPlaneRoleAssignments dataPlaneRoleAssignmentType[]?
101-
10283
import { diagnosticSettingFullType } from 'br/public:avm/utl/types/avm-common-types:0.5.1'
10384
@description('Optional. The diagnostic settings for the service.')
10485
param diagnosticSettings diagnosticSettingFullType[]?
@@ -184,40 +165,6 @@ var identity = !empty(managedIdentities)
184165
}
185166
: null
186167

187-
var builtInControlPlaneRoleNames = {
188-
Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
189-
'Cosmos DB Account Reader Role': subscriptionResourceId(
190-
'Microsoft.Authorization/roleDefinitions',
191-
'fbdf93bf-df7d-467e-a4d2-9458aa1360c8'
192-
)
193-
'Cosmos DB Operator': subscriptionResourceId(
194-
'Microsoft.Authorization/roleDefinitions',
195-
'230815da-be43-4aae-9cb4-875f7bd000aa'
196-
)
197-
CosmosBackupOperator: subscriptionResourceId(
198-
'Microsoft.Authorization/roleDefinitions',
199-
'db7b14f2-5adf-42da-9f96-f2ee17bab5cb'
200-
)
201-
CosmosRestoreOperator: subscriptionResourceId(
202-
'Microsoft.Authorization/roleDefinitions',
203-
'5432c526-bc82-444a-b7ba-57c5b0b5b34f'
204-
)
205-
'DocumentDB Account Contributor': subscriptionResourceId(
206-
'Microsoft.Authorization/roleDefinitions',
207-
'5bd9cd88-fe45-4216-938b-f97437e15450'
208-
)
209-
Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')
210-
Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
211-
'Role Based Access Control Administrator': subscriptionResourceId(
212-
'Microsoft.Authorization/roleDefinitions',
213-
'f58310d9-a9f6-439a-9e8d-f62e7b41a168'
214-
)
215-
'User Access Administrator': subscriptionResourceId(
216-
'Microsoft.Authorization/roleDefinitions',
217-
'18d7d88d-d35e-4fb5-a5c3-7773c20a72d9'
218-
)
219-
}
220-
221168
#disable-next-line no-deployments-resources
222169
resource avmTelemetry 'Microsoft.Resources/deployments@2024-07-01' = if (enableTelemetry) {
223170
name: '46d3xbcp.res.documentdb-databaseaccount.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'

infra/modules/machine-learning-services/workspace/main.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-10-01-prev
272272
keyVaultProperties: {
273273
keyVaultArmId: cMKKeyVault.id
274274
keyIdentifier: !empty(customerManagedKey.?keyVersion ?? '')
275-
? '${cMKKeyVault::cMKKey.properties.keyUri}/${customerManagedKey!.keyVersion}'
276-
: cMKKeyVault::cMKKey.properties.keyUriWithVersion
275+
? '${cMKKeyVault::cMKKey!.properties.keyUri}/${customerManagedKey!.keyVersion}'
276+
: cMKKeyVault::cMKKey!.properties.keyUriWithVersion
277277
}
278278
}
279279
: null

infra/modules/network/bastionHost.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { subnetType } from 'virtualNetwork.bicep'
2727
@description('Optional. Subnet configuration for the Jumpbox VM.')
2828
param subnet subnetType?
2929

30-
// 1. Create AzureBastionSubnet NSG
30+
// 1. Create AzureBastionSubnet NSG
3131
// using AVM Network Security Group module
3232
// https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/network/network-security-group
3333
module nsg 'br/public:avm/res/network/network-security-group:0.5.1' = if (!empty(subnet)) {
@@ -49,7 +49,7 @@ module bastionSubnet 'br/public:avm/res/network/virtual-network/subnet:0.1.2' =
4949
virtualNetworkName: vnetName
5050
name: 'AzureBastionSubnet' // this name required as is for Azure Bastion Host subnet
5151
addressPrefixes: subnet.?addressPrefixes
52-
networkSecurityGroupResourceId: nsg.outputs.resourceId
52+
networkSecurityGroupResourceId: nsg!.outputs.resourceId
5353
enableTelemetry: enableTelemetry
5454
}
5555
}
@@ -90,8 +90,8 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.6.1' = {
9090

9191
output resourceId string = bastionHost.outputs.resourceId
9292
output name string = bastionHost.outputs.name
93-
output subnetId string = bastionSubnet.outputs.resourceId
94-
output subnetName string = bastionSubnet.outputs.name
93+
output subnetId string = bastionSubnet!.outputs.resourceId
94+
output subnetName string = bastionSubnet!.outputs.name
9595

9696
@export()
9797
@description('Custom type definition for establishing Bastion Host for remote connection.')

infra/modules/network/jumpbox.bicep

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module subnetResource 'br/public:avm/res/network/virtual-network/subnet:0.1.2' =
5757
virtualNetworkName: vnetName
5858
name: subnet.?name ?? ''
5959
addressPrefixes: subnet.?addressPrefixes
60-
networkSecurityGroupResourceId: nsg.outputs.resourceId
60+
networkSecurityGroupResourceId: nsg!.outputs.resourceId
6161
enableTelemetry: enableTelemetry
6262
}
6363
}
@@ -97,10 +97,10 @@ module vm '../compute/virtual-machine/main.bicep' = {
9797
ipConfigurations: [
9898
{
9999
name: 'ipconfig1'
100-
subnetResourceId: subnetResource.outputs.resourceId
100+
subnetResourceId: subnetResource!.outputs.resourceId
101101
}
102102
]
103-
networkSecurityGroupResourceId: nsg.outputs.resourceId
103+
networkSecurityGroupResourceId: nsg!.outputs.resourceId
104104
diagnosticSettings: [
105105
{
106106
name: 'jumpboxDiagnostics'
@@ -129,10 +129,10 @@ output resourceId string = vm.outputs.resourceId
129129
output name string = vm.outputs.name
130130
output location string = vm.outputs.location
131131

132-
output subnetId string = subnetResource.outputs.resourceId
133-
output subnetName string = subnetResource.outputs.name
134-
output nsgId string = nsg.outputs.resourceId
135-
output nsgName string = nsg.outputs.name
132+
output subnetId string = subnetResource!.outputs.resourceId
133+
output subnetName string = subnetResource!.outputs.name
134+
output nsgId string = nsg!.outputs.resourceId
135+
output nsgName string = nsg!.outputs.name
136136

137137
@export()
138138
@description('Custom type definition for establishing Jumpbox Virtual Machine and its associated resources.')

infra/modules/network/main.bicep

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ output vnetResourceId string = virtualNetwork.outputs.resourceId
9292
import { subnetOutputType } from 'virtualNetwork.bicep'
9393
output subnets subnetOutputType[] = virtualNetwork.outputs.subnets // This one holds critical info for subnets, including NSGs
9494

95-
output bastionSubnetId string = bastionHost.outputs.subnetId
96-
output bastionSubnetName string = bastionHost.outputs.subnetName
97-
output bastionHostId string = bastionHost.outputs.resourceId
98-
output bastionHostName string = bastionHost.outputs.name
99-
100-
output jumpboxSubnetName string = jumpbox.outputs.subnetName
101-
output jumpboxSubnetId string = jumpbox.outputs.subnetId
102-
output jumpboxName string = jumpbox.outputs.name
103-
output jumpboxResourceId string = jumpbox.outputs.resourceId
95+
output bastionSubnetId string = bastionHost!.outputs.subnetId
96+
output bastionSubnetName string = bastionHost!.outputs.subnetName
97+
output bastionHostId string = bastionHost!.outputs.resourceId
98+
output bastionHostName string = bastionHost!.outputs.name
99+
100+
output jumpboxSubnetName string = jumpbox!.outputs.subnetName
101+
output jumpboxSubnetId string = jumpbox!.outputs.subnetId
102+
output jumpboxName string = jumpbox!.outputs.name
103+
output jumpboxResourceId string = jumpbox!.outputs.resourceId

infra/modules/network/private-dns-zone/main.bicep

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ param enableTelemetry bool = true
7777
// })
7878
// ]
7979

80-
var enableReferencedModulesTelemetry = false
81-
8280
#disable-next-line no-deployments-resources
8381
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
8482
name: '46d3xbcp.res.network-privatednszone.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'

infra/modules/network/virtualNetwork.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ param logAnalyticsWorkspaceId string
2222
@description('Optional. Enable/Disable usage telemetry for module.')
2323
param enableTelemetry bool = true
2424

25-
// 1. Create NSGs for subnets
25+
// 1. Create NSGs for subnets
2626
// using AVM Network Security Group module
2727
// https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/network/network-security-group
2828

@@ -54,7 +54,7 @@ module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.0' = {
5454
for (subnet, i) in subnets: {
5555
name: subnet.name
5656
addressPrefixes: subnet.?addressPrefixes
57-
networkSecurityGroupResourceId: !empty(subnet.?networkSecurityGroup) ? nsgs[i].outputs.resourceId : null
57+
networkSecurityGroupResourceId: !empty(subnet.?networkSecurityGroup) ? nsgs[i]!.outputs.resourceId : null
5858
privateEndpointNetworkPolicies: subnet.?privateEndpointNetworkPolicies
5959
privateLinkServiceNetworkPolicies: subnet.?privateLinkServiceNetworkPolicies
6060
delegation: subnet.?delegation
@@ -92,7 +92,7 @@ output subnets subnetOutputType[] = [
9292
name: subnet.name
9393
resourceId: virtualNetwork.outputs.subnetResourceIds[i]
9494
nsgName: !empty(subnet.?networkSecurityGroup) ? subnet.?networkSecurityGroup.name : null
95-
nsgResourceId: !empty(subnet.?networkSecurityGroup) ? nsgs[i].outputs.resourceId : null
95+
nsgResourceId: !empty(subnet.?networkSecurityGroup) ? nsgs[i]!.outputs.resourceId : null
9696
}
9797
]
9898

0 commit comments

Comments
 (0)