diff --git a/avm/res/fabric/capacity/README.md b/avm/res/fabric/capacity/README.md index 8cec8824cb..fe004ee863 100644 --- a/avm/res/fabric/capacity/README.md +++ b/avm/res/fabric/capacity/README.md @@ -42,7 +42,7 @@ module capacity 'br/public:avm/res/fabric/capacity:' = { params: { // Required parameters adminMembers: [ - 'mattschmitt@microsoft.com' + '' ] name: 'fcmin001' // Non-required parameters @@ -66,7 +66,7 @@ module capacity 'br/public:avm/res/fabric/capacity:' = { // Required parameters "adminMembers": { "value": [ - "mattschmitt@microsoft.com" + "" ] }, "name": { @@ -92,7 +92,7 @@ using 'br/public:avm/res/fabric/capacity:' // Required parameters param adminMembers = [ - 'mattschmitt@microsoft.com' + '' ] param name = 'fcmin001' // Non-required parameters @@ -117,7 +117,7 @@ module capacity 'br/public:avm/res/fabric/capacity:' = { params: { // Required parameters adminMembers: [ - 'mattschmitt@microsoft.com' + '' ] name: 'fcwaf001' // Non-required parameters @@ -142,7 +142,7 @@ module capacity 'br/public:avm/res/fabric/capacity:' = { // Required parameters "adminMembers": { "value": [ - "mattschmitt@microsoft.com" + "" ] }, "name": { @@ -171,7 +171,7 @@ using 'br/public:avm/res/fabric/capacity:' // Required parameters param adminMembers = [ - 'mattschmitt@microsoft.com' + '' ] param name = 'fcwaf001' // Non-required parameters @@ -188,7 +188,6 @@ param skuName = 'F64' | Parameter | Type | Description | | :-- | :-- | :-- | -| [`adminMembers`](#parameter-adminmembers) | array | List of admin members. Format: ["something@domain.com"]. | | [`name`](#parameter-name) | string | Name of the resource to create. | **Optional parameters** @@ -201,12 +200,11 @@ param skuName = 'F64' | [`skuTier`](#parameter-skutier) | string | SKU name of the Fabric resource. | | [`tags`](#parameter-tags) | object | Tags of the resource. | -### Parameter: `adminMembers` - -List of admin members. Format: ["something@domain.com"]. +**Rquired parameters** -- Required: Yes -- Type: array +| Parameter | Type | Description | +| :-- | :-- | :-- | +| [`adminMembers`](#parameter-adminmembers) | array | List of admin members. Format: ["something@domain.com"]. | ### Parameter: `name` @@ -276,6 +274,13 @@ Tags of the resource. - Required: No - Type: object +### Parameter: `adminMembers` + +List of admin members. Format: ["something@domain.com"]. + +- Required: Yes +- Type: array + ## Outputs | Output | Type | Description | diff --git a/avm/res/fabric/capacity/main.bicep b/avm/res/fabric/capacity/main.bicep index 3e855ad580..b3b275e374 100644 --- a/avm/res/fabric/capacity/main.bicep +++ b/avm/res/fabric/capacity/main.bicep @@ -31,7 +31,7 @@ param skuName string = 'F2' @description('Optional. SKU name of the Fabric resource.') param skuTier string = 'Fabric' -@description('Required. List of admin members. Format: ["something@domain.com"].') +@description('Rquired. List of admin members. Format: ["something@domain.com"].') param adminMembers array @description('Optional. Enable/Disable usage telemetry for module.') diff --git a/avm/res/fabric/capacity/main.json b/avm/res/fabric/capacity/main.json index c6d0daee58..9f51831ded 100644 --- a/avm/res/fabric/capacity/main.json +++ b/avm/res/fabric/capacity/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.30.3.12046", - "templateHash": "11718641793898572278" + "version": "0.28.1.47646", + "templateHash": "14524923207315988774" }, "name": "Fabric Capacities", "description": "This module deploys Fabric capacities, which provide the compute resources for all the experiences in Fabric.", @@ -66,7 +66,7 @@ "adminMembers": { "type": "array", "metadata": { - "description": "Required. List of admin members. Format: [\"something@domain.com\"]." + "description": "Rquired. List of admin members. Format: [\"something@domain.com\"]." } }, "enableTelemetry": { diff --git a/avm/res/fabric/capacity/tests/e2e/defaults/main.test.bicep b/avm/res/fabric/capacity/tests/e2e/defaults/main.test.bicep index a0057419f4..48768e3cba 100644 --- a/avm/res/fabric/capacity/tests/e2e/defaults/main.test.bicep +++ b/avm/res/fabric/capacity/tests/e2e/defaults/main.test.bicep @@ -20,6 +20,10 @@ param serviceShort string = 'fcmin' @description('Optional. A token to inject into the name of each resource. This value can be automatically injected by the CI.') param namePrefix string = '#_namePrefix_#' +@description('Required. The admin e-mail for the fabric capacity. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-fabricCapacityAdminEmail\'.') +@secure() +param fabricCapacityAdminEmail string = '' + // ============ // // Dependencies // // ============ // @@ -44,7 +48,7 @@ module testDeployment '../../../main.bicep' = [ name: '${namePrefix}${serviceShort}001' location: resourceLocation adminMembers: [ - 'mattschmitt@microsoft.com' + fabricCapacityAdminEmail ] } } diff --git a/avm/res/fabric/capacity/tests/e2e/waf-aligned/main.test.bicep b/avm/res/fabric/capacity/tests/e2e/waf-aligned/main.test.bicep index 903ccd6b35..cb64a6e15d 100644 --- a/avm/res/fabric/capacity/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/fabric/capacity/tests/e2e/waf-aligned/main.test.bicep @@ -20,6 +20,10 @@ param serviceShort string = 'fcwaf' @description('Optional. A token to inject into the name of each resource. This value can be automatically injected by the CI.') param namePrefix string = '#_namePrefix_#' +@description('Required. The admin e-mail for the fabric capacity. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-fabricCapacityAdminEmail\'.') +@secure() +param fabricCapacityAdminEmail string = '' + // ============ // // Dependencies // // ============ // @@ -45,7 +49,7 @@ module testDeployment '../../../main.bicep' = [ location: resourceLocation skuName: 'F64' adminMembers: [ - 'mattschmitt@microsoft.com' + fabricCapacityAdminEmail ] } } diff --git a/avm/res/fabric/capacity/version.json b/avm/res/fabric/capacity/version.json index 8def869ede..729ac87673 100644 --- a/avm/res/fabric/capacity/version.json +++ b/avm/res/fabric/capacity/version.json @@ -1,7 +1,7 @@ { "$schema": "https://aka.ms/bicep-registry-module-version-file-schema#", - "version": "0.1", + "version": "0.2", "pathFilters": [ "./main.json" ] -} +} \ No newline at end of file