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

fix: Add support for CI secret #3507

Merged
merged 73 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
cf5fede
Adding new workflow
hundredacres Mar 25, 2024
ff7c683
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 26, 2024
c883d2b
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 27, 2024
5d11b9b
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 28, 2024
abcb62e
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 8, 2024
318eacd
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 22, 2024
98c9667
Merge branch 'Azure:main' into main
hundredacres Apr 24, 2024
d4f9aaa
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 29, 2024
cf5d59a
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 30, 2024
0f43d8b
Merge branch 'Azure:main' into main
hundredacres May 1, 2024
a84760a
chore: shortening module statuses (#1809)
matebarabas May 1, 2024
d992d08
fix: repair automatic assignment of issues (#1817)
rahalan May 2, 2024
5b95ae1
fix: Removed orphaned file & reference (#1822)
JFolberth May 2, 2024
e9f11ba
Merge branch 'Azure:main' into main
hundredacres May 2, 2024
2a3fd4c
Merge remote-tracking branch 'upstream/main'
hundredacres May 6, 2024
9061cfe
Merge remote-tracking branch 'upstream/main'
hundredacres May 8, 2024
9893b9a
Merge remote-tracking branch 'upstream/main'
hundredacres May 10, 2024
15ea104
Merge branch 'Azure:main' into main
hundredacres May 14, 2024
7932e38
Merge branch 'Azure:main' into main
hundredacres May 15, 2024
fc79840
Merge remote-tracking branch 'upstream/main'
hundredacres May 16, 2024
fa79026
Merge remote-tracking branch 'upstream/main'
hundredacres May 17, 2024
dada297
Merge remote-tracking branch 'upstream/main'
hundredacres May 23, 2024
4a21db9
Merge remote-tracking branch 'upstream/main'
hundredacres May 24, 2024
279c3ae
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 5, 2024
07101e0
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 5, 2024
001dbcb
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 7, 2024
c176840
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 14, 2024
0676b50
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 17, 2024
6add63b
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 19, 2024
3e307bd
Merge branch 'Azure:main' into main
hundredacres Jun 24, 2024
8ebba67
Merge remote-tracking branch 'upstream/main'
hundredacres Jun 27, 2024
990a851
Merge remote-tracking branch 'upstream/main'
hundredacres Jul 3, 2024
f589c3b
Merge branch 'Azure:main' into main
hundredacres Jul 8, 2024
7c9743f
Merge branch 'Azure:main' into main
hundredacres Jul 9, 2024
177624f
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Jul 9, 2024
f7f45f4
Merge remote-tracking branch 'upstream/main'
hundredacres Jul 10, 2024
a60b6db
Merge branch 'Azure:main' into main
hundredacres Jul 10, 2024
f58e8c9
Merge branch 'Azure:main' into main
hundredacres Jul 11, 2024
66863e5
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Jul 11, 2024
a08709e
Merge branch 'Azure:main' into main
hundredacres Jul 16, 2024
0917b87
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Jul 17, 2024
a12b397
Merge remote-tracking branch 'upstream/main'
hundredacres Jul 24, 2024
2605fea
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 1, 2024
3b976de
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 1, 2024
ad6aabb
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 3, 2024
0ebbb51
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 5, 2024
0346ba0
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 7, 2024
09cc4b1
Merge branch 'Azure:main' into main
hundredacres Aug 16, 2024
4ba8a77
Merge branch 'Azure:main' into main
hundredacres Aug 19, 2024
2f51d54
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Aug 19, 2024
d2e3313
Merge branch 'Azure:main' into main
hundredacres Aug 20, 2024
43dd437
Merge branch 'Azure:main' into main
hundredacres Aug 23, 2024
5636011
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Aug 23, 2024
d5fa700
Merge branch 'Azure:main' into main
hundredacres Aug 27, 2024
8d4c4a6
Merge branch 'main' of https://github.com/hundredacres/bicep-registry…
hundredacres Aug 27, 2024
0b42d22
Merge remote-tracking branch 'upstream/main'
hundredacres Aug 30, 2024
febf64e
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 4, 2024
f68fdb4
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 6, 2024
7244284
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 9, 2024
6af44c0
Latest workflow changes
hundredacres Sep 10, 2024
c56500e
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 11, 2024
d85096f
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 13, 2024
b0db548
Adding new module workflow file
hundredacres Sep 13, 2024
ac285f1
Renaming workflow
hundredacres Sep 13, 2024
019b978
Removing stray workflow
hundredacres Sep 13, 2024
5791703
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 18, 2024
cd43173
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 24, 2024
8dbcb0e
Merge remote-tracking branch 'upstream/main'
hundredacres Sep 26, 2024
8dc370b
Merge remote-tracking branch 'upstream/main'
hundredacres Oct 7, 2024
e4902fb
Merge remote-tracking branch 'upstream/main'
hundredacres Oct 10, 2024
b2177ff
Updating tests to pull secret from keyvault
hundredacres Oct 10, 2024
19103b8
Removing stray chars
hundredacres Oct 10, 2024
ffb700d
Addressing latest comments
hundredacres Oct 11, 2024
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
16 changes: 8 additions & 8 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]'
'<adminMembersSecret>'
]
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]"
"<adminMembersSecret>"
]
},
"name": {
Expand All @@ -92,7 +92,7 @@ using 'br/public:avm/res/fabric/capacity:<version>'

// Required parameters
param adminMembers = [
'[email protected]'
'<adminMembersSecret>'
]
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]'
'<adminMembersSecret>'
]
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]"
"<adminMembersSecret>"
]
},
"name": {
Expand Down Expand Up @@ -171,7 +171,7 @@ using 'br/public:avm/res/fabric/capacity:<version>'

// Required parameters
param adminMembers = [
'[email protected]'
'<adminMembersSecret>'
]
param name = 'fcwaf001'
// Non-required parameters
Expand All @@ -196,7 +196,7 @@ param skuName = 'F64'
| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. |
| [`location`](#parameter-location) | string | Location for all Resources. |
| [`location`](#parameter-location) | string | Location for all resources. |
| [`skuName`](#parameter-skuname) | string | SKU tier of the Fabric resource. |
| [`skuTier`](#parameter-skutier) | string | SKU name of the Fabric resource. |
| [`tags`](#parameter-tags) | object | Tags of the resource. |
Expand Down Expand Up @@ -225,7 +225,7 @@ Enable/Disable usage telemetry for module.

### Parameter: `location`

Location for all Resources.
Location for all resources.

- Required: No
- Type: string
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 @@ -5,7 +5,7 @@ metadata owner = 'Azure/module-maintainers'
@description('Required. Name of the resource to create.')
param name string

@description('Optional. Location for all Resources.')
@description('Optional. Location for all resources.')
param location string = resourceGroup().location

@description('Optional. Tags of the resource.')
Expand Down
2 changes: 1 addition & 1 deletion avm/res/fabric/capacity/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "Optional. Location for all Resources."
"description": "Optional. Location for all resources."
}
},
"tags": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ 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. Email address used by resource. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-MySecret\'.')
eriqua marked this conversation as resolved.
Show resolved Hide resolved
@secure()
param adminMembersSecret string = ''


// ============ //
// Dependencies //
// ============ //
Expand All @@ -44,7 +49,7 @@ module testDeployment '../../../main.bicep' = [
name: '${namePrefix}${serviceShort}001'
location: resourceLocation
adminMembers: [
'[email protected]'
adminMembersSecret
]
}
}
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. Email address used by resource. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-MySecret\'.')
eriqua marked this conversation as resolved.
Show resolved Hide resolved
@secure()
param adminMembersSecret string = ''

// ============ //
// Dependencies //
// ============ //
Expand All @@ -45,7 +49,7 @@ module testDeployment '../../../main.bicep' = [
location: resourceLocation
skuName: 'F64'
adminMembers: [
'[email protected]'
adminMembersSecret
]
}
}
Expand Down