Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding tenant-specific params for e2e #3517

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions avm/res/fabric/capacity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module capacity 'br/public:avm/res/fabric/capacity:<version>' = {
params: {
// Required parameters
adminMembers: [
'[email protected]'
'<fabricCapacityAdminEmail>'
]
name: 'fcmin001'
// Non-required parameters
Expand All @@ -66,7 +66,7 @@ module capacity 'br/public:avm/res/fabric/capacity:<version>' = {
// Required parameters
"adminMembers": {
"value": [
"[email protected]"
"<fabricCapacityAdminEmail>"
]
},
"name": {
Expand All @@ -92,7 +92,7 @@ using 'br/public:avm/res/fabric/capacity:<version>'

// Required parameters
param adminMembers = [
'[email protected]'
'<fabricCapacityAdminEmail>'
]
param name = 'fcmin001'
// Non-required parameters
Expand All @@ -117,7 +117,7 @@ module capacity 'br/public:avm/res/fabric/capacity:<version>' = {
params: {
// Required parameters
adminMembers: [
'[email protected]'
'<fabricCapacityAdminEmail>'
]
name: 'fcwaf001'
// Non-required parameters
Expand All @@ -142,7 +142,7 @@ module capacity 'br/public:avm/res/fabric/capacity:<version>' = {
// Required parameters
"adminMembers": {
"value": [
"[email protected]"
"<fabricCapacityAdminEmail>"
]
},
"name": {
Expand Down Expand Up @@ -171,7 +171,7 @@ using 'br/public:avm/res/fabric/capacity:<version>'

// Required parameters
param adminMembers = [
'[email protected]'
'<fabricCapacityAdminEmail>'
]
param name = 'fcwaf001'
// Non-required parameters
Expand All @@ -188,7 +188,6 @@ param skuName = 'F64'

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`adminMembers`](#parameter-adminmembers) | array | List of admin members. Format: ["[email protected]"]. |
| [`name`](#parameter-name) | string | Name of the resource to create. |

**Optional parameters**
Expand All @@ -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: ["[email protected]"].
**Rquired parameters**

- Required: Yes
- Type: array
| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`adminMembers`](#parameter-adminmembers) | array | List of admin members. Format: ["[email protected]"]. |

### Parameter: `name`

Expand Down Expand Up @@ -276,6 +274,13 @@ Tags of the resource.
- Required: No
- Type: object

### Parameter: `adminMembers`

List of admin members. Format: ["[email protected]"].

- Required: Yes
- Type: array

## Outputs

| Output | Type | Description |
Expand Down
2 changes: 1 addition & 1 deletion avm/res/fabric/capacity/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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: ["[email protected]"].')
@description('Rquired. List of admin members. Format: ["[email protected]"].')
param adminMembers array

@description('Optional. Enable/Disable usage telemetry for module.')
Expand Down
6 changes: 3 additions & 3 deletions avm/res/fabric/capacity/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -66,7 +66,7 @@
"adminMembers": {
"type": "array",
"metadata": {
"description": "Required. List of admin members. Format: [\"[email protected]\"]."
"description": "Rquired. List of admin members. Format: [\"[email protected]\"]."
}
},
"enableTelemetry": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
// ============ //
Expand All @@ -44,7 +48,7 @@ module testDeployment '../../../main.bicep' = [
name: '${namePrefix}${serviceShort}001'
location: resourceLocation
adminMembers: [
'[email protected]'
fabricCapacityAdminEmail
]
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
// ============ //
Expand All @@ -45,7 +49,7 @@ module testDeployment '../../../main.bicep' = [
location: resourceLocation
skuName: 'F64'
adminMembers: [
'[email protected]'
fabricCapacityAdminEmail
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions avm/res/fabric/capacity/version.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://aka.ms/bicep-registry-module-version-file-schema#",
"version": "0.1",
"version": "0.2",
"pathFilters": [
"./main.json"
]
}
}
Loading