Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a767c20
Added invoke-for-diff to Set-AVMModule
AlexanderSehr Aug 12, 2025
328a9f5
Update to latest
AlexanderSehr Aug 12, 2025
256c2f0
Update to latest
AlexanderSehr Aug 12, 2025
63ec0f5
Update to latest
AlexanderSehr Aug 12, 2025
b54b0cd
Update to latest
AlexanderSehr Aug 12, 2025
29c2f3b
Update to latest
AlexanderSehr Aug 12, 2025
beb8cd6
Update to latest
AlexanderSehr Aug 12, 2025
9f6c70b
Update to latest
AlexanderSehr Aug 12, 2025
82eda76
Modified 2 modules for testing
AlexanderSehr Aug 12, 2025
addb1a7
Small fix
AlexanderSehr Aug 12, 2025
ada96a8
Update to latest
AlexanderSehr Aug 12, 2025
306abb1
Update to latest
AlexanderSehr Aug 12, 2025
7ed4572
Update to latest
AlexanderSehr Aug 12, 2025
8010c71
Update to latest
AlexanderSehr Aug 12, 2025
3653ef9
Update to latest
AlexanderSehr Aug 12, 2025
8d36134
Update to latest
AlexanderSehr Aug 12, 2025
f65810e
Update to latest
AlexanderSehr Aug 12, 2025
15de24d
Temp enable publish test
AlexanderSehr Aug 12, 2025
9ed5cff
Update to latest
AlexanderSehr Aug 12, 2025
7045b8f
Disabled login
AlexanderSehr Aug 12, 2025
ef0f0af
Update to latest
AlexanderSehr Aug 12, 2025
57870bb
Update to latest
AlexanderSehr Aug 12, 2025
aebcb77
Merge branch 'main' into users/alsehr/setAvmForDif
AlexanderSehr Aug 12, 2025
d313f5e
Rollback temp changes
AlexanderSehr Aug 12, 2025
57eea6d
Resolved conflict
AlexanderSehr Aug 20, 2025
dcea175
Update to latest
AlexanderSehr Aug 20, 2025
dff5ea4
Merge branch 'main' into users/alsehr/setAvmForDif
AlexanderSehr Aug 20, 2025
c1b99fd
Merge branch 'main' into users/alsehr/setAvmForDif
AlexanderSehr Aug 20, 2025
8b18d3d
Merge branch 'main' into users/alsehr/setAvmForDif
AlexanderSehr Aug 20, 2025
35aa741
Update to latest
AlexanderSehr Aug 20, 2025
a7ea1dd
Update to latest
AlexanderSehr Aug 20, 2025
f2a2f7b
Update to latest
AlexanderSehr Aug 20, 2025
004d469
Updated to match latest upstream changes
AlexanderSehr Aug 21, 2025
1a3badc
Update to latest
AlexanderSehr Aug 21, 2025
1c14cd1
Update to latest
AlexanderSehr Aug 21, 2025
b5ae73b
Manipulated changelog change for testing
AlexanderSehr Aug 21, 2025
e4509d5
Update to latest
AlexanderSehr Aug 23, 2025
f63344b
Update to latest
AlexanderSehr Aug 23, 2025
13cdc00
Merge branch 'main' into users/alsehr/setAvmForDif
AlexanderSehr Aug 23, 2025
36664e0
Undid test changes for redis
AlexanderSehr Aug 23, 2025
c3e1312
Start resolving conflicts
AlexanderSehr Sep 24, 2025
c964a87
Update to latest
AlexanderSehr Sep 24, 2025
920f70c
Merge branches 'users/alsehr/setAvmForDif' and 'main' of https://gith…
AlexanderSehr Sep 25, 2025
bbeb3da
Update to latest
AlexanderSehr Sep 25, 2025
73f9fae
Update to latest
AlexanderSehr Sep 25, 2025
c1be125
Update to latest
AlexanderSehr Sep 25, 2025
e962188
Update to latest
AlexanderSehr Sep 25, 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
10 changes: 10 additions & 0 deletions avm/res/synapse/workspace/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion avm/res/synapse/workspace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This module deploys a Synapse Workspace.
| `Microsoft.Authorization/locks` | 2020-05-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.authorization_locks.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks)</li></ul> |
| `Microsoft.Authorization/roleAssignments` | 2022-04-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.authorization_roleassignments.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments)</li></ul> |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.insights_diagnosticsettings.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)</li></ul> |
| `Microsoft.KeyVault/vaults/accessPolicies` | 2023-07-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.keyvault_vaults_accesspolicies.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2023-07-01/vaults/accessPolicies)</li></ul> |
| `Microsoft.KeyVault/vaults/accessPolicies` | 2024-11-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.keyvault_vaults_accesspolicies.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2024-11-01/vaults/accessPolicies)</li></ul> |
| `Microsoft.Network/privateEndpoints` | 2024-05-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.network_privateendpoints.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2024-05-01/privateEndpoints)</li></ul> |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2024-05-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.network_privateendpoints_privatednszonegroups.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2024-05-01/privateEndpoints/privateDnsZoneGroups)</li></ul> |
| `Microsoft.Synapse/workspaces` | 2021-06-01 | <ul style="padding-left: 0px;"><li>[AzAdvertizer](https://www.azadvertizer.net/azresourcetypes/microsoft.synapse_workspaces.html)</li><li>[Template reference](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Synapse/2021-06-01/workspaces)</li></ul> |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 2 additions & 2 deletions avm/res/synapse/workspace/key/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
6 changes: 3 additions & 3 deletions avm/res/synapse/workspace/key/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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]"
}
}
],
Expand Down
4 changes: 2 additions & 2 deletions avm/res/synapse/workspace/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions avm/res/synapse/workspace/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -1807,7 +1807,7 @@
"_generator": {
"name": "bicep",
"version": "0.37.4.10188",
"templateHash": "9316725407433924440"
"templateHash": "1019770604093261683"
}
},
"parameters": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand All @@ -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."
Expand Down Expand Up @@ -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]"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion avm/res/synapse/workspace/modules/nested_cmkRbac.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down