Skip to content

Commit 418f462

Browse files
brwilkinsonbrwilkinson
committed
update vnet output add some bicepparam
1 parent e17f6d9 commit 418f462

12 files changed

+3407
-1879
lines changed

‎ADF/tenants/AKS/ACU1.D1.parameters.json renamed to ‎ADF/0-archive/aks/ACU1.D1.parameters.json

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

‎ADF/tenants/AKS/AEU1.D2.parameters.json renamed to ‎ADF/0-archive/aks/AEU1.D2.parameters.json

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

‎ADF/bicep/01-ALL-RG.bicep

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -285,58 +285,58 @@ module dp_Deployment_DNSResolver 'DNSResolver.bicep' = if (bool(Stage.?DNSResolv
285285
]
286286
}
287287

288-
/*
289-
module dp_Deployment_CloudTestAccount 'CloudTestAccount.bicep' = if (bool(Stage.?CloudTestAccount ?? 0)) {
290-
name: 'dp${Deployment}-CloudTestAccount'
291-
params: {
292-
// move these to Splatting later
293-
DeploymentID: DeploymentID
294-
DeploymentInfo: DeploymentInfo
295-
Environment: Environment
296-
Extensions: Extensions
297-
Global: Global
298-
Prefix: Prefix
299-
Stage: Stage
300-
}
301-
dependsOn: [
302-
dp_Deployment_VNET
303-
]
304-
}
288+
// /*
289+
// module dp_Deployment_CloudTestAccount 'CloudTestAccount.bicep' = if (bool(Stage.?CloudTestAccount ?? 0)) {
290+
// name: 'dp${Deployment}-CloudTestAccount'
291+
// params: {
292+
// // move these to Splatting later
293+
// DeploymentID: DeploymentID
294+
// DeploymentInfo: DeploymentInfo
295+
// Environment: Environment
296+
// Extensions: Extensions
297+
// Global: Global
298+
// Prefix: Prefix
299+
// Stage: Stage
300+
// }
301+
// dependsOn: [
302+
// dp_Deployment_VNET
303+
// ]
304+
// }
305305

306-
module dp_Deployment_CloudTestImages 'CloudTestImage.bicep' = if (bool(Stage.?CloudTestImages ?? 0)) {
307-
name: 'dp${Deployment}-CloudTestImages'
308-
params: {
309-
// move these to Splatting later
310-
DeploymentID: DeploymentID
311-
DeploymentInfo: DeploymentInfo
312-
Environment: Environment
313-
Extensions: Extensions
314-
Global: Global
315-
Prefix: Prefix
316-
Stage: Stage
317-
}
318-
dependsOn: [
319-
dp_Deployment_VNET
320-
]
321-
}
306+
// module dp_Deployment_CloudTestImages 'CloudTestImage.bicep' = if (bool(Stage.?CloudTestImages ?? 0)) {
307+
// name: 'dp${Deployment}-CloudTestImages'
308+
// params: {
309+
// // move these to Splatting later
310+
// DeploymentID: DeploymentID
311+
// DeploymentInfo: DeploymentInfo
312+
// Environment: Environment
313+
// Extensions: Extensions
314+
// Global: Global
315+
// Prefix: Prefix
316+
// Stage: Stage
317+
// }
318+
// dependsOn: [
319+
// dp_Deployment_VNET
320+
// ]
321+
// }
322322

323-
module dp_Deployment_CloudTestHostedPool 'CloudTestDevOpsPool.bicep' = if (bool(Stage.?CloudTestHostedPool ?? 0)) {
324-
name: 'dp${Deployment}-CloudTestHostedPool'
325-
params: {
326-
// move these to Splatting later
327-
DeploymentID: DeploymentID
328-
DeploymentInfo: DeploymentInfo
329-
Environment: Environment
330-
Extensions: Extensions
331-
Global: Global
332-
Prefix: Prefix
333-
Stage: Stage
334-
}
335-
dependsOn: [
336-
dp_Deployment_VNET
337-
]
338-
}
339-
*/
323+
// module dp_Deployment_CloudTestHostedPool 'CloudTestDevOpsPool.bicep' = if (bool(Stage.?CloudTestHostedPool ?? 0)) {
324+
// name: 'dp${Deployment}-CloudTestHostedPool'
325+
// params: {
326+
// // move these to Splatting later
327+
// DeploymentID: DeploymentID
328+
// DeploymentInfo: DeploymentInfo
329+
// Environment: Environment
330+
// Extensions: Extensions
331+
// Global: Global
332+
// Prefix: Prefix
333+
// Stage: Stage
334+
// }
335+
// dependsOn: [
336+
// dp_Deployment_VNET
337+
// ]
338+
// }
339+
// */
340340

341341
module dp_Deployment_KV 'KV.bicep' = if (bool(Stage.KV)) {
342342
name: 'dp${Deployment}-KV'
@@ -590,26 +590,26 @@ module dp_Deployment_SFM 'SFM.bicep' = if (bool(Stage.?SFM ?? 0)) {
590590
]
591591
}
592592

