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

Updated Key Vault #235

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Updated Key Vault #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b17f7dd
Updated Key Vault
marvinbuss Feb 2, 2022
222d294
updated linting
marvinbuss Feb 2, 2022
3284e46
Update .arm-ttk.psd1
marvinbuss Feb 2, 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
2 changes: 2 additions & 0 deletions .github/linters/.arm-ttk.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@
'apiVersions Should Be Recent'
'Parameters Must Be Referenced'
'Variables Must Be Referenced'
'apiVersions Should Be Recent In Reference Functions'
'URIs Should Be Properly Constructed'
)
}
70 changes: 13 additions & 57 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "6542674684264803931"
"templateHash": "1511805043645479529"
}
},
"parameters": {
Expand Down Expand Up @@ -448,7 +448,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "16882101118127557101"
"templateHash": "13883560175464909401"
}
},
"parameters": {
Expand Down Expand Up @@ -732,53 +732,6 @@
]
}
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"apiVersion": "2020-11-01",
"name": "[format('{0}-adfssis-nsg', parameters('prefix'))]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
"properties": {
"securityRules": [
{
"name": "AllowBatchNodeManagement",
"properties": {
"description": "Required for Azure SSIS with public IP.",
"protocol": "Tcp",
"sourcePortRange": "*",
"destinationPortRange": "29876-29877",
"sourceAddressPrefix": "BatchNodeManagement",
"destinationAddressPrefix": "*",
"access": "Allow",
"priority": 110,
"direction": "Inbound",
"sourcePortRanges": [],
"destinationPortRanges": [],
"sourceAddressPrefixes": [],
"destinationAddressPrefixes": []
}
},
{
"name": "AllowAzureCloud",
"properties": {
"description": "Required for Azure SSIS workers to access Azure services, such as Azure Storage and Azure Event Hubs.",
"protocol": "Tcp",
"sourcePortRange": "*",
"destinationPortRange": "443",
"sourceAddressPrefix": "VirtualNetwork",
"destinationAddressPrefix": "AzureCloud",
"access": "Allow",
"priority": 120,
"direction": "Outbound",
"sourcePortRanges": [],
"destinationPortRanges": [],
"sourceAddressPrefixes": [],
"destinationAddressPrefixes": []
}
}
]
}
},
{
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2020-06-01",
Expand Down Expand Up @@ -1178,7 +1131,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "18313384142239512916"
"templateHash": "15321614578444699909"
}
},
"parameters": {
Expand Down Expand Up @@ -1237,7 +1190,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "7953887992371664532"
"templateHash": "12505067730214864691"
}
},
"parameters": {
Expand All @@ -1264,7 +1217,7 @@
"resources": [
{
"type": "Microsoft.KeyVault/vaults",
"apiVersion": "2021-04-01-preview",
"apiVersion": "2021-06-01-preview",
"name": "[parameters('keyvaultName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -1283,6 +1236,7 @@
"ipRules": [],
"virtualNetworkRules": []
},
"publicNetworkAccess": "Disabled",
"sku": {
"family": "A",
"name": "standard"
Expand Down Expand Up @@ -4292,7 +4246,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "7539544899333460771"
"templateHash": "6475176560452078151"
}
},
"parameters": {
Expand Down Expand Up @@ -4433,7 +4387,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "7953887992371664532"
"templateHash": "12505067730214864691"
}
},
"parameters": {
Expand All @@ -4460,7 +4414,7 @@
"resources": [
{
"type": "Microsoft.KeyVault/vaults",
"apiVersion": "2021-04-01-preview",
"apiVersion": "2021-06-01-preview",
"name": "[parameters('keyvaultName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -4479,6 +4433,7 @@
"ipRules": [],
"virtualNetworkRules": []
},
"publicNetworkAccess": "Disabled",
"sku": {
"family": "A",
"name": "standard"
Expand Down Expand Up @@ -4581,7 +4536,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "7953887992371664532"
"templateHash": "12505067730214864691"
}
},
"parameters": {
Expand All @@ -4608,7 +4563,7 @@
"resources": [
{
"type": "Microsoft.KeyVault/vaults",
"apiVersion": "2021-04-01-preview",
"apiVersion": "2021-06-01-preview",
"name": "[parameters('keyvaultName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -4627,6 +4582,7 @@
"ipRules": [],
"virtualNetworkRules": []
},
"publicNetworkAccess": "Disabled",
"sku": {
"family": "A",
"name": "standard"
Expand Down
3 changes: 2 additions & 1 deletion infra/modules/services/keyvault.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ param privateDnsZoneIdKeyVault string = ''
var keyVaultPrivateEndpointName = '${keyVault.name}-private-endpoint'

// Resources
resource keyVault 'Microsoft.KeyVault/vaults@2021-04-01-preview' = {
resource keyVault 'Microsoft.KeyVault/vaults@2021-06-01-preview' = {
name: keyvaultName
location: location
tags: tags
Expand All @@ -34,6 +34,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2021-04-01-preview' = {
ipRules: []
virtualNetworkRules: []
}
publicNetworkAccess: 'Disabled'
sku: {
family: 'A'
name: 'standard'
Expand Down