@gradientedge/cdk-utils 9.40.0 → 9.41.1

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

@@ -2,6 +2,7 @@ import { TerraformStack } from 'cdktf';
 import { Construct } from 'constructs';
 import { AzureStorageManager, AzureKeyVaultManager, AzureApiManagementManager, AzureFunctionManager, AzureResourceGroupManager, AzureAppServiceManager, AzureApplicationInsightsManager, AzureAppConfigurationManager, AzureCosmosDbManager, AzureServicebusManager, AzureEventgridManager, AzureDnsManager, AzureLogAnalyticsWorkspaceManager } from '../services';
 import { CommonAzureStackProps } from './types';
+import { AzureResourceNameFormatter } from './resource-name-formatter';
 export declare class CommonAzureConstruct extends TerraformStack {
     props: CommonAzureStackProps;
     apiManagementManager: AzureApiManagementManager;
@@ -17,6 +18,7 @@ export declare class CommonAzureConstruct extends TerraformStack {
     keyVaultManager: AzureKeyVaultManager;
     logAnalyticsWorkspaceManager: AzureLogAnalyticsWorkspaceManager;
     resourceGroupManager: AzureResourceGroupManager;
+    resourceNameFormatter: AzureResourceNameFormatter;
     servicebusManager: AzureServicebusManager;
     storageManager: AzureStorageManager;
     tenantId: string;

package/dist/src/lib/azure/common/construct.js

@@ -8,6 +8,7 @@ const cdktf_1 = require("cdktf");
 const common_1 = require("../../common");
 const services_1 = require("../services");
 const constants_1 = require("./constants");
+const resource_name_formatter_1 = require("./resource-name-formatter");
 class CommonAzureConstruct extends cdktf_1.TerraformStack {
     apiManagementManager;
     appConfigurationManager;
@@ -22,6 +23,7 @@ class CommonAzureConstruct extends cdktf_1.TerraformStack {
     keyVaultManager;
     logAnalyticsWorkspaceManager;
     resourceGroupManager;
+    resourceNameFormatter;
     servicebusManager;
     storageManager;
     tenantId;
@@ -40,6 +42,7 @@ class CommonAzureConstruct extends cdktf_1.TerraformStack {
         this.keyVaultManager = new services_1.AzureKeyVaultManager();
         this.logAnalyticsWorkspaceManager = new services_1.AzureLogAnalyticsWorkspaceManager();
         this.resourceGroupManager = new services_1.AzureResourceGroupManager();
+        this.resourceNameFormatter = new resource_name_formatter_1.AzureResourceNameFormatter(this, `${id}-rnf`, props);
         this.servicebusManager = new services_1.AzureServicebusManager();
         this.storageManager = new services_1.AzureStorageManager();
         this.determineFullyQualifiedDomain();

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

@@ -0,0 +1,14 @@
+import { Construct } from 'constructs';
+import { AzureResourceNameFormatterProps } from './types';
+import { CommonAzureStackProps } from './types';
+export declare class AzureResourceNameFormatter extends Construct {
+    props: CommonAzureStackProps;
+    constructor(parent: Construct, id: string, props: CommonAzureStackProps);
+    /**
+     * @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
+     */
+    format(resourceName: string, options?: AzureResourceNameFormatterProps): string;
+}

package/dist/src/lib/azure/common/resource-name-formatter.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureResourceNameFormatter = void 0;
+const constructs_1 = require("constructs");
+class AzureResourceNameFormatter extends constructs_1.Construct {
+    props;
+    constructor(parent, id, props) {
+        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
+     */
+    format(resourceName, options) {
+        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('-');
+    }
+}
+exports.AzureResourceNameFormatter = AzureResourceNameFormatter;

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

@@ -7,7 +7,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/dist/src/lib/azure/services/api-management/main.js

@@ -43,15 +43,13 @@ class AzureApiManagementManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 api_management_1.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,
@@ -59,7 +57,7 @@ class AzureApiManagementManager {
         });
         if (applicationInsightsKey) {
             new api_management_logger_1.ApiManagementLogger(scope, `${id}-am-logger`, {
-                name: `${props.name}-${scope.props.stage}`,
+                name: scope.resourceNameFormatter.format(props.name),
                 resourceGroupName: resourceGroup.name,
                 apiManagementName: apiManagement.name,
                 applicationInsights: {
@@ -83,15 +81,13 @@ class AzureApiManagementManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 data_azurerm_api_management_1.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}`,
@@ -110,7 +106,7 @@ class AzureApiManagementManager {
             throw `Props undefined for ${id}`;
         const apiManagementBackend = new api_management_backend_1.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',
         });
@@ -131,7 +127,7 @@ class AzureApiManagementManager {
             throw `Props undefined for ${id}`;
         const apiManagementApi = new api_management_api_1.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/dist/src/lib/azure/services/api-management/types.d.ts

@@ -3,8 +3,7 @@ import { ApiManagementBackendConfig } from '@cdktf/provider-azurerm/lib/api-mana
 import { ApiManagementApiConfig } from '@cdktf/provider-azurerm/lib/api-management-api';
 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/dist/src/lib/azure/services/app-configuration/main.js

@@ -33,9 +33,7 @@ class AzureAppConfigurationManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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/dist/src/lib/azure/services/app-service/main.js

@@ -33,15 +33,13 @@ class AzureAppServiceManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 service_plan_1.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/dist/src/lib/azure/services/application-insights/main.js

@@ -33,9 +33,7 @@ class AzureApplicationInsightsManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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/dist/src/lib/azure/services/cosmosdb/main.js

@@ -35,15 +35,13 @@ class AzureCosmosDbManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 cosmosdb_account_1.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 ?? {
@@ -66,15 +64,13 @@ class AzureCosmosDbManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 cosmosdb_sql_database_1.CosmosdbSqlDatabase(scope, `${id}-cd`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             resourceGroupName: resourceGroup.name,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-cosmosdbDatatbasetName`, scope, cosmosdbDatatbase.name);
@@ -101,7 +97,7 @@ class AzureCosmosDbManager {
             throw `Resource group undefined for ${id}`;
         const cosmosdbContainer = new cosmosdb_sql_container_1.CosmosdbSqlContainer(scope, `${id}-cc`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             resourceGroupName: resourceGroup.name,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-cosmosdbContainertName`, scope, cosmosdbContainer.name);

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

@@ -1,8 +1,9 @@
 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 { DnsZoneProps, DnsARecordProps, DnsCnameRecordProps } from './types';
+import { DnsZoneProps, DnsARecordProps, DnsCnameRecordProps, DnsTxtRecordProps } from './types';
 /**
  * @classdesc Provides operations on Azure DNS
  * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
@@ -45,4 +46,12 @@ export declare class AzureDnsManager {
      * @see [CDKTF DNS CNAME Record Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/DnsCnameRecord.typescript.md}
      */
     createDnsCnameRecord(id: string, scope: CommonAzureConstruct, props: DnsCnameRecordProps): 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}
+     */
+    createDnsTxtRecord(id: string, scope: CommonAzureConstruct, props: DnsTxtRecordProps): DnsTxtRecord;
 }

package/dist/src/lib/azure/services/dns/main.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureDnsManager = void 0;
 const data_azurerm_resource_group_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-resource-group");
-const data_azurerm_dns_zone_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-dns-zone");
 const dns_zone_1 = require("@cdktf/provider-azurerm/lib/dns-zone");
 const dns_a_record_1 = require("@cdktf/provider-azurerm/lib/dns-a-record");
 const dns_cname_record_1 = require("@cdktf/provider-azurerm/lib/dns-cname-record");
+const dns_txt_record_1 = require("@cdktf/provider-azurerm/lib/dns-txt-record");
 const utils_1 = require("../../utils");
 /**
  * @classdesc Provides operations on Azure DNS
@@ -36,15 +36,13 @@ class AzureDnsManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 dns_zone_1.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,
@@ -65,15 +63,10 @@ class AzureDnsManager {
     createDnsARecord(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const dnsZone = new data_azurerm_dns_zone_1.DataAzurermDnsZone(scope, `${id}-da-dz`, {
-            name: props.zoneName,
-            resourceGroupName: props.resourceGroupName,
-        });
         const dnsARecord = new dns_a_record_1.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,
             },
@@ -93,15 +86,10 @@ class AzureDnsManager {
     createDnsCnameRecord(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const dnsZone = new data_azurerm_dns_zone_1.DataAzurermDnsZone(scope, `${id}-dc-dz`, {
-            name: props.zoneName,
-            resourceGroupName: props.resourceGroupName,
-        });
         const dnsCnameRecord = new dns_cname_record_1.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,
             },
@@ -111,5 +99,27 @@ class AzureDnsManager {
         (0, utils_1.createAzureTfOutput)(`${id}-dnsCnameRecordId`, scope, dnsCnameRecord.id);
         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}
+     */
+    createDnsTxtRecord(id, scope, props) {
+        if (!props)
+            throw `Props undefined for ${id}`;
+        const dnsTxtRecord = new dns_txt_record_1.DnsTxtRecord(scope, `${id}-dc`, {
+            ...props,
+            ttl: props.ttl || 300,
+            tags: props.tags ?? {
+                environment: scope.props.stage,
+            },
+        });
+        (0, utils_1.createAzureTfOutput)(`${id}-dnsTxtRecordName`, scope, dnsTxtRecord.name);
+        (0, utils_1.createAzureTfOutput)(`${id}-dnsTxtRecordFriendlyUniqueId`, scope, dnsTxtRecord.friendlyUniqueId);
+        (0, utils_1.createAzureTfOutput)(`${id}-dnsTxtRecordId`, scope, dnsTxtRecord.id);
+        return dnsTxtRecord;
+    }
 }
 exports.AzureDnsManager = AzureDnsManager;

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

@@ -1,9 +1,12 @@
 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/dist/src/lib/azure/services/eventgrid/main.js

@@ -35,15 +35,13 @@ class AzureEventgridManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 eventgrid_topic_1.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 ?? {
@@ -67,15 +65,13 @@ class AzureEventgridManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 data_azurerm_eventgrid_topic_1.DataAzurermEventgridTopic(scope, `${id}-et`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             resourceGroupName: resourceGroup.name,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-eventgridTopicName`, scope, eventgridTopic.name);
@@ -96,7 +92,7 @@ class AzureEventgridManager {
             throw `Props undefined for ${id}`;
         const eventgridSubscription = new eventgrid_event_subscription_1.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/dist/src/lib/azure/services/eventgrid/types.d.ts

@@ -1,7 +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/dist/src/lib/azure/services/function/main.js

@@ -36,15 +36,13 @@ class AzureFunctionManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 linux_function_app_1.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,
@@ -67,7 +65,7 @@ class AzureFunctionManager {
             throw `Props undefined for ${id}`;
         const functionAppFunction = new function_app_function_1.FunctionAppFunction(scope, `${id}-fc`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             configJson: JSON.stringify(props.configJson || {}),
         });
         (0, utils_1.createAzureTfOutput)(`${id}-functionName`, scope, functionAppFunction.name);
@@ -85,15 +83,13 @@ class AzureFunctionManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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_1.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,
             body: {

package/dist/src/lib/azure/services/key-vault/main.js

@@ -33,15 +33,13 @@ class AzureKeyVaultManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 key_vault_1.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/dist/src/lib/azure/services/log-analytics-workspace/main.js

@@ -33,15 +33,13 @@ class AzureLogAnalyticsWorkspaceManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 log_analytics_workspace_1.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/dist/src/lib/azure/services/servicebus/main.js

@@ -36,15 +36,13 @@ class AzureServicebusManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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 servicebus_namespace_1.ServicebusNamespace(scope, `${id}-sn`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             resourceGroupName: resourceGroup.name,
             location: resourceGroup.location,
             identity: {
@@ -72,7 +70,7 @@ class AzureServicebusManager {
             throw `Props undefined for ${id}`;
         const servicebusTopic = new servicebus_topic_1.ServicebusTopic(scope, `${id}-st`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             namespaceId: props.namespaceId,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-servicebusTopicName`, scope, servicebusTopic.name);
@@ -92,7 +90,7 @@ class AzureServicebusManager {
             throw `Props undefined for ${id}`;
         const servicebusQueue = new servicebus_queue_1.ServicebusQueue(scope, `${id}-sq`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             namespaceId: props.namespaceId,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-servicebusQueueName`, scope, servicebusQueue.name);
@@ -112,7 +110,7 @@ class AzureServicebusManager {
             throw `Props undefined for ${id}`;
         const servicebusSubscription = new servicebus_subscription_1.ServicebusSubscription(scope, `${id}-ss`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             maxDeliveryCount: props.maxDeliveryCount || 1,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-servicebusSubscriptionName`, scope, servicebusSubscription.name);

package/dist/src/lib/azure/services/storage/main.js

@@ -37,9 +37,7 @@ class AzureStorageManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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}`;
@@ -70,7 +68,7 @@ class AzureStorageManager {
             throw `Props undefined for ${id}`;
         const storageContainer = new storage_container_1.StorageContainer(scope, `${id}-sc`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
         });
         (0, utils_1.createAzureTfOutput)(`${id}-storageContainerName`, scope, storageContainer.name);
         (0, utils_1.createAzureTfOutput)(`${id}-storageContainerFriendlyUniqueId`, scope, storageContainer.friendlyUniqueId);
@@ -88,9 +86,7 @@ class AzureStorageManager {
         if (!props)
             throw `Props undefined for ${id}`;
         const resourceGroup = new data_azurerm_resource_group_1.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}`;
@@ -105,7 +101,7 @@ class AzureStorageManager {
         });
         const storageBlob = new storage_blob_1.StorageBlob(scope, `${id}-sb`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter.format(props.name),
             storageAccountName: storageAccount.name,
             storageContainerName: storageContainer.name,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.40.0",
+  "version": "9.41.1",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {