diff --git a/avm/res/synapse/workspace/CHANGELOG.md b/avm/res/synapse/workspace/CHANGELOG.md
index 61d2b34aa96..29ab0941d96 100644
--- a/avm/res/synapse/workspace/CHANGELOG.md
+++ b/avm/res/synapse/workspace/CHANGELOG.md
@@ -2,6 +2,16 @@
The latest version of the changelog can be found [here](https://github.com/Azure/bicep-registry-modules/blob/main/avm/res/synapse/workspace/CHANGELOG.md).
+## 0.14.2
+
+### Changes
+
+- Updated API versions
+
+### Breaking Changes
+
+- None
+
## 0.14.1
### Changes
diff --git a/avm/res/synapse/workspace/README.md b/avm/res/synapse/workspace/README.md
index 42949c13569..b9165bdbdd7 100644
--- a/avm/res/synapse/workspace/README.md
+++ b/avm/res/synapse/workspace/README.md
@@ -18,7 +18,7 @@ This module deploys a Synapse Workspace.
| `Microsoft.Authorization/locks` | 2020-05-01 |
- [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.authorization_locks.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks)
|
| `Microsoft.Authorization/roleAssignments` | 2022-04-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.authorization_roleassignments.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments)
|
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.insights_diagnosticsettings.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
|
-| `Microsoft.KeyVault/vaults/accessPolicies` | 2023-07-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.keyvault_vaults_accesspolicies.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2023-07-01/vaults/accessPolicies)
|
+| `Microsoft.KeyVault/vaults/accessPolicies` | 2024-11-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.keyvault_vaults_accesspolicies.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2024-11-01/vaults/accessPolicies)
|
| `Microsoft.Network/privateEndpoints` | 2024-05-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.network_privateendpoints.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2024-05-01/privateEndpoints)
|
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2024-05-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.network_privateendpoints_privatednszonegroups.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2024-05-01/privateEndpoints/privateDnsZoneGroups)
|
| `Microsoft.Synapse/workspaces` | 2021-06-01 | - [AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.synapse_workspaces.html)
- [Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Synapse/2021-06-01/workspaces)
|
diff --git a/avm/res/synapse/workspace/administrators/README.md b/avm/res/synapse/workspace/administrator/README.md
similarity index 100%
rename from avm/res/synapse/workspace/administrators/README.md
rename to avm/res/synapse/workspace/administrator/README.md
diff --git a/avm/res/synapse/workspace/administrators/main.bicep b/avm/res/synapse/workspace/administrator/main.bicep
similarity index 100%
rename from avm/res/synapse/workspace/administrators/main.bicep
rename to avm/res/synapse/workspace/administrator/main.bicep
diff --git a/avm/res/synapse/workspace/administrators/main.json b/avm/res/synapse/workspace/administrator/main.json
similarity index 96%
rename from avm/res/synapse/workspace/administrators/main.json
rename to avm/res/synapse/workspace/administrator/main.json
index 57d42d4ebbf..13ae704635d 100644
--- a/avm/res/synapse/workspace/administrators/main.json
+++ b/avm/res/synapse/workspace/administrator/main.json
@@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
- "version": "0.36.1.42791",
- "templateHash": "15011697165765272657"
+ "version": "0.37.4.10188",
+ "templateHash": "1812287618624820283"
},
"name": "Synapse Workspaces Administrators",
"description": "This module deploys Synapse Workspaces Administrators."
diff --git a/avm/res/synapse/workspace/key/main.bicep b/avm/res/synapse/workspace/key/main.bicep
index 1d5a1278c0d..d0544750355 100644
--- a/avm/res/synapse/workspace/key/main.bicep
+++ b/avm/res/synapse/workspace/key/main.bicep
@@ -13,11 +13,11 @@ param isActiveCMK bool
@description('Required. The resource ID of a key vault to reference a customer managed key for encryption from.')
param keyVaultResourceId string
-resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = {
+resource cMKKeyVault 'Microsoft.KeyVault/vaults@2024-11-01' existing = {
name: last(split(keyVaultResourceId, '/'))
scope: resourceGroup(split(keyVaultResourceId, '/')[2], split(keyVaultResourceId, '/')[4])
- resource cMKKey 'keys@2023-02-01' existing = {
+ resource cMKKey 'keys@2024-11-01' existing = {
name: name
}
}
diff --git a/avm/res/synapse/workspace/key/main.json b/avm/res/synapse/workspace/key/main.json
index 7dbea42ab64..7737c930d7e 100644
--- a/avm/res/synapse/workspace/key/main.json
+++ b/avm/res/synapse/workspace/key/main.json
@@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
- "version": "0.36.1.42791",
- "templateHash": "6494553890280141768"
+ "version": "0.37.4.10188",
+ "templateHash": "13047991468364354176"
},
"name": "Synapse Workspaces Keys",
"description": "This module deploys a Synapse Workspaces Key."
@@ -43,7 +43,7 @@
"name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
"properties": {
"isActiveCMK": "[parameters('isActiveCMK')]",
- "keyVaultUrl": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('keyVaultResourceId'), '/')[2], split(parameters('keyVaultResourceId'), '/')[4]), 'Microsoft.KeyVault/vaults/keys', last(split(parameters('keyVaultResourceId'), '/')), parameters('name')), '2023-02-01').keyUri]"
+ "keyVaultUrl": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('keyVaultResourceId'), '/')[2], split(parameters('keyVaultResourceId'), '/')[4]), 'Microsoft.KeyVault/vaults/keys', last(split(parameters('keyVaultResourceId'), '/')), parameters('name')), '2024-11-01').keyUri]"
}
}
],
diff --git a/avm/res/synapse/workspace/main.bicep b/avm/res/synapse/workspace/main.bicep
index e6a03492291..978dc231b5c 100644
--- a/avm/res/synapse/workspace/main.bicep
+++ b/avm/res/synapse/workspace/main.bicep
@@ -290,7 +290,7 @@ module workspace_cmk_rbac 'modules/nested_cmkRbac.bicep' = if (encryptionActivat
// - Workspace encryption - Activate Workspace
module workspace_key 'key/main.bicep' = if (encryptionActivateWorkspace) {
- name: '${workspace.name}-cmk-activation'
+ name: take('${workspace.name}-cmk-activation', 64)
params: {
name: customerManagedKey!.keyName
isActiveCMK: true
@@ -303,7 +303,7 @@ module workspace_key 'key/main.bicep' = if (encryptionActivateWorkspace) {
}
// - Workspace Entra ID Administrator
-module workspace_administrator 'administrators/main.bicep' = if (!empty(administrator)) {
+module workspace_administrator 'administrator/main.bicep' = if (!empty(administrator)) {
name: '${workspace.name}-administrator'
params: {
workspaceName: workspace.name
diff --git a/avm/res/synapse/workspace/main.json b/avm/res/synapse/workspace/main.json
index 528d7e00f82..43b8410ea82 100644
--- a/avm/res/synapse/workspace/main.json
+++ b/avm/res/synapse/workspace/main.json
@@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.37.4.10188",
- "templateHash": "10622356003825888875"
+ "templateHash": "15108653259395547929"
},
"name": "Synapse Workspaces",
"description": "This module deploys a Synapse Workspace."
@@ -1807,7 +1807,7 @@
"_generator": {
"name": "bicep",
"version": "0.37.4.10188",
- "templateHash": "9316725407433924440"
+ "templateHash": "1019770604093261683"
}
},
"parameters": {
@@ -1838,7 +1838,7 @@
{
"condition": "[not(parameters('usesRbacAuthorization'))]",
"type": "Microsoft.KeyVault/vaults/accessPolicies",
- "apiVersion": "2023-07-01",
+ "apiVersion": "2024-11-01",
"name": "[format('{0}/{1}', parameters('keyvaultName'), 'add')]",
"properties": {
"accessPolicies": [
@@ -1868,7 +1868,7 @@
"condition": "[parameters('encryptionActivateWorkspace')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2022-09-01",
- "name": "[format('{0}-cmk-activation', parameters('name'))]",
+ "name": "[take(format('{0}-cmk-activation', parameters('name')), 64)]",
"properties": {
"expressionEvaluationOptions": {
"scope": "inner"
@@ -1895,7 +1895,7 @@
"_generator": {
"name": "bicep",
"version": "0.37.4.10188",
- "templateHash": "2919769105623395604"
+ "templateHash": "13047991468364354176"
},
"name": "Synapse Workspaces Keys",
"description": "This module deploys a Synapse Workspaces Key."
@@ -1933,7 +1933,7 @@
"name": "[format('{0}/{1}', parameters('workspaceName'), parameters('name'))]",
"properties": {
"isActiveCMK": "[parameters('isActiveCMK')]",
- "keyVaultUrl": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('keyVaultResourceId'), '/')[2], split(parameters('keyVaultResourceId'), '/')[4]), 'Microsoft.KeyVault/vaults/keys', last(split(parameters('keyVaultResourceId'), '/')), parameters('name')), '2023-02-01').keyUri]"
+ "keyVaultUrl": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('keyVaultResourceId'), '/')[2], split(parameters('keyVaultResourceId'), '/')[4]), 'Microsoft.KeyVault/vaults/keys', last(split(parameters('keyVaultResourceId'), '/')), parameters('name')), '2024-11-01').keyUri]"
}
}
],
diff --git a/avm/res/synapse/workspace/modules/nested_cmkRbac.bicep b/avm/res/synapse/workspace/modules/nested_cmkRbac.bicep
index 7d88e09aa3a..b05cef4821e 100644
--- a/avm/res/synapse/workspace/modules/nested_cmkRbac.bicep
+++ b/avm/res/synapse/workspace/modules/nested_cmkRbac.bicep
@@ -22,7 +22,7 @@ resource workspace_cmk_rbac 'Microsoft.Authorization/roleAssignments@2022-04-01'
}
// Assign Access Policy for Keys
-resource workspace_cmk_accessPolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-07-01' = if (!usesRbacAuthorization) {
+resource workspace_cmk_accessPolicy 'Microsoft.KeyVault/vaults/accessPolicies@2024-11-01' = if (!usesRbacAuthorization) {
name: 'add'
parent: keyVault
properties: {