593-
module dp_Deployment_SFMNP 'SFMNP.bicep' = if (bool(Stage.?SFMNP ?? 0)) {
594-
name: 'dp${Deployment}-SFMNP'
595-
params: {
596-
// move these to Splatting later
597-
DeploymentID: DeploymentID
598-
DeploymentInfo: DeploymentInfo
599-
Environment: Environment
600-
Extensions: Extensions
601-
Global: Global
602-
Prefix: Prefix
603-
Stage: Stage
604-
}
605-
dependsOn: [
606-
dp_Deployment_VNET
607-
dp_Deployment_DNSResolver
608-
dp_Deployment_LB
609-
dp_Deployment_SFM
610-
dp_Deployment_APPCONFIG
611-
]
612-
}
593+
// module dp_Deployment_SFMNP 'SFMNP.bicep' = if (bool(Stage.?SFMNP ?? 0)) {
594+
// name: 'dp${Deployment}-SFMNP'
595+
// params: {
596+
// // move these to Splatting later
597+
// DeploymentID: DeploymentID
598+
// DeploymentInfo: DeploymentInfo
599+
// Environment: Environment
600+
// Extensions: Extensions
601+
// Global: Global
602+
// Prefix: Prefix
603+
// Stage: Stage
604+
// }
605+
// dependsOn: [
606+
// dp_Deployment_VNET
607+
// dp_Deployment_DNSResolver
608+
// dp_Deployment_LB
609+
// dp_Deployment_SFM
610+
// dp_Deployment_APPCONFIG
611+
// ]
612+
// }
613613

614614
module dp_Deployment_KVCert 'KVCertificate.bicep' = if (bool(Stage.?KVCert ?? 0)) {
615615
name: 'dp${Deployment}-KVCertificate'

‎ADF/bicep/SA-Storage.bicep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ var fileShares = contains(storageInfo, 'fileShares') ? storageInfo.fileShares :
4747
var containers = contains(storageInfo, 'containers') ? storageInfo.containers : []
4848

4949
resource SA 'Microsoft.Storage/storageAccounts@2021-09-01' = {
50+
#disable-next-line BCP334
5051
name: toLower('${DeploymentURI}sa${storageInfo.name}')
5152
location: resourceGroup().location
5253
sku: {

‎ADF/bicep/VNET.bicep

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ resource VNETDiagnostics 'microsoft.insights/diagnosticSettings@2017-05-01-previ
123123
}
124124
dependsOn: [
125125
VNETAll
126+
VNET
126127
]
127128
}
128129

@@ -145,6 +146,7 @@ resource VNETPeering 'Microsoft.Network/virtualNetworks/virtualNetworkPeerings@2
145146
}
146147
dependsOn: [
147148
VNETAll
149+
VNETDiagnostics
148150
]
149151
}
150152

@@ -160,8 +162,9 @@ module VNETPeeringHUB 'VNET-Peering.bicep' = if (bool(Stage.VNetPeering)) {
160162
}
161163
dependsOn: [
162164
VNETAll
165+
VNETPeering
163166
]
164167
}
165168

166169
output VNetID array = addressPrefixes
167-
output subnetIdArray array = [for (item, index) in SubnetInfo: VNET.properties.subnets[index].id]
170+
// output subnetIdArray array = [for (item, index) in SubnetInfo: VNET.properties.subnets[index].id]

‎ADF/bicep/bicepconfig.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"experimentalFeaturesEnabled": {
3-
// "paramsFiles": false, // now GA
4-
// "extensibility": true,
5-
// "resourceTypedParamsAndOutputs": false,
6-
// "userDefinedTypes": false,
7-
// "symbolicNameCodegen": true
3+
"extensibility": true,
4+
"compileTimeImports": true,
5+
"symbolicNameCodegen": true,
6+
"userDefinedFunctions": true,
7+
"resourceTypedParamsAndOutputs": true,
8+
"prettyPrinting": true
89
},
910
"analyzers": {
1011
"core": {

‎ADF/bicep/x.RBAC-ALL-RA-Resource.bicep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ param roledescription string = '' // leave these for logging in the portal
2222
// var resourceid = join(string(segment)), '","', ''), '["', ''), '"]', '') // currently no join() method
2323
// // ----------------------------------------------
2424

25+
#disable-next-line no-deployments-resources
2526
resource ResourceRoleAssignment 'Microsoft.Resources/deployments@2021-04-01' = {
2627
name: take('dp-RRA-${description}-${last(split(resourceId,'/'))}',64)
2728
properties: {

‎ADF/release-az/ADOHelper.psm1

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
<#
12
#requires -Modules Az.Accounts,Az.KeyVault,Az.ServiceFabric
3+
#>
24

35
function validateTenant
46
{
@@ -393,9 +395,11 @@ function Set-ADOSFMServiceConnection
393395

394396
function Set-ADOAZServiceConnection
395397
{
396-
#Requires -Module Microsoft.Graph.Applications
397-
#Requires -Module Microsoft.Graph.Authentication
398-
#Requires -Module AZ.Accounts
398+
<#
399+
# Requires -Module Microsoft.Graph.Applications
400+
# Requires -Module Microsoft.Graph.Authentication
401+
# Requires -Module AZ.Accounts
402+
#>
399403

400404
param (
401405
[ValidateSet('ACU1', 'AEU2', 'AEU1', 'AWCU')]
@@ -726,10 +730,11 @@ function Set-ADOServiceConnectionAdmin
726730

727731
function New-ADOAZServiceConnection
728732
{
733+
<#
729734
#Requires -Module Microsoft.Graph.Applications
730735
#Requires -Module Microsoft.Graph.Authentication
731736
#Requires -Module AZ.Accounts
732-
737+
#>
733738
<#
734739
.SYNOPSIS
735740
Generate a new AZ Service Connection

‎ADF/tenants/AKS/ACU1.D1.ado-pipelines-All.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ trigger: none
44
# include: [ main ]
55
# paths:
66
# include:
7-
# - ADF/tenants/AKS/ACU1.D1.parameters.json
7+
# - ADF/tenants/AKS/ACU1.D1.bicepparam
88
# - ADF/tenants/AKS/ACU1.D1.ado-pipelines-All.yml
99

1010
variables:

0 commit comments

Comments
 (0)