Skip to content

Trigger all pipelines after environment cleanup #986

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

Merged
eriqua merged 7 commits into from
Feb 10, 2022
Merged

Trigger all pipelines after environment cleanup #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1736960
trigger pipelines
Feb 9, 2022
586b5cf
Merge branch 'main' into users/erikag/redbutton
Feb 10, 2022
4ace43f
change token
Feb 10, 2022
994559c
keyEncryptionKeySqlMi
Feb 10, 2022
2695114
keyEncryptionKey
Feb 10, 2022
ea58176
applicationGatewaySslCertificate
Feb 10, 2022
bd445d6
update docs
Feb 10, 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: 1 addition & 1 deletion arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001"
},
"keyUrl": {
"value": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/685153483a1140e3856f004a753e1ab4"
"value": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5" // ID must be updated for new keys
},
"roleAssignments": {
"value": [
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"EncryptionOperation": "EnableEncryption",
"KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
"KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
"KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionAlgorithm": "RSA-OAEP",
"VolumeType": "All",
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"EncryptionOperation": "EnableEncryption",
"KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
"KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
"KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionAlgorithm": "RSA-OAEP",
"VolumeType": "All",
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-vm-linux-min-001"
"value": "<<namePrefix>>-vm-linux-min-01"
},
"osType": {
"value": "Linux"
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-vm-linux-001"
"value": "<<namePrefix>>-vm-linux-01"
},
"systemAssignedIdentity": {
"value": true
Expand Down Expand Up @@ -140,7 +140,7 @@
"EncryptionOperation": "EnableEncryption",
"KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
"KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", // ID must be updated for new keys
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
"KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionAlgorithm": "RSA-OAEP",
"VolumeType": "All",
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-vm-win-001"
"value": "<<namePrefix>>-vm-win-01"
},
"imageReference": {
"value": {
Expand Down Expand Up @@ -157,7 +157,7 @@
"EncryptionOperation": "EnableEncryption",
"KeyVaultURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/",
"KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", // ID must be updated for new keys
"KeyEncryptionKeyURL": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
"KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<<namePrefix>>-az-kv-x-001",
"KeyEncryptionAlgorithm": "RSA-OAEP",
"VolumeType": "All",
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachines/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Only for OSType Windows
"EncryptionOperation": "EnableEncryption",
"KeyVaultURL": "https://mykeyvault.vault.azure.net/",
"KeyVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-x-001",
"KeyEncryptionKeyURL": "https://mykeyvault.vault.azure.net/keys/keyEncryptionKey/685153483a1140e3856f004a753e1ab4",
"KeyEncryptionKeyURL": "https://mykeyvault.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys
"KekVaultResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-x-001",
"KeyEncryptionAlgorithm": "RSA-OAEP", //'RSA-OAEP'/'RSA-OAEP-256'/'RSA1_5'
"VolumeType": "All", //'OS'/'Data'/'All'
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/applicationGateways/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
},
"sslCertificateKeyVaultSecretId": {
"value": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/secrets/applicationGatewaySslCertificate/5b09a47d080943bb93d00f4dc45244a1"
"value": "https://adp-<<namePrefix>>-az-kv-x-001.vault.azure.net/secrets/applicationGatewaySslCertificate/9b670bb436e04eae9acd9b93dca269b6" // ID must be updated for new certificates
},
"backendPools": {
"value": [
Expand Down
6 changes: 3 additions & 3 deletions arm/Microsoft.Sql/managedInstances/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@
"keys": {
"value": [
{
"name": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_8f68659b2fdd4293872fb8efa36ddd59",
"uri": "https://adp-<<namePrefix>>-az-kv-x-sqlmi.vault.azure.net/keys/keyEncryptionKeySqlMi/8f68659b2fdd4293872fb8efa36ddd59",
"name": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
"uri": "https://adp-<<namePrefix>>-az-kv-x-sqlmi.vault.azure.net/keys/keyEncryptionKeySqlMi/4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
"serverKeyType": "AzureKeyVault"
}
]
},
"encryptionProtectorObj": {
"value": {
"serverKeyName": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_8f68659b2fdd4293872fb8efa36ddd59",
"serverKeyName": "adp-<<namePrefix>>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys
"serverKeyType": "AzureKeyVault"
}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/GettingStarted.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Several fundamental variables are shared among all pipelines and are stored in a

### Name Prefix Token Replacement

Change the default `namePrefix` token value in the [Settings.json](https://github.com/Azure/ResourceModules/blob/main/settings.json) to a 3-5 character string that is used to distinguish your resources names. The default `namePrefix` token has a value `sxx`. Consider this to be one of the first pull requests you need to perform before running any of the repository pipelines. More information on tokens is provided [below](#parameter-file-tokens).
Change the default `namePrefix` token value in the [Settings.json](https://github.com/Azure/ResourceModules/blob/main/settings.json) to a 3-5 character string that is used to distinguish your resources names. The default `namePrefix` token has a value `carml`. Consider this to be one of the first pull requests you need to perform before running any of the repository pipelines. More information on tokens is provided [below](#parameter-file-tokens).

## **Option 2:** Use it as a local reference to build bicep templates

Expand Down
4 changes: 2 additions & 2 deletions settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"localTokens": [
{
"name": "namePrefix",
"value": "sxx",
"value": "carml",
"metadata": {
"description": "A 3-4 character length string, included in the resources names"
"description": "A 3-5 character length string, included in the resources names"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...ities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-vm-001"
"value": "adp-<<namePrefix>>-vm-01"
},
"vmSize": {
"value": "Standard_B1s"
Expand Down
2 changes: 1 addition & 1 deletion utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function Initialize-DeploymentRemoval {
process {
$moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase

# The intial sequence is a general order-recommendation
# The initial sequence is a general order-recommendation
$removalSequence = @(
'Microsoft.Insights/diagnosticSettings',
'Microsoft.Resources/resourceGroups',
Expand Down