diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json b/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json index e75d685131..9ad9ed7c52 100644 --- a/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json +++ b/arm/Microsoft.Compute/diskEncryptionSets/.parameters/parameters.json @@ -9,7 +9,7 @@ "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001" }, "keyUrl": { - "value": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/685153483a1140e3856f004a753e1ab4" + "value": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5" // ID must be updated for new keys }, "roleAssignments": { "value": [ diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json b/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json index 8af906099b..e9d2872423 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/linux.parameters.json @@ -157,7 +157,7 @@ "EncryptionOperation": "EnableEncryption", "KeyVaultURL": "https://adp-<>-az-kv-x-001.vault.azure.net/", "KeyVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", - "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", + "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys "KekVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", "KeyEncryptionAlgorithm": "RSA-OAEP", "VolumeType": "All", diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json b/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json index 57a4ae7c72..0ba7b52e8f 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/.parameters/windows.parameters.json @@ -148,7 +148,7 @@ "EncryptionOperation": "EnableEncryption", "KeyVaultURL": "https://adp-<>-az-kv-x-001.vault.azure.net/", "KeyVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", - "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", + "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys "KekVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", "KeyEncryptionAlgorithm": "RSA-OAEP", "VolumeType": "All", diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json b/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json index ae3d1086d2..051c53419a 100644 --- a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json +++ b/arm/Microsoft.Compute/virtualMachines/.parameters/linux.min.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-vm-linux-min-001" + "value": "<>-vm-linux-min-01" }, "osType": { "value": "Linux" diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json b/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json index 5348c22627..4e24a4dbd8 100644 --- a/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json +++ b/arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-vm-linux-001" + "value": "<>-vm-linux-01" }, "systemAssignedIdentity": { "value": true @@ -140,7 +140,7 @@ "EncryptionOperation": "EnableEncryption", "KeyVaultURL": "https://adp-<>-az-kv-x-001.vault.azure.net/", "KeyVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", - "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", // ID must be updated for new keys + "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys "KekVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", "KeyEncryptionAlgorithm": "RSA-OAEP", "VolumeType": "All", diff --git a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json b/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json index 72709e86fa..db6c5d4ed8 100644 --- a/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json +++ b/arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-vm-win-001" + "value": "<>-vm-win-01" }, "imageReference": { "value": { @@ -157,7 +157,7 @@ "EncryptionOperation": "EnableEncryption", "KeyVaultURL": "https://adp-<>-az-kv-x-001.vault.azure.net/", "KeyVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", - "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/1dcaf3e93b44433bba0232e9eec54cc7", // ID must be updated for new keys + "KeyEncryptionKeyURL": "https://adp-<>-az-kv-x-001.vault.azure.net/keys/keyEncryptionKey/bc3bb46d95c64367975d722f473eeae5", // ID must be updated for new keys "KekVaultResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-<>-az-kv-x-001", "KeyEncryptionAlgorithm": "RSA-OAEP", "VolumeType": "All", diff --git a/arm/Microsoft.Compute/virtualMachines/readme.md b/arm/Microsoft.Compute/virtualMachines/readme.md index 61c60671a7..ff39391911 100644 --- a/arm/Microsoft.Compute/virtualMachines/readme.md +++ b/arm/Microsoft.Compute/virtualMachines/readme.md @@ -362,7 +362,7 @@ Only for OSType Windows "EncryptionOperation": "EnableEncryption", "KeyVaultURL": "https://mykeyvault.vault.azure.net/", "KeyVaultResourceId": "/subscriptions/<>/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/<>/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' diff --git a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json b/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json index 3eace745b3..c13a9cd295 100644 --- a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json +++ b/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json @@ -29,7 +29,7 @@ } }, "sslCertificateKeyVaultSecretId": { - "value": "https://adp-<>-az-kv-x-001.vault.azure.net/secrets/applicationGatewaySslCertificate/5b09a47d080943bb93d00f4dc45244a1" + "value": "https://adp-<>-az-kv-x-001.vault.azure.net/secrets/applicationGatewaySslCertificate/9b670bb436e04eae9acd9b93dca269b6" // ID must be updated for new certificates }, "backendPools": { "value": [ diff --git a/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json b/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json index ae764bf086..75f38b339e 100644 --- a/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json +++ b/arm/Microsoft.Sql/managedInstances/.parameters/parameters.json @@ -81,15 +81,15 @@ "keys": { "value": [ { - "name": "adp-<>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_8f68659b2fdd4293872fb8efa36ddd59", - "uri": "https://adp-<>-az-kv-x-sqlmi.vault.azure.net/keys/keyEncryptionKeySqlMi/8f68659b2fdd4293872fb8efa36ddd59", + "name": "adp-<>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys + "uri": "https://adp-<>-az-kv-x-sqlmi.vault.azure.net/keys/keyEncryptionKeySqlMi/4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys "serverKeyType": "AzureKeyVault" } ] }, "encryptionProtectorObj": { "value": { - "serverKeyName": "adp-<>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_8f68659b2fdd4293872fb8efa36ddd59", + "serverKeyName": "adp-<>-az-kv-x-sqlmi_keyEncryptionKeySqlMi_4bf367f64c914d8ba698700fb598ad07", // ID must be updated for new keys "serverKeyType": "AzureKeyVault" } }, diff --git a/docs/wiki/GettingStarted.md b/docs/wiki/GettingStarted.md index e0c32a87d3..868af6a1d2 100644 --- a/docs/wiki/GettingStarted.md +++ b/docs/wiki/GettingStarted.md @@ -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 diff --git a/settings.json b/settings.json index 6db8ca684d..b3b82ad280 100644 --- a/settings.json +++ b/settings.json @@ -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" } } ] diff --git a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json index f0eb990233..94425491e0 100644 --- a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-<>-vm-001" + "value": "adp-<>-vm-01" }, "vmSize": { "value": "Standard_B1s" diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 index fce2a12284..6b356b4751 100644 --- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 +++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 @@ -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',