Skip to content

Commit

Permalink
Even more renames.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bree Stryker committed Feb 22, 2022
1 parent fb360b6 commit 699262b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions src/bicep/form/mlz.portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -694,19 +694,19 @@
]
},
{
"name": "securityCenterSection",
"name": "defenderSection",
"label": "Enable Microsoft Defender for Cloud",
"type": "Microsoft.Common.Section",
"elements": [
{
"name": "securityCenterSubscriptionDetailsText",
"name": "defenderSubscriptionDetailsText",
"type": "Microsoft.Common.TextBlock",
"options": {
"text": "Mission Landing Zone can activate Microsoft Defender for Cloud for each subscription it is deployed into."
}
},
{
"name": "securityCenterOptionalDetailsText",
"name": "defenderOptionalDetailsText",
"type": "Microsoft.Common.TextBlock",
"options": {
"text": "Enabling Microsoft Defender for Cloud is optional, but recommended."
Expand All @@ -730,15 +730,15 @@
"placeholder": "johndoe@contoso.com",
"multiLine": false,
"constraints": {
"required": "[steps('compliance').securityCenterSection.deployDefender]",
"required": "[steps('compliance').defenderSection.deployDefender]",
"validations": [
{
"regex": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$",
"message": "Provide a valid e-mail address"
}
]
},
"visible": "[steps('compliance').securityCenterSection.deployDefender]"
"visible": "[steps('compliance').defenderSection.deployDefender]"
}
]
},
Expand Down Expand Up @@ -1005,8 +1005,8 @@
"deploySentinel": "[steps('compliance').sentinelSection.deploySentinel]",
"deployPolicy": "[steps('compliance').policySection.deployPolicy]",
"policy": "[steps('compliance').policySection.policy]",
"deployDefender": "[steps('compliance').securityCenterSection.deployDefender]",
"emailSecurityContact": "[steps('compliance').securityCenterSection.emailSecurityContact]",
"deployDefender": "[steps('compliance').defenderSection.deployDefender]",
"emailSecurityContact": "[steps('compliance').defenderSection.emailSecurityContact]",
"deployRemoteAccess": "[steps('remoteAccess').remoteAccessSection.deployRemoteAccess]",
"bastionHostSubnetAddressPrefix": "[steps('remoteAccess').azureBastionSubnetSection.bastionSubnetAddressCidrRange]",
"windowsVmAdminUsername": "[steps('remoteAccess').windowsVmSection.windowsVmAdminUsername]",
Expand Down
10 changes: 5 additions & 5 deletions src/bicep/mlz.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -934,19 +934,19 @@ module logAnalyticsDiagnosticLogging './modules/logAnalyticsDiagnosticLogging.bi
]
}

// SECURITY CENTER
// Microsoft Defender for Cloud

module hubSecurityCenter './modules/defender.bicep' = if (deployDefender) {
name: 'set-hub-sub-security-center-${deploymentNameSuffix}'
module hubDefender './modules/defender.bicep' = if (deployDefender) {
name: 'set-hub-sub-defender-${deploymentNameSuffix}'
scope: subscription(hubSubscriptionId)
params: {
logAnalyticsWorkspaceId: logAnalyticsWorkspace.outputs.id
emailSecurityContact: emailSecurityContact
}
}

module spokeSecurityCenter './modules/defender.bicep' = [for spoke in spokes: if ((deployDefender) && (spoke.subscriptionId != hubSubscriptionId)) {
name: 'set-${spoke.name}-sub-security-center'
module spokeDefender './modules/defender.bicep' = [for spoke in spokes: if ((deployDefender) && (spoke.subscriptionId != hubSubscriptionId)) {
name: 'set-${spoke.name}-sub-defender'
scope: subscription(operationsSubscriptionId)
params: {
logAnalyticsWorkspaceId: logAnalyticsWorkspace.outputs.id
Expand Down
4 changes: 2 additions & 2 deletions src/bicep/modules/defender.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ param emailSecurityContact string
param policySetDescription string = 'The Azure Security Benchmark initiative represents the policies and controls implementing security recommendations defined in Azure Security Benchmark v2, see https://aka.ms/azsecbm. This also serves as the Microsoft Defender for Cloud default policy initiative. You can directly assign this initiative, or manage its policies and compliance results within Microsoft Defender.'


// security center
// defender

resource securityCenterPricing 'Microsoft.Security/pricings@2018-06-01' = [for name in bundle: {
resource defenderPricing 'Microsoft.Security/pricings@2018-06-01' = [for name in bundle: {
name: name
properties: {
pricingTier: 'Standard'
Expand Down

0 comments on commit 699262b

Please sign in to comment.