Skip to content

Commit

Permalink
update vnet output add some bicepparam
Browse files Browse the repository at this point in the history
  • Loading branch information
brwilkinson committed May 18, 2024
1 parent e17f6d9 commit 418f462
Show file tree
Hide file tree
Showing 12 changed files with 3,407 additions and 1,879 deletions.

Large diffs are not rendered by default.

2,154 changes: 1,077 additions & 1,077 deletions ADF/tenants/AKS/AEU1.D2.parameters.json → ADF/0-archive/aks/AEU1.D2.parameters.json

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions ADF/bicep/01-ALL-RG.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -285,58 +285,58 @@ module dp_Deployment_DNSResolver 'DNSResolver.bicep' = if (bool(Stage.?DNSResolv
]
}

/*
module dp_Deployment_CloudTestAccount 'CloudTestAccount.bicep' = if (bool(Stage.?CloudTestAccount ?? 0)) {
name: 'dp${Deployment}-CloudTestAccount'
params: {
// move these to Splatting later
DeploymentID: DeploymentID
DeploymentInfo: DeploymentInfo
Environment: Environment
Extensions: Extensions
Global: Global
Prefix: Prefix
Stage: Stage
}
dependsOn: [
dp_Deployment_VNET
]
}
// /*
// module dp_Deployment_CloudTestAccount 'CloudTestAccount.bicep' = if (bool(Stage.?CloudTestAccount ?? 0)) {
// name: 'dp${Deployment}-CloudTestAccount'
// params: {
// // move these to Splatting later
// DeploymentID: DeploymentID
// DeploymentInfo: DeploymentInfo
// Environment: Environment
// Extensions: Extensions
// Global: Global
// Prefix: Prefix
// Stage: Stage
// }
// dependsOn: [
// dp_Deployment_VNET
// ]
// }

module dp_Deployment_CloudTestImages 'CloudTestImage.bicep' = if (bool(Stage.?CloudTestImages ?? 0)) {
name: 'dp${Deployment}-CloudTestImages'
params: {
// move these to Splatting later
DeploymentID: DeploymentID
DeploymentInfo: DeploymentInfo
Environment: Environment
Extensions: Extensions
Global: Global
Prefix: Prefix
Stage: Stage
}
dependsOn: [
dp_Deployment_VNET
]
}
// module dp_Deployment_CloudTestImages 'CloudTestImage.bicep' = if (bool(Stage.?CloudTestImages ?? 0)) {
// name: 'dp${Deployment}-CloudTestImages'
// params: {
// // move these to Splatting later
// DeploymentID: DeploymentID
// DeploymentInfo: DeploymentInfo
// Environment: Environment
// Extensions: Extensions
// Global: Global
// Prefix: Prefix
// Stage: Stage
// }
// dependsOn: [
// dp_Deployment_VNET
// ]
// }

module dp_Deployment_CloudTestHostedPool 'CloudTestDevOpsPool.bicep' = if (bool(Stage.?CloudTestHostedPool ?? 0)) {
name: 'dp${Deployment}-CloudTestHostedPool'
params: {
// move these to Splatting later
DeploymentID: DeploymentID
DeploymentInfo: DeploymentInfo
Environment: Environment
Extensions: Extensions
Global: Global
Prefix: Prefix
Stage: Stage
}
dependsOn: [
dp_Deployment_VNET
]
}
*/
// module dp_Deployment_CloudTestHostedPool 'CloudTestDevOpsPool.bicep' = if (bool(Stage.?CloudTestHostedPool ?? 0)) {
// name: 'dp${Deployment}-CloudTestHostedPool'
// params: {
// // move these to Splatting later
// DeploymentID: DeploymentID
// DeploymentInfo: DeploymentInfo
// Environment: Environment
// Extensions: Extensions
// Global: Global
// Prefix: Prefix
// Stage: Stage
// }
// dependsOn: [
// dp_Deployment_VNET
// ]
// }
// */

module dp_Deployment_KV 'KV.bicep' = if (bool(Stage.KV)) {
name: 'dp${Deployment}-KV'
Expand Down Expand Up @@ -590,26 +590,26 @@ module dp_Deployment_SFM 'SFM.bicep' = if (bool(Stage.?SFM ?? 0)) {
]
}

module dp_Deployment_SFMNP 'SFMNP.bicep' = if (bool(Stage.?SFMNP ?? 0)) {
name: 'dp${Deployment}-SFMNP'
params: {
// move these to Splatting later
DeploymentID: DeploymentID
DeploymentInfo: DeploymentInfo
Environment: Environment
Extensions: Extensions
Global: Global
Prefix: Prefix
Stage: Stage
}
dependsOn: [
dp_Deployment_VNET
dp_Deployment_DNSResolver
dp_Deployment_LB
dp_Deployment_SFM
dp_Deployment_APPCONFIG
]
}
// module dp_Deployment_SFMNP 'SFMNP.bicep' = if (bool(Stage.?SFMNP ?? 0)) {
// name: 'dp${Deployment}-SFMNP'
// params: {
// // move these to Splatting later
// DeploymentID: DeploymentID
// DeploymentInfo: DeploymentInfo
// Environment: Environment
// Extensions: Extensions
// Global: Global
// Prefix: Prefix
// Stage: Stage
// }
// dependsOn: [
// dp_Deployment_VNET
// dp_Deployment_DNSResolver
// dp_Deployment_LB
// dp_Deployment_SFM
// dp_Deployment_APPCONFIG
// ]
// }

