Skip to content

Commit

Permalink
Updated to latest versions & generated files
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderSehr committed Nov 27, 2024
1 parent fe805f9 commit 6545287
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 30 deletions.
12 changes: 6 additions & 6 deletions avm/res/databricks/workspace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,8 @@ The customer managed key definition to use for the managed disk.

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`autoRotationDisabled`](#parameter-customermanagedkeymanageddiskautorotationdisabled) | bool | If configured, instead of auto-rotating to the latest key version, the latest key version at the time of the deployment is used. |
| [`keyVersion`](#parameter-customermanagedkeymanageddiskkeyversion) | string | The version of the customer managed key to reference for encryption. If not provided, using version as per 'autoRotationDisabled' setting. |
| [`autoRotationEnabled`](#parameter-customermanagedkeymanageddiskautorotationenabled) | bool | Enable or disable auto-rotating to the latest key version. Default is `true`. If set to `false`, the latest key version at the time of the deployment is used. |
| [`keyVersion`](#parameter-customermanagedkeymanageddiskkeyversion) | string | The version of the customer managed key to reference for encryption. If not provided, using version as per 'autoRotationEnabled' setting. |
| [`userAssignedIdentityResourceId`](#parameter-customermanagedkeymanageddiskuserassignedidentityresourceid) | string | User assigned identity to use when fetching the customer managed key. Required if no system assigned identity is available for use. |

### Parameter: `customerManagedKeyManagedDisk.keyName`
Expand All @@ -1151,16 +1151,16 @@ The resource ID of a key vault to reference a customer managed key for encryptio
- Required: Yes
- Type: string

### Parameter: `customerManagedKeyManagedDisk.autoRotationDisabled`
### Parameter: `customerManagedKeyManagedDisk.autoRotationEnabled`

If configured, instead of auto-rotating to the latest key version, the latest key version at the time of the deployment is used.
Enable or disable auto-rotating to the latest key version. Default is `true`. If set to `false`, the latest key version at the time of the deployment is used.

- Required: No
- Type: bool

### Parameter: `customerManagedKeyManagedDisk.keyVersion`

The version of the customer managed key to reference for encryption. If not provided, using version as per 'autoRotationDisabled' setting.
The version of the customer managed key to reference for encryption. If not provided, using version as per 'autoRotationEnabled' setting.

- Required: No
- Type: string
Expand Down Expand Up @@ -2509,7 +2509,7 @@ This section gives you an overview of all local-referenced module files (i.e., o
| Reference | Type |
| :-- | :-- |
| `br/public:avm/res/network/private-endpoint:0.7.1` | Remote reference |
| `br/public:avm/utl/types/avm-common-types:0.3.0` | Remote reference |
| `br/public:avm/utl/types/avm-common-types:0.4.0` | Remote reference |

## Notes

Expand Down
14 changes: 7 additions & 7 deletions avm/res/databricks/workspace/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ param skuName string = 'premium'
@description('Optional. Location for all Resources.')
param location string = resourceGroup().location

import { roleAssignmentType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { roleAssignmentType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. Array of role assignments to create.')
param roleAssignments roleAssignmentType[]?

import { diagnosticSettingLogsOnlyType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { diagnosticSettingLogsOnlyType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. The diagnostic settings of the service.')
param diagnosticSettings diagnosticSettingLogsOnlyType[]?

import { lockType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { lockType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. The lock settings of the service.')
param lock lockType?

Expand All @@ -52,11 +52,11 @@ param customPublicSubnetName string = ''
@description('Optional. Disable Public IP.')
param disablePublicIp bool = false

import { customerManagedKeyType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { customerManagedKeyType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. The customer managed key definition to use for the managed service.')
param customerManagedKey customerManagedKeyType?

import { customerManagedKeyWithAutoRotateType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { customerManagedKeyWithAutoRotateType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. The customer managed key definition to use for the managed disk.')
param customerManagedKeyManagedDisk customerManagedKeyWithAutoRotateType?

Expand Down Expand Up @@ -109,7 +109,7 @@ param requiredNsgRules string = 'AllRules'
])
param privateStorageAccount string = ''

import { privateEndpointMultiServiceType } from 'br/public:avm/utl/types/avm-common-types:0.3.0'
import { privateEndpointMultiServiceType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
@description('Optional. Configuration details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible.')
param privateEndpoints privateEndpointMultiServiceType[]?

Expand Down Expand Up @@ -343,7 +343,7 @@ resource workspace 'Microsoft.Databricks/workspaces@2024-05-01' = {
? customerManagedKeyManagedDisk!.keyVersion!
: last(split(cMKManagedDiskKeyVault::cMKKey.properties.keyUriWithVersion, '/'))
}
rotationToLatestKeyVersionEnabled: (customerManagedKeyManagedDisk.?autoRotationDisabled ?? false == false) ?? true
rotationToLatestKeyVersionEnabled: (customerManagedKeyManagedDisk.?autoRotationEnabled ?? true == true) ?? false
}
: null
}
Expand Down
Loading

0 comments on commit 6545287

Please sign in to comment.