Skip to content

[BICEP] Add support for custom resource naming in FinOps Toolkit #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

[BICEP] Add support for custom resource naming in FinOps Toolkit #1635

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de87ccc
Initial plan for issue
Copilot May 25, 2025
8c59701
Implemented custom resource naming parameters
Copilot May 25, 2025
7e5ee2c
Fixed function parameter and build issues
Copilot May 25, 2025
2a912e8
Final documentation updates
Copilot May 25, 2025
66f9c8f
Reverted custom resource naming parameters
Copilot May 25, 2025
3cb5af8
Restored custom resource naming parameters in hub.bicep and hub-app.b…
Copilot May 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
12 changes: 12 additions & 0 deletions src/templates/finops-hub/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,15 @@ param enablePublicAccess bool = true
@description('Optional. Address space for the workload. A /26 is required for the workload. Default: "10.20.30.0/26".')
param virtualNetworkAddressPrefix string = '10.20.30.0/26'

@description('Optional. Custom name for the Storage Account. If not provided, a name will be generated based on the hub name. Must follow Azure Storage naming rules.')
param storageAccountName string = ''

@description('Optional. Custom name for the Data Factory. If not provided, a name will be generated based on the hub name. Must follow Azure Data Factory naming rules.')
param dataFactoryName string = ''

@description('Optional. Custom name for the Key Vault. If not provided, a name will be generated based on the hub name. Must follow Azure Key Vault naming rules.')
param keyVaultName string = ''

Copy link
Collaborator

@flanakin flanakin May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

Copy link
Contributor Author

Copilot AI May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted the custom resource naming parameters in main.bicep (commit 66f9c8f)


//==============================================================================
// Resources
Expand Down Expand Up @@ -176,6 +185,9 @@ module hub 'modules/hub.bicep' = {
remoteHubStorageKey: remoteHubStorageKey
enablePublicAccess: enablePublicAccess
virtualNetworkAddressPrefix: virtualNetworkAddressPrefix
storageAccountName: storageAccountName
dataFactoryName: dataFactoryName
keyVaultName: keyVaultName
Copy link
Collaborator

@flanakin flanakin May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

Copy link
Contributor Author

Copilot AI May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted the parameter pass-through in main.bicep (commit 66f9c8f)

}
}

Expand Down
21 changes: 20 additions & 1 deletion src/templates/finops-hub/modules/hub-app.bicep
View file
Open in desktop
Copy link
Collaborator

@flanakin flanakin May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot You reverted too much. The storage, ADF, and Key Vault names should be specified in hub.bicep and passed down to hub-app.bicep.

Copy link
Contributor Author

Copilot AI May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've restored the storage, ADF, and Key Vault name parameters in hub.bicep and hub-app.bicep while ensuring they're properly passed through the module chain. The parameters are now available in hub.bicep and passed down to hub-app.bicep as requested (commit 3cb5af8).

Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ param features HubAppFeature[] = []
@description('Optional. Custom string with additional metadata to log. Must an alphanumeric string without spaces or special characters except for underscores and dashes. Namespace + appName + telemetryString must be 50 characters or less - additional characters will be trimmed.')
param telemetryString string = ''

@description('Optional. Custom name for the Storage Account. If not provided, a name will be generated based on the hub name.')
param storageAccountName string = ''

@description('Optional. Custom name for the Data Factory. If not provided, a name will be generated based on the hub name.')
param dataFactoryName string = ''

@description('Optional. Custom name for the Key Vault. If not provided, a name will be generated based on the hub name.')
param keyVaultName string = ''

//------------------------------------------------------------------------------
// Temporary parameters that should be removed in the future
//------------------------------------------------------------------------------
Expand All @@ -51,7 +60,17 @@ param coreConfig HubCoreConfig
// Variables
//==============================================================================

var appConfig = newAppConfig(coreConfig, publisher, namespace, appName, displayName, appVersion)
var appConfig = newAppConfig(
coreConfig,
publisher,
namespace,
appName,
displayName,
appVersion,
storageAccountName,
dataFactoryName,
keyVaultName
)

// Features
var usesDataFactory = contains(features, 'DataFactory')
Expand Down
Loading