module dp_Deployment_KVCert 'KVCertificate.bicep' = if (bool(Stage.?KVCert ?? 0)) {
name: 'dp${Deployment}-KVCertificate'
Expand Down
1 change: 1 addition & 0 deletions ADF/bicep/SA-Storage.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var fileShares = contains(storageInfo, 'fileShares') ? storageInfo.fileShares :
var containers = contains(storageInfo, 'containers') ? storageInfo.containers : []

resource SA 'Microsoft.Storage/storageAccounts@2021-09-01' = {
#disable-next-line BCP334
name: toLower('${DeploymentURI}sa${storageInfo.name}')
location: resourceGroup().location
sku: {
Expand Down
5 changes: 4 additions & 1 deletion ADF/bicep/VNET.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ resource VNETDiagnostics 'microsoft.insights/diagnosticSettings@2017-05-01-previ
}
dependsOn: [
VNETAll
VNET
]
}

Expand All @@ -145,6 +146,7 @@ resource VNETPeering 'Microsoft.Network/virtualNetworks/virtualNetworkPeerings@2
}
dependsOn: [
VNETAll
VNETDiagnostics
]
}

Expand All @@ -160,8 +162,9 @@ module VNETPeeringHUB 'VNET-Peering.bicep' = if (bool(Stage.VNetPeering)) {
}
dependsOn: [
VNETAll
VNETPeering
]
}

output VNetID array = addressPrefixes
output subnetIdArray array = [for (item, index) in SubnetInfo: VNET.properties.subnets[index].id]
// output subnetIdArray array = [for (item, index) in SubnetInfo: VNET.properties.subnets[index].id]
11 changes: 6 additions & 5 deletions ADF/bicep/bicepconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"experimentalFeaturesEnabled": {
// "paramsFiles": false, // now GA
// "extensibility": true,
// "resourceTypedParamsAndOutputs": false,
// "userDefinedTypes": false,
// "symbolicNameCodegen": true
"extensibility": true,
"compileTimeImports": true,
"symbolicNameCodegen": true,
"userDefinedFunctions": true,
"resourceTypedParamsAndOutputs": true,
"prettyPrinting": true
},
"analyzers": {
"core": {
Expand Down
1 change: 1 addition & 0 deletions ADF/bicep/x.RBAC-ALL-RA-Resource.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ param roledescription string = '' // leave these for logging in the portal
// var resourceid = join(string(segment)), '","', ''), '["', ''), '"]', '') // currently no join() method
// // ----------------------------------------------

#disable-next-line no-deployments-resources
resource ResourceRoleAssignment 'Microsoft.Resources/deployments@2021-04-01' = {
name: take('dp-RRA-${description}-${last(split(resourceId,'/'))}',64)
properties: {
Expand Down
13 changes: 9 additions & 4 deletions ADF/release-az/ADOHelper.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<#
#requires -Modules Az.Accounts,Az.KeyVault,Az.ServiceFabric
#>

function validateTenant
{
Expand Down Expand Up @@ -393,9 +395,11 @@ function Set-ADOSFMServiceConnection

function Set-ADOAZServiceConnection
{
#Requires -Module Microsoft.Graph.Applications
#Requires -Module Microsoft.Graph.Authentication
#Requires -Module AZ.Accounts
<#
# Requires -Module Microsoft.Graph.Applications
# Requires -Module Microsoft.Graph.Authentication
# Requires -Module AZ.Accounts
#>

param (
[ValidateSet('ACU1', 'AEU2', 'AEU1', 'AWCU')]
Expand Down Expand Up @@ -726,10 +730,11 @@ function Set-ADOServiceConnectionAdmin

function New-ADOAZServiceConnection
{
<#
#Requires -Module Microsoft.Graph.Applications
#Requires -Module Microsoft.Graph.Authentication
#Requires -Module AZ.Accounts

#>
<#
.SYNOPSIS
Generate a new AZ Service Connection
Expand Down
2 changes: 1 addition & 1 deletion ADF/tenants/AKS/ACU1.D1.ado-pipelines-All.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger: none
# include: [ main ]
# paths:
# include:
# - ADF/tenants/AKS/ACU1.D1.parameters.json
# - ADF/tenants/AKS/ACU1.D1.bicepparam
# - ADF/tenants/AKS/ACU1.D1.ado-pipelines-All.yml

variables:
Expand Down
Loading

0 comments on commit 418f462

Please sign in to comment.