From 6b60131bc56f57b7e1c8bf5cbd33fb3433ecac99 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Fri, 21 Feb 2025 16:25:44 -0500 Subject: [PATCH 1/9] Added Customer Usage Attribution --- .../bicep/customerUsageAttribution/README.md | 21 +++++++++++++++++++ .../cuaIdManagementGroup.bicep | 11 ++++++++++ .../cuaIdResourceGroup.bicep | 11 ++++++++++ .../cuaIdSubscription.bicep | 11 ++++++++++ .../cuaIdTenant.bicep | 11 ++++++++++ .../cuaIdManagementGroup.bicep.md | 16 ++++++++++++++ .../generateddocs/cuaIdResourceGroup.bicep.md | 16 ++++++++++++++ .../generateddocs/cuaIdSubscription.bicep.md | 16 ++++++++++++++ .../generateddocs/cuaIdTenant.bicep.md | 16 ++++++++++++++ infra-as-code/bicep/main.bicep | 13 ++++++++++++ 10 files changed, 142 insertions(+) create mode 100644 infra-as-code/bicep/customerUsageAttribution/README.md create mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep create mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep create mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep create mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep create mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md create mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md create mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md create mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md diff --git a/infra-as-code/bicep/customerUsageAttribution/README.md b/infra-as-code/bicep/customerUsageAttribution/README.md new file mode 100644 index 0000000..4fd12af --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/README.md @@ -0,0 +1,21 @@ +# Module: PID + +This module creates a blank deployment which will be called from other modules. The purpose of this deployment is to create a deployment name to be used for Azure [customer usage attribution](https://learn.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution). To disable this, please see [How to disable Telemetry Tracking Using Customer Usage Attribution (PID)](https://github.com/Azure/ALZ-Bicep/wiki/CustomerUsage) + +This module does not deploy any resources + +## Parameters + +This module does not require any inputs + +## Outputs + +The module does not generate any outputs + +| Output | Type | Example | +| ------ | ---- | ------- | + +## Deployment + +This module is intended to be called from other modules as a reusable resource. + diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep new file mode 100644 index 0000000..4e6cded --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep @@ -0,0 +1,11 @@ +/* +SUMMARY: Module to add the customer usage attribution (PID) to Management Group deployments. +DESCRIPTION: This module will create a deployment at the management group level which will add the unique PID and location as the deployment name +AUTHOR/S: shaunjacob +VERSION: 1.0.0 +*/ + +targetScope = 'managementGroup' + +// This is an empty deployment by design +// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep new file mode 100644 index 0000000..b90f9af --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep @@ -0,0 +1,11 @@ +/* +SUMMARY: Module to add the customer usage attribution (PID) to Resource Group deployments. +DESCRIPTION: This module will create a deployment at the Resource Group level which will add the unique PID and location as the deployment name +AUTHOR/S: shaunjacob +VERSION: 1.0.0 +*/ + +targetScope = 'resourceGroup' + +// This is an empty deployment by design +// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep new file mode 100644 index 0000000..e11e553 --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep @@ -0,0 +1,11 @@ +/* +SUMMARY: Module to add the customer usage attribution (PID) to Subscription deployments. +DESCRIPTION: This module will create a deployment at the Subscription level which will add the unique PID and location as the deployment name +AUTHOR/S: shaunjacob +VERSION: 1.0.0 +*/ + +targetScope = 'subscription' + +// This is an empty deployment by design +// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep new file mode 100644 index 0000000..a53487c --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep @@ -0,0 +1,11 @@ +/* +SUMMARY: Module to add the customer usage attribution (PID) to Tenant deployments. +DESCRIPTION: This module will create a deployment at the Tenant level which will add the unique PID and location as the deployment name +AUTHOR/S: shaunjacob +VERSION: 1.0.0 +*/ + +targetScope = 'tenant' + +// This is an empty deployment by design +// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md new file mode 100644 index 0000000..f7f5589 --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md @@ -0,0 +1,16 @@ +# Azure template + +## Snippets + +### Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdManagementGroup.json" + }, + "parameters": {} +} +``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md new file mode 100644 index 0000000..460a655 --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md @@ -0,0 +1,16 @@ +# Azure template + +## Snippets + +### Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdResourceGroup.json" + }, + "parameters": {} +} +``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md new file mode 100644 index 0000000..e8ae6f9 --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md @@ -0,0 +1,16 @@ +# Azure template + +## Snippets + +### Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdSubscription.json" + }, + "parameters": {} +} +``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md new file mode 100644 index 0000000..58bf694 --- /dev/null +++ b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md @@ -0,0 +1,16 @@ +# Azure template + +## Snippets + +### Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "metadata": { + "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdTenant.json" + }, + "parameters": {} +} +``` diff --git a/infra-as-code/bicep/main.bicep b/infra-as-code/bicep/main.bicep index c019ac7..afe299a 100755 --- a/infra-as-code/bicep/main.bicep +++ b/infra-as-code/bicep/main.bicep @@ -11,6 +11,12 @@ param baseName string @maxLength(36) param yourPrincipalId string +@sys.description('Set Parameter to true to Opt-out of deployment telemetry.') +param parTelemetryOptOut bool = false + +// Customer Usage Attribution Id +var varCuaid = '6aa4564a-a8b7-4ced-8e57-1043a41f4747' + // ---- Log Analytics workspace ---- resource logWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: 'log-${baseName}' @@ -104,3 +110,10 @@ module webappModule 'webapp.bicep' = { aiStudio ] } + +// Optional Deployment for Customer Usage Attribution +module modCustomerUsageAttribution 'customerUsageAttribution/cuaIdResourceGroup.bicep' = if (!parTelemetryOptOut) { + #disable-next-line no-loc-expr-outside-params //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information + name: 'pid-${varCuaid}-${uniqueString(resourceGroup().location)}' + params: {} +} From b0847775afccf51e355a6c34054d7522f6f0c933 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Thu, 6 Mar 2025 13:31:52 -0500 Subject: [PATCH 2/9] Clean up of files - ReadMe update --- README.md | 5 +++-- .../cuaIdManagementGroup.bicep | 11 ----------- .../cuaIdResourceGroup.bicep | 9 +-------- .../cuaIdSubscription.bicep | 11 ----------- .../customerUsageAttribution/cuaIdTenant.bicep | 11 ----------- .../generateddocs/cuaIdManagementGroup.bicep.md | 16 ---------------- .../generateddocs/cuaIdResourceGroup.bicep.md | 16 ---------------- .../generateddocs/cuaIdSubscription.bicep.md | 16 ---------------- .../generateddocs/cuaIdTenant.bicep.md | 16 ---------------- 9 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep delete mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep delete mode 100644 infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep delete mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md delete mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md delete mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md delete mode 100644 infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md diff --git a/README.md b/README.md index 9b0ca56..5799b93 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,9 @@ The following steps are required to deploy the infrastructure from the command l BASE_NAME= ``` -1. Create a resource group and deploy the infrastructure. - +1. Create a resource group and deploy the infrastructure.
+ **_NOTE:_** There is an optional tracking ID on this deployment. To opt out of its use add the following parameter to the deployment code below: "-p parTelemetryOptOut TRUE" + ```bash RESOURCE_GROUP=rg-chat-basic-${LOCATION} az group create -l $LOCATION -n $RESOURCE_GROUP diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep deleted file mode 100644 index 4e6cded..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/cuaIdManagementGroup.bicep +++ /dev/null @@ -1,11 +0,0 @@ -/* -SUMMARY: Module to add the customer usage attribution (PID) to Management Group deployments. -DESCRIPTION: This module will create a deployment at the management group level which will add the unique PID and location as the deployment name -AUTHOR/S: shaunjacob -VERSION: 1.0.0 -*/ - -targetScope = 'managementGroup' - -// This is an empty deployment by design -// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep index b90f9af..371b232 100644 --- a/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep @@ -1,11 +1,4 @@ -/* -SUMMARY: Module to add the customer usage attribution (PID) to Resource Group deployments. -DESCRIPTION: This module will create a deployment at the Resource Group level which will add the unique PID and location as the deployment name -AUTHOR/S: shaunjacob -VERSION: 1.0.0 -*/ - targetScope = 'resourceGroup' // This is an empty deployment by design -// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution +// Reference: https://learn.microsoft.com/en-us/partner-center/marketplace-offers/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep deleted file mode 100644 index e11e553..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/cuaIdSubscription.bicep +++ /dev/null @@ -1,11 +0,0 @@ -/* -SUMMARY: Module to add the customer usage attribution (PID) to Subscription deployments. -DESCRIPTION: This module will create a deployment at the Subscription level which will add the unique PID and location as the deployment name -AUTHOR/S: shaunjacob -VERSION: 1.0.0 -*/ - -targetScope = 'subscription' - -// This is an empty deployment by design -// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep deleted file mode 100644 index a53487c..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/cuaIdTenant.bicep +++ /dev/null @@ -1,11 +0,0 @@ -/* -SUMMARY: Module to add the customer usage attribution (PID) to Tenant deployments. -DESCRIPTION: This module will create a deployment at the Tenant level which will add the unique PID and location as the deployment name -AUTHOR/S: shaunjacob -VERSION: 1.0.0 -*/ - -targetScope = 'tenant' - -// This is an empty deployment by design -// Reference: https://docs.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md deleted file mode 100644 index f7f5589..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdManagementGroup.bicep.md +++ /dev/null @@ -1,16 +0,0 @@ -# Azure template - -## Snippets - -### Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdManagementGroup.json" - }, - "parameters": {} -} -``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md deleted file mode 100644 index 460a655..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdResourceGroup.bicep.md +++ /dev/null @@ -1,16 +0,0 @@ -# Azure template - -## Snippets - -### Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdResourceGroup.json" - }, - "parameters": {} -} -``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md deleted file mode 100644 index e8ae6f9..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdSubscription.bicep.md +++ /dev/null @@ -1,16 +0,0 @@ -# Azure template - -## Snippets - -### Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdSubscription.json" - }, - "parameters": {} -} -``` diff --git a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md b/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md deleted file mode 100644 index 58bf694..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/generateddocs/cuaIdTenant.bicep.md +++ /dev/null @@ -1,16 +0,0 @@ -# Azure template - -## Snippets - -### Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "template": "infra-as-code/bicep/CRML/customerUsageAttribution/cuaIdTenant.json" - }, - "parameters": {} -} -``` From 706049532d87adac6da44fe924027fe7a0c2bca3 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:10:53 -0500 Subject: [PATCH 3/9] Delete infra-as-code/bicep/customerUsageAttribution/README.md File not needed --- .../bicep/customerUsageAttribution/README.md | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 infra-as-code/bicep/customerUsageAttribution/README.md diff --git a/infra-as-code/bicep/customerUsageAttribution/README.md b/infra-as-code/bicep/customerUsageAttribution/README.md deleted file mode 100644 index 4fd12af..0000000 --- a/infra-as-code/bicep/customerUsageAttribution/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Module: PID - -This module creates a blank deployment which will be called from other modules. The purpose of this deployment is to create a deployment name to be used for Azure [customer usage attribution](https://learn.microsoft.com/azure/marketplace/azure-partner-customer-usage-attribution). To disable this, please see [How to disable Telemetry Tracking Using Customer Usage Attribution (PID)](https://github.com/Azure/ALZ-Bicep/wiki/CustomerUsage) - -This module does not deploy any resources - -## Parameters - -This module does not require any inputs - -## Outputs - -The module does not generate any outputs - -| Output | Type | Example | -| ------ | ---- | ------- | - -## Deployment - -This module is intended to be called from other modules as a reusable resource. - From 3fbff90c960f7d956d7c764a0d961d4bf63ad053 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:16:31 -0500 Subject: [PATCH 4/9] Update README.md Co-authored-by: Chad Kittel --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5799b93..81f5304 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,9 @@ The following steps are required to deploy the infrastructure from the command l BASE_NAME= ``` -1. Create a resource group and deploy the infrastructure.
- **_NOTE:_** There is an optional tracking ID on this deployment. To opt out of its use add the following parameter to the deployment code below: "-p parTelemetryOptOut TRUE" +1. Create a resource group and deploy the infrastructure. + + *There is an optional tracking ID on this deployment. To opt out of its use, add the following parameter to the deployment code below: `-p telemetryOptOut true`.* ```bash RESOURCE_GROUP=rg-chat-basic-${LOCATION} From da136c0f342366fceb7c89851c92e386fc921e29 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:17:07 -0500 Subject: [PATCH 5/9] Update infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep Co-authored-by: Chad Kittel --- .../bicep/customerUsageAttribution/cuaIdResourceGroup.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep index 371b232..ea0e755 100644 --- a/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep +++ b/infra-as-code/bicep/customerUsageAttribution/cuaIdResourceGroup.bicep @@ -1,4 +1,4 @@ targetScope = 'resourceGroup' // This is an empty deployment by design -// Reference: https://learn.microsoft.com/en-us/partner-center/marketplace-offers/azure-partner-customer-usage-attribution +// Reference: https://learn.microsoft.com/partner-center/marketplace-offers/azure-partner-customer-usage-attribution From 81b126d0692c17f159977821926e73a9a17a96b4 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:18:00 -0500 Subject: [PATCH 6/9] Update infra-as-code/bicep/main.bicep Co-authored-by: Chad Kittel --- infra-as-code/bicep/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra-as-code/bicep/main.bicep b/infra-as-code/bicep/main.bicep index afe299a..9afb57d 100755 --- a/infra-as-code/bicep/main.bicep +++ b/infra-as-code/bicep/main.bicep @@ -11,7 +11,7 @@ param baseName string @maxLength(36) param yourPrincipalId string -@sys.description('Set Parameter to true to Opt-out of deployment telemetry.') +@description('Set to true to opt-out of deployment telemetry.') param parTelemetryOptOut bool = false // Customer Usage Attribution Id From bea4a1244dd5f6b6501110f8ebea29d35e671457 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:18:45 -0500 Subject: [PATCH 7/9] Update infra-as-code/bicep/main.bicep Co-authored-by: Chad Kittel --- infra-as-code/bicep/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra-as-code/bicep/main.bicep b/infra-as-code/bicep/main.bicep index 9afb57d..b1a22d2 100755 --- a/infra-as-code/bicep/main.bicep +++ b/infra-as-code/bicep/main.bicep @@ -12,7 +12,7 @@ param baseName string param yourPrincipalId string @description('Set to true to opt-out of deployment telemetry.') -param parTelemetryOptOut bool = false +param telemetryOptOut bool = false // Customer Usage Attribution Id var varCuaid = '6aa4564a-a8b7-4ced-8e57-1043a41f4747' From 0afe050aaa1f969e55dc5f2e83f77de061570216 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:19:36 -0500 Subject: [PATCH 8/9] Update infra-as-code/bicep/main.bicep Co-authored-by: Chad Kittel --- infra-as-code/bicep/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra-as-code/bicep/main.bicep b/infra-as-code/bicep/main.bicep index b1a22d2..6006a29 100755 --- a/infra-as-code/bicep/main.bicep +++ b/infra-as-code/bicep/main.bicep @@ -112,7 +112,7 @@ module webappModule 'webapp.bicep' = { } // Optional Deployment for Customer Usage Attribution -module modCustomerUsageAttribution 'customerUsageAttribution/cuaIdResourceGroup.bicep' = if (!parTelemetryOptOut) { +module customerUsageAttributionModule 'customerUsageAttribution/cuaIdResourceGroup.bicep' = if (!telemetryOptOut) { #disable-next-line no-loc-expr-outside-params //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information name: 'pid-${varCuaid}-${uniqueString(resourceGroup().location)}' params: {} From c9d8fbf0a98e80c72b507b3df5ba046325a83b98 Mon Sep 17 00:00:00 2001 From: MarkAnthFarr <144264759+MarkAnthFarr@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:20:06 -0500 Subject: [PATCH 9/9] Update infra-as-code/bicep/main.bicep Co-authored-by: Chad Kittel --- infra-as-code/bicep/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra-as-code/bicep/main.bicep b/infra-as-code/bicep/main.bicep index 6006a29..a19900b 100755 --- a/infra-as-code/bicep/main.bicep +++ b/infra-as-code/bicep/main.bicep @@ -113,7 +113,7 @@ module webappModule 'webapp.bicep' = { // Optional Deployment for Customer Usage Attribution module customerUsageAttributionModule 'customerUsageAttribution/cuaIdResourceGroup.bicep' = if (!telemetryOptOut) { - #disable-next-line no-loc-expr-outside-params //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information //Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information + #disable-next-line no-loc-expr-outside-params // Only to ensure telemetry data is stored in same location as deployment. See https://github.com/Azure/ALZ-Bicep/wiki/FAQ#why-are-some-linter-rules-disabled-via-the-disable-next-line-bicep-function for more information name: 'pid-${varCuaid}-${uniqueString(resourceGroup().location)}' params: {} }