@gradientedge/cdk-utils 9.40.0 → 9.41.1

package/src/lib/azure/common/construct.ts

@@ -21,6 +21,7 @@ import {
 } from '../services'
 import { CommonAzureStackProps } from './types'
 import { AzureRemoteBackend } from './constants'
+import { AzureResourceNameFormatter } from './resource-name-formatter'
 
 export class CommonAzureConstruct extends TerraformStack {
   declare props: CommonAzureStackProps
@@ -37,6 +38,7 @@ export class CommonAzureConstruct extends TerraformStack {
   keyVaultManager: AzureKeyVaultManager
   logAnalyticsWorkspaceManager: AzureLogAnalyticsWorkspaceManager
   resourceGroupManager: AzureResourceGroupManager
+  resourceNameFormatter: AzureResourceNameFormatter
   servicebusManager: AzureServicebusManager
   storageManager: AzureStorageManager
   tenantId: string
@@ -57,6 +59,7 @@ export class CommonAzureConstruct extends TerraformStack {
     this.keyVaultManager = new AzureKeyVaultManager()
     this.logAnalyticsWorkspaceManager = new AzureLogAnalyticsWorkspaceManager()
     this.resourceGroupManager = new AzureResourceGroupManager()
+    this.resourceNameFormatter = new AzureResourceNameFormatter(this, `${id}-rnf`, props)
     this.servicebusManager = new AzureServicebusManager()
     this.storageManager = new AzureStorageManager()
 

package/src/lib/azure/common/resource-name-formatter.ts

@@ -0,0 +1,38 @@
+import { Construct } from 'constructs'
+import { AzureResourceNameFormatterProps } from './types'
+import { CommonAzureStackProps } from './types'
+
+export class AzureResourceNameFormatter extends Construct {
+  props: CommonAzureStackProps
+
+  constructor(parent: Construct, id: string, props: CommonAzureStackProps) {
+    super(parent, id)
+    this.props = props
+  }
+
+  /**
+   * @summary Helper method to format azure resource name based on the provided options
+   * @param resourceName The azure resource name to format
+   * @param options Options to control the formatting of the resource name
+   * @returns The formatted Azure-compliant resource name
+   */
+  public format(resourceName: string, options?: AzureResourceNameFormatterProps) {
+    const azureResourceNameElements = []
+
+    if (!options?.exclude) {
+      azureResourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined)
+      azureResourceNameElements.push(options?.prefix ?? this.props.resourcePrefix)
+    }
+
+    azureResourceNameElements.push(resourceName)
+
+    if (!options?.exclude) {
+      azureResourceNameElements.push(options?.suffix ?? this.props.resourceSuffix)
+      azureResourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined)
+    }
+
+    azureResourceNameElements.push(this.props.stage)
+
+    return azureResourceNameElements.filter(Boolean).join('-')
+  }
+}

package/src/lib/azure/common/types.ts

@@ -8,8 +8,21 @@ import { AzurermBackendConfig } from 'cdktf'
 export interface CommonAzureStackProps extends BaseProps, AzurermProviderConfig {
   resourceGroupName?: string
   remoteBackend?: AzureRemoteBackendProps
+  globalPrefix?: string
+  globalSuffix?: string
+  resourcePrefix?: string
+  resourceSuffix?: string
+  resourceNameOptions?: { [key: string]: AzureResourceNameFormatterProps }
 }
 
 export interface AzureRemoteBackendProps extends AzurermBackendConfig {
   type: AzureRemoteBackend
 }
+
+export interface AzureResourceNameFormatterProps {
+  exclude?: boolean
+  globalPrefix?: boolean
+  globalSuffix?: boolean
+  prefix?: string
+  suffix?: string
+}

package/src/lib/azure/services/api-management/main.ts

@@ -51,16 +51,17 @@ export class AzureApiManagementManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const apiManagement = new ApiManagement(scope, `${id}-am`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
         environment: scope.props.stage,
@@ -69,7 +70,7 @@ export class AzureApiManagementManager {
 
     if (applicationInsightsKey) {
       new ApiManagementLogger(scope, `${id}-am-logger`, {
-        name: `${props.name}-${scope.props.stage}`,
+        name: scope.resourceNameFormatter.format(props.name),
         resourceGroupName: resourceGroup.name,
         apiManagementName: apiManagement.name,
         applicationInsights: {
@@ -96,16 +97,17 @@ export class AzureApiManagementManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const apiManagement = new DataAzurermApiManagement(scope, `${id}-am`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: scope.props.resourceGroupName
         ? `${scope.props.resourceGroupName}-${scope.props.stage}`
         : `${props.resourceGroupName}`,
@@ -126,7 +128,7 @@ export class AzureApiManagementManager {
 
     const apiManagementBackend = new ApiManagementBackend(scope, `${id}-am-be`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       description: props.description || `Backend for ${props.name}-${scope.props.stage}`,
       protocol: props.protocol || 'http',
     })
@@ -150,7 +152,7 @@ export class AzureApiManagementManager {
 
     const apiManagementApi = new ApiManagementApi(scope, `${id}-am-api`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       displayName: props.displayName || props.name,
       revision: props.revision || '1',
       protocols: props.protocols || ['https'],

package/src/lib/azure/services/api-management/types.ts

@@ -4,9 +4,7 @@ import { ApiManagementApiConfig } from '@cdktf/provider-azurerm/lib/api-manageme
 import { ApiManagementApiOperationConfig } from '@cdktf/provider-azurerm/lib/api-management-api-operation'
 import { ApiManagementApiOperationPolicyConfig } from '@cdktf/provider-azurerm/lib/api-management-api-operation-policy'
 
-export interface ApiManagementProps extends Omit<ApiManagementConfig, 'name'> {
-  name?: string | undefined
-}
+export interface ApiManagementProps extends ApiManagementConfig {}
 
 export interface ApiManagementBackendProps extends ApiManagementBackendConfig {}
 

package/src/lib/azure/services/app-configuration/main.ts

@@ -33,9 +33,10 @@ export class AzureAppConfigurationManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`

package/src/lib/azure/services/app-service/main.ts

@@ -33,16 +33,17 @@ export class AzureAppServiceManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const appServicePlan = new ServicePlan(scope, `${id}-am`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
         environment: scope.props.stage,

package/src/lib/azure/services/application-insights/main.ts

@@ -33,9 +33,10 @@ export class AzureApplicationInsightsManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`

package/src/lib/azure/services/cosmosdb/main.ts

@@ -35,16 +35,17 @@ export class AzureCosmosDbManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-ca-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const cosmosdbAccount = new CosmosdbAccount(scope, `${id}-ca`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
@@ -70,16 +71,17 @@ export class AzureCosmosDbManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-cd-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const cosmosdbDatatbase = new CosmosdbSqlDatabase(scope, `${id}-cd`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
     })
 
@@ -110,7 +112,7 @@ export class AzureCosmosDbManager {
 
     const cosmosdbContainer = new CosmosdbSqlContainer(scope, `${id}-cc`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
     })
 

package/src/lib/azure/services/dns/main.ts

@@ -1,11 +1,11 @@
 import { DataAzurermResourceGroup } from '@cdktf/provider-azurerm/lib/data-azurerm-resource-group'
-import { DataAzurermDnsZone } from '@cdktf/provider-azurerm/lib/data-azurerm-dns-zone'
 import { DnsZone } from '@cdktf/provider-azurerm/lib/dns-zone'
 import { DnsARecord } from '@cdktf/provider-azurerm/lib/dns-a-record'
 import { DnsCnameRecord } from '@cdktf/provider-azurerm/lib/dns-cname-record'
+import { DnsTxtRecord } from '@cdktf/provider-azurerm/lib/dns-txt-record'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
-import { DnsZoneProps, DnsARecordProps, DnsCnameRecordProps } from './types'
+import { DnsZoneProps, DnsARecordProps, DnsCnameRecordProps, DnsTxtRecordProps } from './types'
 
 /**
  * @classdesc Provides operations on Azure DNS
@@ -36,16 +36,17 @@ export class AzureDnsManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-am-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const dnsZone = new DnsZone(scope, `${id}-dz`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
         environment: scope.props.stage,
@@ -69,16 +70,10 @@ export class AzureDnsManager {
   public createDnsARecord(id: string, scope: CommonAzureConstruct, props: DnsARecordProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const dnsZone = new DataAzurermDnsZone(scope, `${id}-da-dz`, {
-      name: props.zoneName,
-      resourceGroupName: props.resourceGroupName,
-    })
-
     const dnsARecord = new DnsARecord(scope, `${id}-da`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      resourceGroupName: dnsZone.resourceGroupName,
-      zoneName: dnsZone.name,
+      name: scope.resourceNameFormatter.format(props.name),
+      ttl: props.ttl || 300,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
@@ -101,16 +96,10 @@ export class AzureDnsManager {
   public createDnsCnameRecord(id: string, scope: CommonAzureConstruct, props: DnsCnameRecordProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const dnsZone = new DataAzurermDnsZone(scope, `${id}-dc-dz`, {
-      name: props.zoneName,
-      resourceGroupName: props.resourceGroupName,
-    })
-
     const dnsCnameRecord = new DnsCnameRecord(scope, `${id}-dc`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      resourceGroupName: dnsZone.resourceGroupName,
-      zoneName: dnsZone.name,
+      name: scope.resourceNameFormatter.format(props.name),
+      ttl: props.ttl || 300,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
@@ -122,4 +111,29 @@ export class AzureDnsManager {
 
     return dnsCnameRecord
   }
+
+  /**
+   * @summary Method to create a new DNS TXT Record
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props dns txt record properties
+   * @see [CDKTF DNS TXT Record Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/DnsCnameRecord.typescript.md}
+   */
+  public createDnsTxtRecord(id: string, scope: CommonAzureConstruct, props: DnsTxtRecordProps) {
+    if (!props) throw `Props undefined for ${id}`
+
+    const dnsTxtRecord = new DnsTxtRecord(scope, `${id}-dc`, {
+      ...props,
+      ttl: props.ttl || 300,
+      tags: props.tags ?? {
+        environment: scope.props.stage,
+      },
+    })
+
+    createAzureTfOutput(`${id}-dnsTxtRecordName`, scope, dnsTxtRecord.name)
+    createAzureTfOutput(`${id}-dnsTxtRecordFriendlyUniqueId`, scope, dnsTxtRecord.friendlyUniqueId)
+    createAzureTfOutput(`${id}-dnsTxtRecordId`, scope, dnsTxtRecord.id)
+
+    return dnsTxtRecord
+  }
 }

package/src/lib/azure/services/dns/types.ts

@@ -1,7 +1,9 @@
 import { DnsZoneConfig } from '@cdktf/provider-azurerm/lib/dns-zone'
 import { DnsARecordConfig } from '@cdktf/provider-azurerm/lib/dns-a-record'
 import { DnsCnameRecordConfig } from '@cdktf/provider-azurerm/lib/dns-cname-record'
+import { DnsTxtRecordConfig } from '@cdktf/provider-azurerm/lib/dns-txt-record'
 
 export interface DnsZoneProps extends DnsZoneConfig {}
 export interface DnsARecordProps extends DnsARecordConfig {}
 export interface DnsCnameRecordProps extends DnsCnameRecordConfig {}
+export interface DnsTxtRecordProps extends DnsTxtRecordConfig {}

package/src/lib/azure/services/eventgrid/main.ts

@@ -38,16 +38,17 @@ export class AzureEventgridManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-et-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const eventgridTopic = new EventgridTopic(scope, `${id}-et`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
@@ -74,16 +75,17 @@ export class AzureEventgridManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-et-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const eventgridTopic = new DataAzurermEventgridTopic(scope, `${id}-et`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
     })
 
@@ -107,7 +109,7 @@ export class AzureEventgridManager {
 
     const eventgridSubscription = new EventgridEventSubscription(scope, `${id}-es`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       eventDeliverySchema: props.eventDeliverySchema || 'CloudEventSchemaV1_0',
       advancedFilteringOnArraysEnabled: props.advancedFilteringOnArraysEnabled || true,
     })

package/src/lib/azure/services/eventgrid/types.ts

@@ -1,8 +1,6 @@
 import { EventgridTopicConfig } from '@cdktf/provider-azurerm/lib/eventgrid-topic'
 import { EventgridEventSubscriptionConfig } from '@cdktf/provider-azurerm/lib/eventgrid-event-subscription'
 
-export interface EventgridTopicProps extends Omit<EventgridTopicConfig, 'name'> {
-  name?: string | undefined
-}
+export interface EventgridTopicProps extends EventgridTopicConfig {}
 
 export interface EventgridEventSubscriptionProps extends EventgridEventSubscriptionConfig {}

package/src/lib/azure/services/function/main.ts

@@ -36,16 +36,17 @@ export class AzureFunctionManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-fa-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const functionApp = new LinuxFunctionApp(scope, `${id}-fa`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {
         environment: scope.props.stage,
@@ -71,7 +72,7 @@ export class AzureFunctionManager {
 
     const functionAppFunction = new FunctionAppFunction(scope, `${id}-fc`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       configJson: JSON.stringify(props.configJson || {}),
     })
 
@@ -96,16 +97,17 @@ export class AzureFunctionManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-fa-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const functionApp = new Resource(scope, `${id}-fa`, {
       type: 'Microsoft.Web/sites@2024-04-01',
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       location: resourceGroup.location,
       parentId: resourceGroup.id,
 

package/src/lib/azure/services/key-vault/main.ts

@@ -33,16 +33,17 @@ export class AzureKeyVaultManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-kv-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const keyVault = new KeyVault(scope, `${id}-kv`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
       skuName: props.skuName ?? 'standard',

package/src/lib/azure/services/log-analytics-workspace/main.ts

@@ -33,16 +33,17 @@ export class AzureLogAnalyticsWorkspaceManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-lw-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const logAnalyticsWorkspace = new LogAnalyticsWorkspace(scope, `${id}-lw`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
       tags: props.tags ?? {

package/src/lib/azure/services/servicebus/main.ts

@@ -41,16 +41,17 @@ export class AzureServicebusManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-sn-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
     const servicebusNamespace = new ServicebusNamespace(scope, `${id}-sn`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       resourceGroupName: resourceGroup.name,
       location: resourceGroup.location,
       identity: {
@@ -81,7 +82,7 @@ export class AzureServicebusManager {
 
     const servicebusTopic = new ServicebusTopic(scope, `${id}-st`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       namespaceId: props.namespaceId,
     })
 
@@ -104,7 +105,7 @@ export class AzureServicebusManager {
 
     const servicebusQueue = new ServicebusQueue(scope, `${id}-sq`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       namespaceId: props.namespaceId,
     })
 
@@ -127,7 +128,7 @@ export class AzureServicebusManager {
 
     const servicebusSubscription = new ServicebusSubscription(scope, `${id}-ss`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       maxDeliveryCount: props.maxDeliveryCount || 1,
     })
 

package/src/lib/azure/services/storage/main.ts

@@ -37,9 +37,10 @@ export class AzureStorageManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-sc-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
@@ -74,7 +75,7 @@ export class AzureStorageManager {
 
     const storageContainer = new StorageContainer(scope, `${id}-sc`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
     })
 
     createAzureTfOutput(`${id}-storageContainerName`, scope, storageContainer.name)
@@ -95,9 +96,10 @@ export class AzureStorageManager {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroup = new DataAzurermResourceGroup(scope, `${id}-sb-rg`, {
-      name: scope.props.resourceGroupName
-        ? `${scope.props.resourceGroupName}-${scope.props.stage}`
-        : `${props.resourceGroupName}`,
+      name: scope.resourceNameFormatter.format(
+        scope.props.resourceGroupName || props.resourceGroupName,
+        scope.props.resourceNameOptions?.resourceGroup
+      ),
     })
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
@@ -115,7 +117,7 @@ export class AzureStorageManager {
 
     const storageBlob = new StorageBlob(scope, `${id}-sb`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.name),
       storageAccountName: storageAccount.name,
       storageContainerName: storageContainer.name,
     })