From e31b7b27f30301d05778170c785ea059278fcdbe Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Wed, 20 Sep 2023 11:45:51 +0100 Subject: [PATCH] Renamed telemetry param --- avm/res/cognitive-services/account/README.md | 38 +++++++++---------- avm/res/cognitive-services/account/main.bicep | 8 ++-- avm/res/cognitive-services/account/main.json | 18 ++++----- .../account/tests/e2e/defauts/main.test.bicep | 4 +- .../account/tests/e2e/max/main.test.bicep | 4 +- .../account/tests/e2e/speech/main.test.bicep | 4 +- .../main.test.bicep | 4 +- .../main.test.bicep | 4 +- .../tests/e2e/waf-aligned/main.test.bicep | 4 +- avm/res/key-vault/vault/README.md | 22 +++++------ .../key-vault/vault/access-policy/README.md | 2 +- .../key-vault/vault/access-policy/main.bicep | 4 +- .../key-vault/vault/access-policy/main.json | 4 +- avm/res/key-vault/vault/key/README.md | 2 +- avm/res/key-vault/vault/key/main.bicep | 4 +- avm/res/key-vault/vault/key/main.json | 4 +- avm/res/key-vault/vault/main.bicep | 14 +++---- avm/res/key-vault/vault/main.json | 36 +++++++++--------- avm/res/key-vault/vault/secret/README.md | 2 +- avm/res/key-vault/vault/secret/main.bicep | 4 +- avm/res/key-vault/vault/secret/main.json | 4 +- .../vault/tests/e2e/defaults/main.test.bicep | 4 +- .../vault/tests/e2e/max/main.test.bicep | 4 +- .../e2e/private endpoint/main.test.bicep | 4 +- .../tests/e2e/waf-aligned/main.test.bicep | 4 +- avm/res/network/private-endpoint/README.md | 14 +++---- avm/res/network/private-endpoint/main.bicep | 6 +-- avm/res/network/private-endpoint/main.json | 10 ++--- .../private-dns-zone-group/README.md | 2 +- .../private-dns-zone-group/main.bicep | 4 +- .../private-dns-zone-group/main.json | 4 +- .../tests/e2e/defaults/main.test.bicep | 4 +- .../tests/e2e/max/main.test.bicep | 4 +- .../tests/e2e/waf-aligned/main.test.bicep | 4 +- 34 files changed, 129 insertions(+), 129 deletions(-) diff --git a/avm/res/cognitive-services/account/README.md b/avm/res/cognitive-services/account/README.md index 9f037671f3..879912a341 100644 --- a/avm/res/cognitive-services/account/README.md +++ b/avm/res/cognitive-services/account/README.md @@ -47,7 +47,7 @@ This module deploys a Cognitive Service. | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. | | [`disableLocalAuth`](#parameter-disablelocalauth) | bool | Allow only Azure AD authentication. Should be enabled for security reasons. | | [`dynamicThrottlingEnabled`](#parameter-dynamicthrottlingenabled) | bool | The flag to enable dynamic throttling. | -| [`enableDefaultTelemetry`](#parameter-enabledefaulttelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enableTelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | | [`location`](#parameter-location) | string | Location for all Resources. | | [`lock`](#parameter-lock) | string | Specify the type of lock. | | [`managedIdentities`](#parameter-managedidentities) | | The managed identity definition for this resource | @@ -80,7 +80,7 @@ The API properties for special APIs. The customer managed key definition. - Required: Yes -- Type: +- Type: ### Parameter: `customSubDomainName` @@ -110,7 +110,7 @@ The flag to enable dynamic throttling. - Type: bool - Default: `False` -### Parameter: `enableDefaultTelemetry` +### Parameter: `enableTelemetry` Enable telemetry via a Globally Unique Identifier (GUID). - Required: No @@ -143,7 +143,7 @@ Specify the type of lock. The managed identity definition for this resource - Required: Yes -- Type: +- Type: ### Parameter: `migrationToken` @@ -498,7 +498,7 @@ module account './cognitive-services/account/main.bicep' = { workspaceResourceId: '' } ] - enableDefaultTelemetry: '' + enableTelemetry: '' lock: 'CanNotDelete' networkAcls: { defaultAction: 'Deny' @@ -606,8 +606,8 @@ module account './cognitive-services/account/main.bicep' = { } ] }, - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "lock": { "value": "CanNotDelete" @@ -694,7 +694,7 @@ module account './cognitive-services/account/main.bicep' = { } name: 'csaencr001' // Non-required parameters - enableDefaultTelemetry: '' + enableTelemetry: '' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false sku: 'S0' @@ -736,8 +736,8 @@ module account './cognitive-services/account/main.bicep' = { "value": "csaencr001" }, // Non-required parameters - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "publicNetworkAccess": { "value": "Enabled" @@ -776,7 +776,7 @@ module account './cognitive-services/account/main.bicep' = { } name: '' // Non-required parameters - enableDefaultTelemetry: '' + enableTelemetry: '' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false sku: 'S0' @@ -815,8 +815,8 @@ module account './cognitive-services/account/main.bicep' = { "value": "" }, // Non-required parameters - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "publicNetworkAccess": { "value": "Enabled" @@ -847,7 +847,7 @@ module account './cognitive-services/account/main.bicep' = { // Required parameters kind: 'SpeechServices' name: 'csamin001' - enableDefaultTelemetry: '' + enableTelemetry: '' } } ``` @@ -871,8 +871,8 @@ module account './cognitive-services/account/main.bicep' = { "name": { "value": "csamin001" }, - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" } } } @@ -902,7 +902,7 @@ module account './cognitive-services/account/main.bicep' = { name: 'csaspeech001' // Non-required parameters customSubDomainName: 'speechdomain' - enableDefaultTelemetry: '' + enableTelemetry: '' privateEndpoints: [ { privateDnsZoneResourceIds: [ @@ -958,8 +958,8 @@ module account './cognitive-services/account/main.bicep' = { "customSubDomainName": { "value": "speechdomain" }, - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "privateEndpoints": { "value": [ diff --git a/avm/res/cognitive-services/account/main.bicep b/avm/res/cognitive-services/account/main.bicep index 142bd68636..c8b8ce7a57 100644 --- a/avm/res/cognitive-services/account/main.bicep +++ b/avm/res/cognitive-services/account/main.bicep @@ -122,7 +122,7 @@ param userOwnedStorage array = [] param managedIdentities managedIdentitiesType @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true var enableReferencedModulesTelemetry = false @@ -164,7 +164,7 @@ var builtInRoleNames = { 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') } -resource defaultTelemetry 'Microsoft.Resources/deployments@2022-09-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2022-09-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' properties: { mode: 'Incremental' @@ -271,7 +271,7 @@ module cognitiveService_privateEndpoints '../../network/private-endpoint/main.bi name: privateEndpoint.?name ?? 'pe-${last(split(cognitiveService.id, '/'))}-${privateEndpoint.service}-${index}' serviceResourceId: cognitiveService.id subnetResourceId: privateEndpoint.subnetResourceId - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneResourceIds: privateEndpoint.?privateDnsZoneResourceIds ?? [] @@ -432,7 +432,7 @@ type privateEndpointType = { manualPrivateLinkServiceConnections: array? @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') - enableDefaultTelemetry: bool? + enableTelemetry: bool? }[]? type managedIdentitiesType = { diff --git a/avm/res/cognitive-services/account/main.json b/avm/res/cognitive-services/account/main.json index a1d7e94008..5c010597d7 100644 --- a/avm/res/cognitive-services/account/main.json +++ b/avm/res/cognitive-services/account/main.json @@ -315,7 +315,7 @@ "description": "Optional. Manual PrivateLink Service Connections." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "nullable": true, "metadata": { @@ -593,7 +593,7 @@ "description": "Optional. The managed identity definition for this resource" } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -651,7 +651,7 @@ ] }, "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]", @@ -799,7 +799,7 @@ "subnetResourceId": { "value": "[parameters('privateEndpoints')[copyIndex()].subnetResourceId]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" }, "location": { @@ -1014,7 +1014,7 @@ "description": "Optional. Manual PrivateLink Service Connections." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -1039,7 +1039,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]", @@ -1139,7 +1139,7 @@ "privateEndpointName": { "value": "[parameters('name')]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } }, @@ -1178,7 +1178,7 @@ "description": "Optional. The name of the private DNS zone group." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -1202,7 +1202,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/cognitive-services/account/tests/e2e/defauts/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/defauts/main.test.bicep index ea7a26095d..f4447b1d99 100644 --- a/avm/res/cognitive-services/account/tests/e2e/defauts/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/defauts/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'csad' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -39,7 +39,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' kind: 'SpeechServices' location: location diff --git a/avm/res/cognitive-services/account/tests/e2e/max/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/max/main.test.bicep index 30ecab17e1..52b524cc23 100644 --- a/avm/res/cognitive-services/account/tests/e2e/max/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/max/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'csamax' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -63,7 +63,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' kind: 'Face' customSubDomainName: '${namePrefix}xdomain' diff --git a/avm/res/cognitive-services/account/tests/e2e/speech/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/speech/main.test.bicep index 6e9fc12716..13e00a0d70 100644 --- a/avm/res/cognitive-services/account/tests/e2e/speech/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/speech/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'csaspeech' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -48,7 +48,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' kind: 'SpeechServices' location: location diff --git a/avm/res/cognitive-services/account/tests/e2e/system-assigned cmk encryption/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/system-assigned cmk encryption/main.test.bicep index 2097d81cc7..0641613a87 100644 --- a/avm/res/cognitive-services/account/tests/e2e/system-assigned cmk encryption/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/system-assigned cmk encryption/main.test.bicep @@ -18,7 +18,7 @@ param serviceShort string = 'csaecrs' param baseTime string = utcNow('u') @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -53,7 +53,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: nestedDependencies.outputs.cognitiveServiceName kind: 'SpeechServices' location: location diff --git a/avm/res/cognitive-services/account/tests/e2e/user-assigned cmk encryption/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/user-assigned cmk encryption/main.test.bicep index 93baa21eb8..5a22029f23 100644 --- a/avm/res/cognitive-services/account/tests/e2e/user-assigned cmk encryption/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/user-assigned cmk encryption/main.test.bicep @@ -18,7 +18,7 @@ param serviceShort string = 'csaencr' param baseTime string = utcNow('u') @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -53,7 +53,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' kind: 'SpeechServices' location: location diff --git a/avm/res/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep b/avm/res/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep index 308c3f00fe..eab47e2a5e 100644 --- a/avm/res/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/cognitive-services/account/tests/e2e/waf-aligned/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'csawaf' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -63,7 +63,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' kind: 'Face' location: location diff --git a/avm/res/key-vault/vault/README.md b/avm/res/key-vault/vault/README.md index c700320c9f..ce33699d7d 100644 --- a/avm/res/key-vault/vault/README.md +++ b/avm/res/key-vault/vault/README.md @@ -39,7 +39,7 @@ This module deploys a Key Vault. | [`accessPolicies`](#parameter-accesspolicies) | array | All access policies to create. | | [`createMode`](#parameter-createmode) | string | The vault's create mode to indicate whether the vault need to be recovered or not. - recover or default. | | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. | -| [`enableDefaultTelemetry`](#parameter-enabledefaulttelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enableTelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | | [`enablePurgeProtection`](#parameter-enablepurgeprotection) | bool | Provide 'true' to enable Key Vault's purge protection feature. | | [`enableRbacAuthorization`](#parameter-enablerbacauthorization) | bool | Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC. | | [`enableSoftDelete`](#parameter-enablesoftdelete) | bool | Switch to enable/disable Key Vault's soft delete feature. | @@ -79,7 +79,7 @@ The diagnostic settings of the service. - Type: array - Default: `[]` -### Parameter: `enableDefaultTelemetry` +### Parameter: `enableTelemetry` Enable telemetry via a Globally Unique Identifier (GUID). - Required: No @@ -502,7 +502,7 @@ module vault './key-vault/vault/main.bicep' = { workspaceResourceId: '' } ] - enableDefaultTelemetry: '' + enableTelemetry: '' enablePurgeProtection: false enableRbacAuthorization: false keys: [ @@ -690,8 +690,8 @@ module vault './key-vault/vault/main.bicep' = { } ] }, - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "enablePurgeProtection": { "value": false @@ -840,7 +840,7 @@ module vault './key-vault/vault/main.bicep' = { // Required parameters name: 'kvvmin002' // Non-required parameters - enableDefaultTelemetry: '' + enableTelemetry: '' enablePurgeProtection: false } } @@ -863,8 +863,8 @@ module vault './key-vault/vault/main.bicep' = { "value": "kvvmin002" }, // Non-required parameters - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "enablePurgeProtection": { "value": false @@ -889,7 +889,7 @@ module vault './key-vault/vault/main.bicep' = { // Required parameters name: 'kvvpe001' // Non-required parameters - enableDefaultTelemetry: '' + enableTelemetry: '' enablePurgeProtection: false privateEndpoints: [ { @@ -931,8 +931,8 @@ module vault './key-vault/vault/main.bicep' = { "value": "kvvpe001" }, // Non-required parameters - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "enablePurgeProtection": { "value": false diff --git a/avm/res/key-vault/vault/access-policy/README.md b/avm/res/key-vault/vault/access-policy/README.md index 6adabd23d8..967a75f9b8 100644 --- a/avm/res/key-vault/vault/access-policy/README.md +++ b/avm/res/key-vault/vault/access-policy/README.md @@ -28,7 +28,7 @@ This module deploys a Key Vault Access Policy. | Parameter Name | Type | Default Value | Description | | :-- | :-- | :-- | :-- | | `accessPolicies` | array | `[]` | An array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. | -| `enableDefaultTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | +| `enableTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | ### Parameter Usage: `accessPolicies` diff --git a/avm/res/key-vault/vault/access-policy/main.bicep b/avm/res/key-vault/vault/access-policy/main.bicep index 6eeec78ae5..f428a17f49 100644 --- a/avm/res/key-vault/vault/access-policy/main.bicep +++ b/avm/res/key-vault/vault/access-policy/main.bicep @@ -9,7 +9,7 @@ param keyVaultName string param accessPolicies array = [] @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true var formattedAccessPolicies = [for accessPolicy in accessPolicies: { applicationId: contains(accessPolicy, 'applicationId') ? accessPolicy.applicationId : '' @@ -18,7 +18,7 @@ var formattedAccessPolicies = [for accessPolicy in accessPolicies: { tenantId: contains(accessPolicy, 'tenantId') ? accessPolicy.tenantId : tenant().tenantId }] -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' properties: { mode: 'Incremental' diff --git a/avm/res/key-vault/vault/access-policy/main.json b/avm/res/key-vault/vault/access-policy/main.json index 6aab64e72c..589212b32f 100644 --- a/avm/res/key-vault/vault/access-policy/main.json +++ b/avm/res/key-vault/vault/access-policy/main.json @@ -25,7 +25,7 @@ "description": "Optional. An array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -49,7 +49,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/key-vault/vault/key/README.md b/avm/res/key-vault/vault/key/README.md index 8b892d702b..f8a2e9ae6e 100644 --- a/avm/res/key-vault/vault/key/README.md +++ b/avm/res/key-vault/vault/key/README.md @@ -38,7 +38,7 @@ This module deploys a Key Vault Key. | `attributesExp` | int | `-1` | | Expiry date in seconds since 1970-01-01T00:00:00Z. For security reasons, it is recommended to set an expiration date whenever possible. | | `attributesNbf` | int | `-1` | | Not before date in seconds since 1970-01-01T00:00:00Z. | | `curveName` | string | `'P-256'` | `[P-256, P-256K, P-384, P-521]` | The elliptic curve name. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `enableTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | | `keyOps` | array | `[]` | `[decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey]` | Array of JsonWebKeyOperation. | | `keySize` | int | `-1` | | The key size in bits. For example: 2048, 3072, or 4096 for RSA. | | `kty` | string | `'EC'` | `[EC, EC-HSM, RSA, RSA-HSM]` | The type of the key. | diff --git a/avm/res/key-vault/vault/key/main.bicep b/avm/res/key-vault/vault/key/main.bicep index 7a8582a4c1..ce54086ea4 100644 --- a/avm/res/key-vault/vault/key/main.bicep +++ b/avm/res/key-vault/vault/key/main.bicep @@ -60,7 +60,7 @@ param roleAssignments roleAssignmentType param rotationPolicy object = {} @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true var builtInRoleNames = { Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') @@ -79,7 +79,7 @@ var builtInRoleNames = { 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') } -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' properties: { mode: 'Incremental' diff --git a/avm/res/key-vault/vault/key/main.json b/avm/res/key-vault/vault/key/main.json index fc30879a24..a54c048d48 100644 --- a/avm/res/key-vault/vault/key/main.json +++ b/avm/res/key-vault/vault/key/main.json @@ -180,7 +180,7 @@ "description": "Optional. Key rotation policy properties object." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -208,7 +208,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/key-vault/vault/main.bicep b/avm/res/key-vault/vault/main.bicep index d39bd08caf..98a9fc5725 100644 --- a/avm/res/key-vault/vault/main.bicep +++ b/avm/res/key-vault/vault/main.bicep @@ -85,7 +85,7 @@ param tags object = {} param diagnosticSettings diagnosticSettingType @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true // =========== // // Variables // @@ -122,7 +122,7 @@ var enableReferencedModulesTelemetry = false // ============ // // Dependencies // // ============ // -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' properties: { mode: 'Incremental' @@ -203,7 +203,7 @@ module keyVault_accessPolicies 'access-policy/main.bicep' = if (!empty(accessPol params: { keyVaultName: keyVault.name accessPolicies: formattedAccessPolicies - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry } } @@ -219,7 +219,7 @@ module keyVault_secrets 'secret/main.bicep' = [for (secret, index) in secretList contentType: contains(secret, 'contentType') ? secret.contentType : '' tags: contains(secret, 'tags') ? secret.tags : {} roleAssignments: contains(secret, 'roleAssignments') ? secret.roleAssignments : [] - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry } }] @@ -237,7 +237,7 @@ module keyVault_keys 'key/main.bicep' = [for (key, index) in keys: { kty: contains(key, 'kty') ? key.kty : 'EC' tags: contains(key, 'tags') ? key.tags : {} roleAssignments: contains(key, 'roleAssignments') ? key.roleAssignments : [] - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry rotationPolicy: contains(key, 'rotationPolicy') ? key.rotationPolicy : {} } }] @@ -251,7 +251,7 @@ module keyVault_privateEndpoints '../../network/private-endpoint/main.bicep' = [ name: privateEndpoint.?name ?? 'pe-${last(split(keyVault.id, '/'))}-${privateEndpoint.service}-${index}' serviceResourceId: keyVault.id subnetResourceId: privateEndpoint.subnetResourceId - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneResourceIds: privateEndpoint.?privateDnsZoneResourceIds ?? [] @@ -412,5 +412,5 @@ type privateEndpointType = { manualPrivateLinkServiceConnections: array? @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') - enableDefaultTelemetry: bool? + enableTelemetry: bool? }[]? diff --git a/avm/res/key-vault/vault/main.json b/avm/res/key-vault/vault/main.json index 1879f1333c..e0e2297d6c 100644 --- a/avm/res/key-vault/vault/main.json +++ b/avm/res/key-vault/vault/main.json @@ -315,7 +315,7 @@ "description": "Optional. Manual PrivateLink Service Connections." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "nullable": true, "metadata": { @@ -496,7 +496,7 @@ "description": "Optional. The diagnostic settings of the service." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -538,7 +538,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]", @@ -652,7 +652,7 @@ "accessPolicies": { "value": "[variables('formattedAccessPolicies')]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } }, @@ -683,7 +683,7 @@ "description": "Optional. An array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -707,7 +707,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", @@ -787,7 +787,7 @@ "contentType": "[if(contains(variables('secretList')[copyIndex()], 'contentType'), createObject('value', variables('secretList')[copyIndex()].contentType), createObject('value', ''))]", "tags": "[if(contains(variables('secretList')[copyIndex()], 'tags'), createObject('value', variables('secretList')[copyIndex()].tags), createObject('value', createObject()))]", "roleAssignments": "[if(contains(variables('secretList')[copyIndex()], 'roleAssignments'), createObject('value', variables('secretList')[copyIndex()].roleAssignments), createObject('value', createArray()))]", - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } }, @@ -923,7 +923,7 @@ "description": "Required. The value of the secret. NOTE: \"value\" will never be returned from the service, as APIs using this model are is intended for internal use in ARM deployments. Users should use the data-plane REST service for interaction with vault secrets." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -958,7 +958,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", @@ -1076,7 +1076,7 @@ "kty": "[if(contains(parameters('keys')[copyIndex()], 'kty'), createObject('value', parameters('keys')[copyIndex()].kty), createObject('value', 'EC'))]", "tags": "[if(contains(parameters('keys')[copyIndex()], 'tags'), createObject('value', parameters('keys')[copyIndex()].tags), createObject('value', createObject()))]", "roleAssignments": "[if(contains(parameters('keys')[copyIndex()], 'roleAssignments'), createObject('value', parameters('keys')[copyIndex()].roleAssignments), createObject('value', createArray()))]", - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" }, "rotationPolicy": "[if(contains(parameters('keys')[copyIndex()], 'rotationPolicy'), createObject('value', parameters('keys')[copyIndex()].rotationPolicy), createObject('value', createObject()))]" @@ -1263,7 +1263,7 @@ "description": "Optional. Key rotation policy properties object." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -1291,7 +1291,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", @@ -1411,7 +1411,7 @@ "subnetResourceId": { "value": "[parameters('privateEndpoints')[copyIndex()].subnetResourceId]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" }, "location": { @@ -1626,7 +1626,7 @@ "description": "Optional. Manual PrivateLink Service Connections." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -1651,7 +1651,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]", @@ -1751,7 +1751,7 @@ "privateEndpointName": { "value": "[parameters('name')]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } }, @@ -1790,7 +1790,7 @@ "description": "Optional. The name of the private DNS zone group." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -1814,7 +1814,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/key-vault/vault/secret/README.md b/avm/res/key-vault/vault/secret/README.md index bb5b627773..fceb24be70 100644 --- a/avm/res/key-vault/vault/secret/README.md +++ b/avm/res/key-vault/vault/secret/README.md @@ -39,7 +39,7 @@ This module deploys a Key Vault Secret. | `attributesExp` | int | `-1` | Expiry date in seconds since 1970-01-01T00:00:00Z. For security reasons, it is recommended to set an expiration date whenever possible. | | `attributesNbf` | int | `-1` | Not before date in seconds since 1970-01-01T00:00:00Z. | | `contentType` | securestring | `''` | The content type of the secret. | -| `enableDefaultTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | +| `enableTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | | `roleAssignments` | array | `[]` | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `tags` | object | `{object}` | Resource tags. | diff --git a/avm/res/key-vault/vault/secret/main.bicep b/avm/res/key-vault/vault/secret/main.bicep index fce1cf9bf1..2a3cd0e21a 100644 --- a/avm/res/key-vault/vault/secret/main.bicep +++ b/avm/res/key-vault/vault/secret/main.bicep @@ -29,7 +29,7 @@ param contentType string = '' param value string @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') param roleAssignments array @@ -51,7 +51,7 @@ var builtInRoleNames = { 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') } -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' properties: { mode: 'Incremental' diff --git a/avm/res/key-vault/vault/secret/main.json b/avm/res/key-vault/vault/secret/main.json index a2ea49b35f..76f67d1134 100644 --- a/avm/res/key-vault/vault/secret/main.json +++ b/avm/res/key-vault/vault/secret/main.json @@ -130,7 +130,7 @@ "description": "Required. The value of the secret. NOTE: \"value\" will never be returned from the service, as APIs using this model are is intended for internal use in ARM deployments. Users should use the data-plane REST service for interaction with vault secrets." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -165,7 +165,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/key-vault/vault/tests/e2e/defaults/main.test.bicep b/avm/res/key-vault/vault/tests/e2e/defaults/main.test.bicep index 54f7387a13..839fa7c640 100644 --- a/avm/res/key-vault/vault/tests/e2e/defaults/main.test.bicep +++ b/avm/res/key-vault/vault/tests/e2e/defaults/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'kvvd' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -39,7 +39,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}002' location: location // Only for testing purposes diff --git a/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep b/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep index 82c9f58e11..4b740d42b2 100644 --- a/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep +++ b/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'kvvmax' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -63,7 +63,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}002' location: location accessPolicies: [ diff --git a/avm/res/key-vault/vault/tests/e2e/private endpoint/main.test.bicep b/avm/res/key-vault/vault/tests/e2e/private endpoint/main.test.bicep index 0e1e2bfc20..ffb79b9dad 100644 --- a/avm/res/key-vault/vault/tests/e2e/private endpoint/main.test.bicep +++ b/avm/res/key-vault/vault/tests/e2e/private endpoint/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'kvvpe' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -48,7 +48,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' location: location privateEndpoints: [ diff --git a/avm/res/key-vault/vault/tests/e2e/waf-aligned/main.test.bicep b/avm/res/key-vault/vault/tests/e2e/waf-aligned/main.test.bicep index 45b2d61d7e..ef7145be6f 100644 --- a/avm/res/key-vault/vault/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/key-vault/vault/tests/e2e/waf-aligned/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'kvvwaf' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -63,7 +63,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}002' location: location accessPolicies: [ diff --git a/avm/res/network/private-endpoint/README.md b/avm/res/network/private-endpoint/README.md index b01d2087b3..f576f2c7e9 100644 --- a/avm/res/network/private-endpoint/README.md +++ b/avm/res/network/private-endpoint/README.md @@ -47,7 +47,7 @@ The following resources are required to be able to deploy this resource: | `applicationSecurityGroupResourceIds` | array | `[]` | | Application security groups in which the private endpoint IP configuration is included. | | `customDnsConfigs` | array | `[]` | | Custom DNS configurations. | | `customNetworkInterfaceName` | string | `''` | | The custom name of the network interface attached to the private endpoint. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `enableTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | | `ipConfigurations` | array | `[]` | | A list of IP configurations of the private endpoint. This will be used to map to the First Party Service endpoints. | | `location` | string | `[resourceGroup().location]` | | Location for all Resources. | | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | @@ -312,7 +312,7 @@ module privateEndpoint './network/private-endpoint/main.bicep' = { '' ] customNetworkInterfaceName: 'npecom001nic' - enableDefaultTelemetry: '' + enableTelemetry: '' ipConfigurations: [ { name: 'myIPconfig' @@ -379,8 +379,8 @@ module privateEndpoint './network/private-endpoint/main.bicep' = { "customNetworkInterfaceName": { "value": "npecom001nic" }, - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" }, "ipConfigurations": { "value": [ @@ -443,7 +443,7 @@ module privateEndpoint './network/private-endpoint/main.bicep' = { serviceResourceId: '' subnetResourceId: '' // Non-required parameters - enableDefaultTelemetry: '' + enableTelemetry: '' } } ``` @@ -476,8 +476,8 @@ module privateEndpoint './network/private-endpoint/main.bicep' = { "value": "" }, // Non-required parameters - "enableDefaultTelemetry": { - "value": "" + "enableTelemetry": { + "value": "" } } } diff --git a/avm/res/network/private-endpoint/main.bicep b/avm/res/network/private-endpoint/main.bicep index 3d60ffe432..dd9e966daf 100644 --- a/avm/res/network/private-endpoint/main.bicep +++ b/avm/res/network/private-endpoint/main.bicep @@ -50,7 +50,7 @@ param customDnsConfigs array = [] param manualPrivateLinkServiceConnections array = [] @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true var builtInRoleNames = { Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') @@ -67,7 +67,7 @@ var builtInRoleNames = { var enableReferencedModulesTelemetry = false -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' properties: { mode: 'Incremental' @@ -112,7 +112,7 @@ module privateEndpoint_privateDnsZoneGroup 'private-dns-zone-group/main.bicep' = params: { privateDNSResourceIds: privateDnsZoneResourceIds privateEndpointName: privateEndpoint.name - enableDefaultTelemetry: enableReferencedModulesTelemetry + enableTelemetry: enableReferencedModulesTelemetry } } diff --git a/avm/res/network/private-endpoint/main.json b/avm/res/network/private-endpoint/main.json index 49b5d93d9e..31adac830e 100644 --- a/avm/res/network/private-endpoint/main.json +++ b/avm/res/network/private-endpoint/main.json @@ -179,7 +179,7 @@ "description": "Optional. Manual PrivateLink Service Connections." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -204,7 +204,7 @@ }, "resources": { "defaultTelemetry": { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]", @@ -304,7 +304,7 @@ "privateEndpointName": { "value": "[parameters('name')]" }, - "enableDefaultTelemetry": { + "enableTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } }, @@ -343,7 +343,7 @@ "description": "Optional. The name of the private DNS zone group." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -367,7 +367,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/network/private-endpoint/private-dns-zone-group/README.md b/avm/res/network/private-endpoint/private-dns-zone-group/README.md index e1d46b8986..f4cc089772 100644 --- a/avm/res/network/private-endpoint/private-dns-zone-group/README.md +++ b/avm/res/network/private-endpoint/private-dns-zone-group/README.md @@ -33,7 +33,7 @@ This module deploys a Private Endpoint Private DNS Zone Group. | Parameter Name | Type | Default Value | Description | | :-- | :-- | :-- | :-- | -| `enableDefaultTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | +| `enableTelemetry` | bool | `True` | Enable telemetry via a Globally Unique Identifier (GUID). | | `name` | string | `'default'` | The name of the private DNS zone group. | diff --git a/avm/res/network/private-endpoint/private-dns-zone-group/main.bicep b/avm/res/network/private-endpoint/private-dns-zone-group/main.bicep index 316f0800b6..176006df6a 100644 --- a/avm/res/network/private-endpoint/private-dns-zone-group/main.bicep +++ b/avm/res/network/private-endpoint/private-dns-zone-group/main.bicep @@ -14,9 +14,9 @@ param privateDNSResourceIds array param name string = 'default' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' properties: { mode: 'Incremental' diff --git a/avm/res/network/private-endpoint/private-dns-zone-group/main.json b/avm/res/network/private-endpoint/private-dns-zone-group/main.json index ffa90e33b0..857abbb9d6 100644 --- a/avm/res/network/private-endpoint/private-dns-zone-group/main.json +++ b/avm/res/network/private-endpoint/private-dns-zone-group/main.json @@ -33,7 +33,7 @@ "description": "Optional. The name of the private DNS zone group." } }, - "enableDefaultTelemetry": { + "enableTelemetry": { "type": "bool", "defaultValue": true, "metadata": { @@ -57,7 +57,7 @@ }, "resources": [ { - "condition": "[parameters('enableDefaultTelemetry')]", + "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2021-04-01", "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name))]", diff --git a/avm/res/network/private-endpoint/tests/e2e/defaults/main.test.bicep b/avm/res/network/private-endpoint/tests/e2e/defaults/main.test.bicep index 4a020394be..327f4a6d2d 100644 --- a/avm/res/network/private-endpoint/tests/e2e/defaults/main.test.bicep +++ b/avm/res/network/private-endpoint/tests/e2e/defaults/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'nped' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -49,7 +49,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' location: location groupIds: [ diff --git a/avm/res/network/private-endpoint/tests/e2e/max/main.test.bicep b/avm/res/network/private-endpoint/tests/e2e/max/main.test.bicep index 7178513116..e19d326fae 100644 --- a/avm/res/network/private-endpoint/tests/e2e/max/main.test.bicep +++ b/avm/res/network/private-endpoint/tests/e2e/max/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'npemax' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -51,7 +51,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' location: location groupIds: [ diff --git a/avm/res/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep b/avm/res/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep index 02de88a3fb..e3cd403721 100644 --- a/avm/res/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/network/private-endpoint/tests/e2e/waf-aligned/main.test.bicep @@ -15,7 +15,7 @@ param location string = deployment().location param serviceShort string = 'npewaf' @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true +param enableTelemetry bool = true @description('Optional. A token to inject into the name of each resource.') param namePrefix string = '[[namePrefix]]' @@ -51,7 +51,7 @@ module testDeployment '../../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { - enableDefaultTelemetry: enableDefaultTelemetry + enableTelemetry: enableTelemetry name: '${namePrefix}${serviceShort}001' location: location groupIds: [