Skip to content

Commit

Permalink
fix: Update databricks instance name for max test (#2734)
Browse files Browse the repository at this point in the history
## Description
 
Updated name of databricks `max` test instance to work around left-over
conflicting data-layer key

## Pipeline Reference

<!-- Insert your Pipeline Status Badge below -->

| Pipeline |
| -------- |
|
[![avm.res.databricks.workspace](https://github.com/AlexanderSehr/bicep-registry-modules/actions/workflows/avm.res.databricks.workspace.yml/badge.svg?branch=users%2Falsehr%2FdatabricksName)](https://github.com/AlexanderSehr/bicep-registry-modules/actions/workflows/avm.res.databricks.workspace.yml)
|

## Type of Change

<!-- Use the checkboxes [x] on the options that are relevant. -->

- [ ] Update to CI Environment or utilities (Non-module affecting
changes)
- [ ] Azure Verified Module updates:
- [x] Bugfix containing backwards-compatible bug fixes, and I have NOT
bumped the MAJOR or MINOR version in `version.json`:
- [ ] Someone has opened a bug report issue, and I have included "Closes
#{bug_report_issue_number}" in the PR description.
- [ ] The bug was found by the module author, and no one has opened an
issue to report it yet.
- [ ] Feature update backwards compatible feature updates, and I have
bumped the MINOR version in `version.json`.
- [ ] Breaking changes and I have bumped the MAJOR version in
`version.json`.
  - [ ] Update to documentation

---------

Co-authored-by: Erika Gressi <[email protected]>
Co-authored-by: Maher Aldineh <[email protected]>
  • Loading branch information
3 people authored Jul 19, 2024
1 parent 3f2ddd8 commit 299c7cd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions avm/res/databricks/workspace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ module workspace 'br/public:avm/res/databricks/workspace:<version>' = {
name: 'workspaceDeployment'
params: {
// Required parameters
name: 'dwmax001'
name: 'dwmax002'
// Non-required parameters
amlWorkspaceResourceId: '<amlWorkspaceResourceId>'
customerManagedKey: {
Expand Down Expand Up @@ -208,7 +208,7 @@ module workspace 'br/public:avm/res/databricks/workspace:<version>' = {
"parameters": {
// Required parameters
"name": {
"value": "dwmax001"
"value": "dwmax002"
},
// Non-required parameters
"amlWorkspaceResourceId": {
Expand Down
3 changes: 3 additions & 0 deletions avm/res/databricks/workspace/tests/e2e/max/dependencies.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -406,3 +406,6 @@ output keyVaultDiskKeyName string = keyVaultDisk::key.name

@description('The principal ID of the created Managed Identity.')
output managedIdentityPrincipalId string = managedIdentity.properties.principalId

@description('The name of the created Log Analytics Workspace.')
output logAnalyticsWorkspaceName string = logAnalyticsWorkspace.name
4 changes: 2 additions & 2 deletions avm/res/databricks/workspace/tests/e2e/max/main.test.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t
name: '${uniqueString(deployment().name, resourceLocation)}-diagnosticDependencies'
params: {
storageAccountName: 'dep${namePrefix}diasa${serviceShort}'
logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
logAnalyticsWorkspaceName: nestedDependencies.outputs.logAnalyticsWorkspaceName
eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
location: resourceLocation
Expand All @@ -78,7 +78,7 @@ module testDeployment '../../../main.bicep' = [
scope: resourceGroup
name: '${uniqueString(deployment().name, resourceLocation)}-test-${serviceShort}-${iteration}'
params: {
name: '${namePrefix}${serviceShort}001'
name: '${namePrefix}${serviceShort}002'
location: resourceLocation
diagnosticSettings: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,3 +397,6 @@ output keyVaultDiskKeyName string = keyVaultDisk::key.name

@description('The principal ID of the created Managed Identity.')
output managedIdentityPrincipalId string = managedIdentity.properties.principalId

@description('The name of the created Log Analytics Workspace.')
output logAnalyticsWorkspaceName string = logAnalyticsWorkspace.name
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t
name: '${uniqueString(deployment().name, resourceLocation)}-diagnosticDependencies'
params: {
storageAccountName: 'dep${namePrefix}diasa${serviceShort}'
logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
logAnalyticsWorkspaceName: nestedDependencies.outputs.logAnalyticsWorkspaceName
eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
location: resourceLocation
Expand Down

0 comments on commit 299c7cd

Please sign in to comment.