Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Linter Rules From Latest Bicep Release & Fix Hub Networking Conditionals #148

Merged
merged 8 commits into from
Feb 15, 2022
Merged

Update Linter Rules From Latest Bicep Release & Fix Hub Networking Conditionals #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8ca1d1
update linting rules
jtracey93 Feb 14, 2022
70d06d3
update linting in contrib guide
jtracey93 Feb 14, 2022
a61daf3
add linter overrides
jtracey93 Feb 14, 2022
3133a2d
update spoke networking module
jtracey93 Feb 14, 2022
7010fd5
update public IP module
jtracey93 Feb 14, 2022
b632bd9
update hub networking module and conditional fixes
jtracey93 Feb 14, 2022
de992de
Merge branch 'main' into linter-rule-breaking-change-fix
jtracey93 Feb 14, 2022
7e992a8
Remove white space
jtracey93 Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion docs/wiki/Contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,32 @@ To author Bicep modules that are in-line with the requirements for this project,
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion infra-as-code/bicep/CRML/containerRegistry/bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,32 @@
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion infra-as-code/bicep/CRML/customerUsageAttribution/bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,32 @@
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion infra-as-code/bicep/CRML/subscriptionAlias/bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,32 @@
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion infra-as-code/bicep/modules/customRoleDefinitions/bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,32 @@
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions infra-as-code/bicep/modules/customRoleDefinitions/customRoleDefinitions.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module modRolesSecurityOperationsRole 'definitions/caf-security-operations-role.

// Optional Deployment for Customer Usage Attribution
module modCustomerUsageAttribution '../../CRML/customerUsageAttribution/cuaIdManagementGroup.bicep' = if (!parTelemetryOptOut) {
#disable-next-line no-loc-expr-outside-params
name: 'pid-${varCuaid}-${uniqueString(deployment().location)}'
params: {}
}
Expand Down
11 changes: 6 additions & 5 deletions infra-as-code/bicep/modules/hubNetworking/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The module requires the following inputs:

| Parameter | Type | Default | Description | Requirement | Example |
| ----------------------------- | ------ | ---------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- | ---------------------------- |
| parRegion | string | `resourceGroup().location` | The Azure Region to deploy the resources into | None | `eastus` |
| parBastionEnabled | bool | true | Switch to enable deployment of Bastion Service | None | true |
| parDdosEnabled | bool | true | Switch to enable deployment of distributed denial of service attacks service | None | true |
| parAzureFirewallEnabled | bool | true | Switch to enable deployment of Azure Firewall | None | true |
Expand All @@ -30,10 +31,10 @@ The module requires the following inputs:
| parPublicIPSku | string | Standard | SKU or Tier of Public IP to deploy | Standard or Basic | Standard |
| parTags | object | Empty Array [] | List of tags (Key Value Pairs) to be applied to resources | None | environment: 'development' |
| parHubNetworkAddressPrefix | string | 10.10.0.0/16 | CIDR range for Hub Network | CIDR Notation | 10.10.0.0/16 |
| parHubNetworkName | string | ${parCompanyPrefix}-hub-${resourceGroup().location} | Name prefix for Virtual Network. Prefix will be appended with the region. | 2-50 char | alz-hub-eastus2 |
| parAzureFirewallName | string | ${parCompanyPrefix}-azure-firewall | Name associated with Azure Firewall | 1-80 char | alz-azure-firewall |
| parHubNetworkName | string | `${parCompanyPrefix}-hub-${parRegion}` | Name prefix for Virtual Network. Prefix will be appended with the region. | 2-50 char | alz-hub-eastus |
| parAzureFirewallName | string | `${parCompanyPrefix}-azure-firewall` | Name associated with Azure Firewall | 1-80 char | alz-azure-firewall |
| parAzureFirewallTier | string | Standard | Tier associated with the Firewall to be deployed. | Standard or Premium | Premium |
| parHubRouteTableName | string | ${parCompanyPrefix}-hub-routetable | Name of route table to be associated with Hub Network | 1-80 char | alz-hub-routetable |
| parHubRouteTableName | string | `${parCompanyPrefix}-hub-routetable` | Name of route table to be associated with Hub Network | 1-80 char | alz-hub-routetable |
| parVpnGatewayConfig | object | See example parameters file [`hubNetworking.parameters.json`](hubNetworking.parameters.example.json) | Configuration for VPN virtual network gateway to be deployed. If a VPN virtual network gateway is not desired an empty object should be used as the input parameter in the parameter file, i.e. "parVpnGatewayConfig": {"value": {} }''' | None | See Default |
| parExpressRouteGatewayConfig | object | See example parameters file [`hubNetworking.parameters.json`](hubNetworking.parameters.example.json) | Configuration for ExpressRoute virtual network gateway to be deployed. If a ExpressRoute virtual network gateway is not desired an empty object should be used as the input parameter in the parameter file, i.e. "parExpressRouteGatewayConfig": {"value": {} }''' | None | See Default |
| parSubnets | array | See example parameters file [`hubNetworking.parameters.json`](hubNetworking.parameters.example.json) | Array of objects to provide for a dynamic set of subnets | Must provide array of objects | See Default |
Expand Down Expand Up @@ -76,7 +77,7 @@ There are two different sets of input parameters; one for deploying to Azure glo
ConnectivitySubscriptionId="[your platform management subscription ID]"
az account set --subscription $ConnectivitySubscriptionId

az group create --location eastus2 \
az group create --location eastus \
--name Hub_Networking_POC

az deployment group create \
Expand Down Expand Up @@ -110,7 +111,7 @@ $ConnectivitySubscriptionId = "[your platform management subscription ID]"
Select-AzSubscription -SubscriptionId $ConnectivitySubscriptionId

New-AzResourceGroup -Name 'Hub_Networking_POC' `
-Location 'EastUs2'
-Location 'eastus'

New-AzResourceGroupDeployment `
-TemplateFile infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep `
Expand Down
23 changes: 22 additions & 1 deletion infra-as-code/bicep/modules/hubNetworking/bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,32 @@
"simplify-interpolation": {
"level": "error"
},
"use-protectedsettings-for-commandtoexecute-secrets": {
"protect-commandtoexecute-secrets": {
"level": "error"
},
"use-stable-vm-image": {
"level": "error"
},
"explicit-values-for-loc-params": {
"level": "error"
},
"no-hardcoded-location": {
"level": "error"
},
"no-loc-expr-outside-params": {
"level": "error"
},
"max-outputs": {
"level": "error"
},
"max-params": {
"level": "error"
},
"max-resources": {
"level": "error"
},
"max-variables": {
"level": "error"
}
}
}
Expand Down
Loading