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

AlexanderSehr · web-flow · commit 232d1ab2d3c5 · 2025-02-17T08:51:56.000+01:00
diff --git a/docs/static/includes/interfaces/bicep/int.cmk.udt.schema1.bicep b/docs/static/includes/interfaces/bicep/int.cmk.udt.schema1.bicep
@@ -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]
   )
 }
 
diff --git a/docs/static/includes/interfaces/bicep/int.cmk.udt.schema2.bicep b/docs/static/includes/interfaces/bicep/int.cmk.udt.schema2.bicep
@@ -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]
   )
 }
 
diff --git a/docs/static/includes/interfaces/bicep/int.secExp.output.bicep b/docs/static/includes/interfaces/bicep/int.secExp.output.bicep
@@ -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
 )
diff --git a/docs/static/includes/interfaces/bicep/int.secExp.udt.schema.bicep b/docs/static/includes/interfaces/bicep/int.secExp.udt.schema.bicep
@@ -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')

Original file line number	Diff line number	Diff line change
`@@ -11,22 +11,22 @@ param customerManagedKey customerManagedKeyType?`
`11`	`11`	`// ============= //`
`12`	`12`
`13`	`13`	`resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) {`
`14`		`- name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/'))`
	`14`	`+ name: last(split((customerManagedKey.?keyVaultResourceId!), '/'))`
`15`	`15`	`scope: resourceGroup(`
`16`		`- split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2],`
`17`		`- split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4]`
	`16`	`+ split(customerManagedKey.?keyVaultResourceId!, '/')[2],`
	`17`	`+ split(customerManagedKey.?keyVaultResourceId!, '/')[4]`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) {`
`21`		`- name: customerManagedKey.?keyName ?? 'dummyKey'`
	`21`	`+ name: customerManagedKey.?keyName!`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) {`
`26`		`- name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/'))`
	`26`	`+ name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/'))`
`27`	`27`	`scope: resourceGroup(`
`28`		`- split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2],`
`29`		`- split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4]`
	`28`	`+ split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2],`
	`29`	`+ split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4]`
`30`	`30`	`)`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -10,22 +10,22 @@ param customerManagedKey customerManagedKeyWithAutoRotateType?`
`10`	`10`	`// ============= //`
`11`	`11`
`12`	`12`	`resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) {`
`13`		`- name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/'))`
	`13`	`+ name: last(split((customerManagedKey.?keyVaultResourceId!), '/'))`
`14`	`14`	`scope: resourceGroup(`
`15`		`- split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2],`
`16`		`- split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4]`
	`15`	`+ split(customerManagedKey.?keyVaultResourceId!, '/')[2],`
	`16`	`+ split(customerManagedKey.?keyVaultResourceId!, '/')[4]`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) {`
`20`		`- name: customerManagedKey.?keyName ?? 'dummyKey'`
	`20`	`+ name: customerManagedKey.?keyName!`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) {`
`25`		`- name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/'))`
	`25`	`+ name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/'))`
`26`	`26`	`scope: resourceGroup(`
`27`		`- split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2],`
`28`		`- split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4]`
	`27`	`+ split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2],`
	`28`	`+ split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4]`
`29`	`29`	`)`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ output exportedSecrets object = >deploymentReference<.outputs.exportedSecrets`
`6`	`6`	`output specificSecret string = >deploymentReference<.outputs.exportedSecrets.>secretToExport1<Name.secretResourceId`
`7`	`7`
`8`	`8`	`// Get the resource Ids of all secrets set`
`9`		`-output exportedSecretResourceIds array = map(`
	`9`	`+output exportedSecretResourceIds string[] = map(`
`10`	`10`	`items(>deploymentReference<.outputs.exportedSecrets),`
`11`	`11`	`item => item.value.secretResourceId`
`12`	`12`	`)`