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

feat: Simplified several Bicep specs as per latest DSL improvements #1858

Merged
merged 3 commits into from
Feb 17, 2025
+18 −18
Merged

feat: Simplified several Bicep specs as per latest DSL improvements #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b28194
Prepared change to PE interface
AlexanderSehr Feb 14, 2025
85b677b
Applied latest simplifations
AlexanderSehr Feb 14, 2025
dcfd045
Update to latest
AlexanderSehr Feb 14, 2025
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
14 changes: 7 additions & 7 deletions docs/static/includes/interfaces/bicep/int.cmk.udt.schema1.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ param customerManagedKey customerManagedKeyType?
// ============= //

resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) {
name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/'))
name: last(split((customerManagedKey.?keyVaultResourceId!), '/'))
scope: resourceGroup(
split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2],
split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4]
split(customerManagedKey.?keyVaultResourceId!, '/')[2],
split(customerManagedKey.?keyVaultResourceId!, '/')[4]
)

resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) {
name: customerManagedKey.?keyName ?? 'dummyKey'
name: customerManagedKey.?keyName!
}
}

resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) {
name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/'))
name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/'))
scope: resourceGroup(
split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2],
split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4]
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2],
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4]
)
}

Expand Down
14 changes: 7 additions & 7 deletions docs/static/includes/interfaces/bicep/int.cmk.udt.schema2.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ param customerManagedKey customerManagedKeyWithAutoRotateType?
// ============= //

resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) {
name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/'))
name: last(split((customerManagedKey.?keyVaultResourceId!), '/'))
scope: resourceGroup(
split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2],
split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4]
split(customerManagedKey.?keyVaultResourceId!, '/')[2],
split(customerManagedKey.?keyVaultResourceId!, '/')[4]
)

resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) {
name: customerManagedKey.?keyName ?? 'dummyKey'
name: customerManagedKey.?keyName!
}
}

resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) {
name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/'))
name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/'))
scope: resourceGroup(
split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2],
split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4]
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2],
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4]
)
}

Expand Down
2 changes: 1 addition & 1 deletion docs/static/includes/interfaces/bicep/int.secExp.output.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ output exportedSecrets object = >deploymentReference<.outputs.exportedSecrets
output specificSecret string = >deploymentReference<.outputs.exportedSecrets.>secretToExport1<Name.secretResourceId

// Get the resource Ids of all secrets set
output exportedSecretResourceIds array = map(
output exportedSecretResourceIds string[] = map(
items(>deploymentReference<.outputs.exportedSecrets),
item => item.value.secretResourceId
)
6 changes: 3 additions & 3 deletions docs/static/includes/interfaces/bicep/int.secExp.udt.schema.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ param secretsExportConfiguration secretsExportConfigurationType?
module secretsExport 'modules/keyVaultExport.bicep' = if (secretsExportConfiguration != null) {
name: '${uniqueString(deployment().name, location)}-secrets-kv'
scope: resourceGroup(
split((secretsExportConfiguration.?keyVaultResourceId ?? '//'), '/')[2],
split((secretsExportConfiguration.?keyVaultResourceId ?? '////'), '/')[4]
split(secretsExportConfiguration.?keyVaultResourceId, '/')[2],
split(secretsExportConfiguration.?keyVaultResourceId, '/')[4]
)
params: {
keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId ?? '//', '/'))
keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId, '/'))
secretsToSet: union(
[],
contains(secretsExportConfiguration!, '>secretToExport1<Name')
Expand Down
Loading