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.

Sign up for GitHub

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: Fix for attributes in key-vault/vault #2758 #3039

Merged
merged 31 commits into from
Aug 13, 2024
Merged

fix: Fix for attributes in key-vault/vault #2758 #3039

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fe017c1
updating Test Case s location to fix Pipeline
ChrisSidebotham Dec 12, 2023
657311c
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Dec 18, 2023
c5f6e4f
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Dec 22, 2023
018c016
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Jan 4, 2024
d587154
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Jan 17, 2024
18a9a54
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Jan 30, 2024
de4e665
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Feb 4, 2024
8994eff
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Feb 14, 2024
88df6f6
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Feb 15, 2024
0e3020f
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Feb 28, 2024
40614c1
Update forwardTo property to null if empty
ChrisSidebotham Feb 28, 2024
4240d6c
Update templateHash values in Service Bus Namespace and Topic
ChrisSidebotham Feb 28, 2024
6e16d58
Merge branch 'main' into anchor
ChrisSidebotham Mar 4, 2024
d41dec0
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Mar 4, 2024
689f23d
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Apr 5, 2024
27de0ec
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Apr 11, 2024
3249154
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Apr 12, 2024
65802d0
Merge branch 'Azure:main' into anchor
ChrisSidebotham May 8, 2024
8a0d70b
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 21, 2024
dc5e12d
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 22, 2024
379534f
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 22, 2024
77e2f8c
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 23, 2024
6e0b216
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 24, 2024
e4cf2a0
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham May 29, 2024
bacee7d
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Jun 12, 2024
e8c9b85
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Jun 26, 2024
4ca1290
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Aug 1, 2024
3211b7c
Merge branch 'main' of https://github.com/Azure/bicep-registry-module…
ChrisSidebotham Aug 13, 2024
bb507f9
#2578
ChrisSidebotham Aug 13, 2024
7ec58b0
typo
ChrisSidebotham Aug 13, 2024
88d09f1
typo
ChrisSidebotham Aug 13, 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
12 changes: 6 additions & 6 deletions avm/res/key-vault/vault/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ module keyVault_secrets 'secret/main.bicep' = [
name: secret.name
value: secret.value
keyVaultName: keyVault.name
attributesEnabled: secret.?attributesEnabled
attributesExp: secret.?attributesExp
attributesNbf: secret.?attributesNbf
attributesEnabled: secret.?atrributes.?enabled
attributesExp: secret.?atrributes.?exp
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
attributesNbf: secret.?atrributes.?nbf
contentType: secret.?contentType
tags: secret.?tags ?? tags
roleAssignments: secret.?roleAssignments
Expand All @@ -286,9 +286,9 @@ module keyVault_keys 'key/main.bicep' = [
params: {
name: key.name
keyVaultName: keyVault.name
attributesEnabled: key.?attributesEnabled
attributesExp: key.?attributesExp
attributesNbf: key.?attributesNbf
attributesEnabled: key.?attributes.?enab
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
attributesExp: key.?atrributes.?exp
attributesNbf: key.?atrributes.?nbf
curveName: (key.?kty != 'RSA' && key.?kty != 'RSA-HSM') ? (key.?curveName ?? 'P-256') : null
keyOps: key.?keyOps
keySize: (key.?kty == 'RSA' || key.?kty == 'RSA-HSM') ? (key.?keySize ?? 4096) : null
Expand Down
14 changes: 7 additions & 7 deletions avm/res/key-vault/vault/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "17375579299346578014"
"templateHash": "5007662804339002384"
},
"name": "Key Vaults",
"description": "This module deploys a Key Vault.",
Expand Down Expand Up @@ -1445,13 +1445,13 @@
"value": "[parameters('name')]"
},
"attributesEnabled": {
"value": "[tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'attributesEnabled')]"
"value": "[tryGet(tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'atrributes'), 'enabled')]"
},
"attributesExp": {
"value": "[tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'attributesExp')]"
"value": "[tryGet(tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'atrributes'), 'exp')]"
},
"attributesNbf": {
"value": "[tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'attributesNbf')]"
"value": "[tryGet(tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'atrributes'), 'nbf')]"
},
"contentType": {
"value": "[tryGet(coalesce(parameters('secrets'), createArray())[copyIndex()], 'contentType')]"
Expand Down Expand Up @@ -1732,13 +1732,13 @@
"value": "[parameters('name')]"
},
"attributesEnabled": {
"value": "[tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'attributesEnabled')]"
"value": "[tryGet(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'attributes'), 'enab')]"
},
"attributesExp": {
"value": "[tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'attributesExp')]"
"value": "[tryGet(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'atrributes'), 'exp')]"
},
"attributesNbf": {
"value": "[tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'attributesNbf')]"
"value": "[tryGet(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'atrributes'), 'nbf')]"
},
"curveName": "[if(and(not(equals(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'kty'), 'RSA')), not(equals(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'kty'), 'RSA-HSM'))), createObject('value', coalesce(tryGet(coalesce(parameters('keys'), createArray())[copyIndex()], 'curveName'), 'P-256')), createObject('value', null()))]",
"keyOps": {
Expand Down
Loading