@gradientedge/cdk-utils-azure 2.15.0 → 2.17.0

package/dist/src/common/construct.js

@@ -1,7 +1,7 @@
+import { isDevStage, isPrdStage, isTestStage, isUatStage } from '@gradientedge/cdk-utils-common';
 import { getWorkspaceOutput } from '@pulumi/azure-native/operationalinsights/index.js';
 import * as pulumi from '@pulumi/pulumi';
 import { ComponentResource } from '@pulumi/pulumi';
-import { isDevStage, isPrdStage, isTestStage, isUatStage } from '@gradientedge/cdk-utils-common';
 import { AzureAuthorisationManager } from '../services/authorisation/main.js';
 import { AzureApiManagementManager, AzureAppConfigurationManager, AzureApplicationInsightsManager, AzureAppServiceManager, AzureCosmosDbManager, AzureDnsManager, AzureEventgridManager, AzureFunctionManager, AzureKeyVaultManager, AzureMonitorManager, AzureOperationalInsightsManager, AzurePortalManager, AzureRedisManager, AzureResourceGroupManager, AzureSecurityCentermanager, AzureServiceBusManager, AzureStorageManager, } from '../services/index.js';
 import { AzureResourceNameFormatter } from './resource-name-formatter.js';
@@ -76,7 +76,9 @@ export class CommonAzureConstruct extends ComponentResource {
     resolveStack(stackName) {
         if (!stackName)
             throw new Error('Stack name undefined');
-        return new pulumi.StackReference(stackName);
+        return new pulumi.StackReference(stackName, {
+            name: stackName,
+        });
     }
     createResourceGroup() {
         if (this.resourceGroup)
@@ -85,7 +87,6 @@ export class CommonAzureConstruct extends ComponentResource {
             resourceGroupName: this.props.resourceGroupName ?? this.id,
             location: this.props.location,
         });
-        this.props.resourceGroupName = this.resourceNameFormatter.format(this.props.resourceGroupName ?? this.id);
         this.registerOutputs({
             resourceGroupId: this.resourceGroup.id,
             resourceGroupName: this.resourceGroup.name,

package/dist/src/common/stack.d.ts

@@ -21,6 +21,7 @@ export declare class CommonAzureStack extends ComponentResource {
     construct: CommonAzureConstruct;
     props: CommonAzureStackProps;
     config: Config;
+    outputs?: Record<string, unknown>;
     constructor(name: string, props: CommonAzureStackProps, options?: ComponentResourceOptions);
     /**
      * @summary Method to determine the core construct properties injected via context
@@ -44,4 +45,6 @@ export declare class CommonAzureStack extends ComponentResource {
      * @summary Determine the fully qualified domain name based on domainName & subDomain
      */
     protected fullyQualifiedDomain(): string;
+    protected static determineEnvironmentProperty(): string;
+    protected static getEnvironmentProperty(property: string): any;
 }

package/dist/src/common/stack.js

@@ -1,9 +1,9 @@
-import fs from 'fs';
-import path from 'path';
+import fs, { readFileSync, statSync } from 'fs';
+import path, { dirname, join } from 'path';
+import { isDevStage } from '@gradientedge/cdk-utils-common';
 import { ComponentResource, Config } from '@pulumi/pulumi';
 import appRoot from 'app-root-path';
 import _ from 'lodash';
-import { isDevStage } from '@gradientedge/cdk-utils-common';
 import { registerTagTransformation } from './tagging.js';
 /**
  * Common stack to use as a base for all higher level constructs using Pulumi
@@ -25,6 +25,7 @@ export class CommonAzureStack extends ComponentResource {
     construct;
     props;
     config;
+    outputs;
     constructor(name, props, options) {
         super(`stack:${name}`, name, props, options);
         /* initialise config */
@@ -118,4 +119,27 @@ export class CommonAzureStack extends ComponentResource {
         const subDomain = this.props.subDomain;
         return subDomain ? `${subDomain}.${domainName}` : domainName;
     }
+    static determineEnvironmentProperty() {
+        const config = new Config();
+        const stageContextPath = config.get('stageContextPath');
+        let dir = process.cwd();
+        for (let i = 0; i < 6; i++) {
+            try {
+                if (statSync(join(dir, `${stageContextPath}`)).isDirectory())
+                    return dir;
+            }
+            catch {
+                /* keep walking */
+            }
+            dir = dirname(dir);
+        }
+        throw new Error('Could not locate infrastructure root (pulumi-env/ not found)');
+    }
+    static getEnvironmentProperty(property) {
+        const config = new Config();
+        const stage = config.get('stage');
+        const stageContextPath = config.get('stageContextPath');
+        const envConfig = JSON.parse(readFileSync(join(this.determineEnvironmentProperty(), `${stageContextPath}`, `${stage}.json`), 'utf8'));
+        return envConfig[property];
+    }
 }

package/dist/src/common/tagging.js

@@ -7,6 +7,13 @@ import { RESOURCES_TO_EXCLUDE_TAGS } from './constants.js';
  */
 /** @category Constant */
 export function isTaggableResource(resourceType) {
+    // Entire providers that don't support tags
+    if (resourceType.startsWith('azuread:'))
+        return false;
+    if (resourceType.startsWith('random:'))
+        return false;
+    if (resourceType.startsWith('pulumi:'))
+        return false;
     // Extract the resource name from the type (e.g., 'ResourceGroup' from 'azure-native:resources:ResourceGroup')
     const resourceName = resourceType.split(':').pop() || '';
     // Check if this resource is in the exclusion list

package/dist/src/services/api-management/main.js

@@ -34,27 +34,25 @@ export class AzureApiManagementManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         const apiManagementService = new ApiManagementService(`${id}-am`, {
             ...props,
             serviceName: scope.resourceNameFormatter.format(props.serviceName?.toString(), scope.props.resourceNameOptions?.apiManagement),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             publisherEmail: props.publisherEmail ?? 'noreply@example.com',
             publisherName: props.publisherName ?? 'Default Publisher',
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
         // Create logger if Application Insights key is provided
         if (applicationInsightsKey) {
             new Logger(`${id}-am-logger`, {
                 loggerId: scope.resourceNameFormatter.format(props.serviceName?.toString(), scope.props.resourceNameOptions?.apiManagementLogger),
-                resourceGroupName: resourceGroupName,
+                resourceGroupName,
                 serviceName: apiManagementService.name,
                 loggerType: LoggerType.ApplicationInsights,
                 credentials: {
@@ -75,7 +73,7 @@ export class AzureApiManagementManager {
             new Cache(`${id}-am-redis-cache`, {
                 cacheId: scope.resourceNameFormatter.format(props.serviceName?.toString(), scope.props.resourceNameOptions?.apiManagementRedisCache),
                 serviceName: apiManagementService.name,
-                resourceGroupName: resourceGroupName,
+                resourceGroupName,
                 connectionString: connectionString,
                 useFromLocation: cluster.location,
                 resourceId: cluster.id,
@@ -95,7 +93,7 @@ export class AzureApiManagementManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         return getApiManagementServiceOutput({
-            serviceName: scope.resourceNameFormatter.format(props.serviceName?.toString(), scope.props.resourceNameOptions?.dataAzurermApiManagement),
+            serviceName: scope.resourceNameFormatter.format(props.serviceName?.toString()),
             resourceGroupName: scope.props.resourceGroupName
                 ? `${scope.props.resourceGroupName}-${scope.props.stage}`
                 : props.resourceGroupName,

package/dist/src/services/app-configuration/main.js

@@ -30,15 +30,11 @@ export class AzureAppConfigurationManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new ConfigurationStore(`${id}-ac`, {
             ...props,
             configStoreName: scope.resourceNameFormatter.format(props.configStoreName?.toString(), scope.props.resourceNameOptions?.appConfiguration),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             identity: props.identity ?? {
                 type: IdentityType.SystemAssigned,
@@ -46,8 +42,10 @@ export class AzureAppConfigurationManager {
             sku: props.sku ?? {
                 name: 'standard',
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/app-service/main.js

@@ -30,15 +30,11 @@ export class AzureAppServiceManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new AppServicePlan(`${id}-as`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name?.toString(), scope.props.resourceNameOptions?.appServicePlan),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             sku: props.sku ?? {
                 name: 'FC1',
@@ -46,8 +42,10 @@ export class AzureAppServiceManager {
             },
             reserved: props.reserved ?? true,
             zoneRedundant: props.zoneRedundant ?? true,
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }
@@ -63,15 +61,11 @@ export class AzureAppServiceManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new WebApp(`${id}-lwa`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name?.toString(), scope.props.resourceNameOptions?.linuxWebApp),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             httpsOnly: props.httpsOnly ?? true,
             kind: props.kind ?? 'app,linux',
@@ -83,8 +77,10 @@ export class AzureAppServiceManager {
                 linuxFxVersion: 'NODE|22-lts',
                 minTlsVersion: SupportedTlsVersions.SupportedTlsVersions_1_3,
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/application-insights/main.js

@@ -30,7 +30,7 @@ export class AzureApplicationInsightsManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
+        const resourceGroupName = (props.resourceGroupName ?? scope.props.resourceGroupName)
             ? `${scope.props.resourceGroupName}-${scope.props.stage}`
             : props.resourceGroupName;
         if (!resourceGroupName)
@@ -38,11 +38,13 @@ export class AzureApplicationInsightsManager {
         const component = new Component(`${id}-ai`, {
             ...props,
             resourceName: scope.resourceNameFormatter.format(props.resourceName?.toString(), scope.props.resourceNameOptions?.applicationInsights),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             applicationType: props.applicationType ?? ApplicationType.Web,
             kind: props.kind ?? 'web',
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
         if (props.billingFeatures) {

package/dist/src/services/cosmosdb/main.js

@@ -31,18 +31,16 @@ export class AzureCosmosDbManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new DatabaseAccount(`${id}-ca`, {
             ...props,
             accountName: scope.resourceNameFormatter.format(props.accountName?.toString(), scope.props.resourceNameOptions?.cosmosDbAccount),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
-            tags: props.tags ?? {
+            resourceGroupName,
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
             identity: props.identity ?? {
                 type: ResourceIdentityType.SystemAssigned,
@@ -61,15 +59,11 @@ export class AzureCosmosDbManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new SqlResourceSqlDatabase(`${id}-cd`, {
             ...props,
             databaseName: scope.resourceNameFormatter.format(props.databaseName?.toString(), scope.props.resourceNameOptions?.cosmosDbSqlDatabase),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
         }, { parent: scope, ...resourceOptions });
     }
     /**
@@ -84,7 +78,7 @@ export class AzureCosmosDbManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
+        const resourceGroupName = (props.resourceGroupName ?? scope.props.resourceGroupName)
             ? `${scope.props.resourceGroupName}-${scope.props.stage}`
             : props.resourceGroupName;
         if (!resourceGroupName)
@@ -92,7 +86,7 @@ export class AzureCosmosDbManager {
         return new SqlResourceSqlContainer(`${id}-cc`, {
             ...props,
             containerName: scope.resourceNameFormatter.format(props.containerName?.toString(), scope.props.resourceNameOptions?.cosmosDbSqlContainer),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
         }, { parent: scope, ...resourceOptions });
     }
     /**
@@ -143,7 +137,7 @@ export class AzureCosmosDbManager {
             const cosmosdbSqlRoleDefinitionContributor = this.resolveSqlRoleDefinition(scope, cosmosDbAccount.name, resourceGroupName, CosmosRoleDefinitionId.CONTRIBUTOR, resourceOptions);
             this.createSqlResourceSqlRoleAssignment(`${id}-cdb-ra-contributor`, scope, {
                 accountName: cosmosDbAccount.name,
-                resourceGroupName: resourceGroupName,
+                resourceGroupName,
                 roleDefinitionId: cosmosdbSqlRoleDefinitionContributor.id,
                 principalId,
                 scope: cosmosDbAccount.id,
@@ -153,7 +147,7 @@ export class AzureCosmosDbManager {
             const cosmosdbSqlRoleDefinitionReader = this.resolveSqlRoleDefinition(scope, cosmosDbAccount.name, resourceGroupName, CosmosRoleDefinitionId.READER, resourceOptions);
             this.createSqlResourceSqlRoleAssignment(`${id}-cdb-ra-reader`, scope, {
                 accountName: cosmosDbAccount.name,
-                resourceGroupName: resourceGroupName,
+                resourceGroupName,
                 roleDefinitionId: cosmosdbSqlRoleDefinitionReader.id,
                 principalId,
                 scope: cosmosDbAccount.id,

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

@@ -30,18 +30,16 @@ export class AzureDnsManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Zone(`${id}-dz`, {
             ...props,
             zoneName: scope.resourceNameFormatter.format(props.zoneName?.toString(), scope.props.resourceNameOptions?.dnsZone),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: 'global', // DNS zones are always global
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/eventgrid/main.js

@@ -30,18 +30,16 @@ export class AzureEventgridManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Topic(`${id}-et`, {
             ...props,
             topicName: scope.resourceNameFormatter.format(props.topicName?.toString(), scope.props.resourceNameOptions?.eventGridTopic),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
-            tags: props.tags ?? {
+            resourceGroupName,
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }
@@ -58,7 +56,7 @@ export class AzureEventgridManager {
             throw new Error(`Props undefined for ${id}`);
         return getTopicOutput({
             topicName: scope.resourceNameFormatter.format(props.topicName?.toString(), scope.props.resourceNameOptions?.eventGridTopic),
-            resourceGroupName: scope.props.resourceGroupName
+            resourceGroupName: (props.resourceGroupName ?? scope.props.resourceGroupName)
                 ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
                 : props.resourceGroupName,
         }, { parent: scope, ...resourceOptions });
@@ -95,18 +93,16 @@ export class AzureEventgridManager {
     createEventgridSystemTopic(id, scope, props, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new SystemTopic(`${id}-est`, {
             ...props,
             systemTopicName: scope.resourceNameFormatter.format(props.systemTopicName?.toString(), scope.props.resourceNameOptions?.eventGridSystemTopic),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
-            tags: props.tags ?? {
+            resourceGroupName,
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }
@@ -122,16 +118,12 @@ export class AzureEventgridManager {
     createEventgridSystemTopicEventSubscription(id, scope, props, systemTopic, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new SystemTopicEventSubscription(`${id}-ests`, {
             ...props,
             eventSubscriptionName: scope.resourceNameFormatter.format(props.eventSubscriptionName?.toString(), scope.props.resourceNameOptions?.eventGridSystemTopicEventSubscription),
             systemTopicName: systemTopic.name,
-            resourceGroupName: props.resourceGroupName ?? resourceGroupName,
+            resourceGroupName,
         }, { parent: scope, ...resourceOptions });
     }
 }

package/dist/src/services/function/main.js

@@ -32,22 +32,20 @@ export class AzureFunctionManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new WebApp(`${id}-fa`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.linuxFunctionApp),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             kind: props.kind ?? 'functionapp,linux',
             identity: props.identity ?? {
                 type: ManagedServiceIdentityType.SystemAssigned,
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }
@@ -65,12 +63,10 @@ export class AzureFunctionManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : '';
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new WebAppFunction(`${id}-fc`, {
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionAppFunction),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             functionAppId: props.functionAppId,
             config: props.configJson,
             isDisabled: props.enabled !== undefined ? !props.enabled : false,
@@ -89,16 +85,12 @@ export class AzureFunctionManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         const functionApp = new WebApp(`${id}-fc`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             kind: props.kind ?? 'functionapp,linux',
             httpsOnly: props.httpsOnly ?? true,
             identity: props.identity ?? {
@@ -120,13 +112,15 @@ export class AzureFunctionManager {
                 http20Enabled: true,
                 linuxFxVersion: `${props.runtime?.name ?? 'node'}|${props.runtime?.version ?? CommonAzureStack.NODEJS_RUNTIME}`,
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
         const functionAppConfig = props.functionAppConfig;
         new Deployment(`${id}-deployment`, {
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             properties: {
                 mode: DeploymentMode.Incremental,
                 template: {
@@ -181,11 +175,7 @@ export class AzureFunctionManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Resource(`${id}-fc`, {
             apiVersion: '2024-04-01',
             identity: {
@@ -215,7 +205,7 @@ export class AzureFunctionManager {
                     },
                 },
             },
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             resourceName: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
             resourceProviderNamespace: 'Microsoft.Web',
             resourceType: 'sites',

package/dist/src/services/function/types.d.ts

@@ -1,11 +1,11 @@
 import { input } from '@pulumi/azure-native/types/index.js';
-import { WebAppArgs } from '@pulumi/azure-native/web/index.js';
+import { WebAppArgs, WebAppFunctionArgs } from '@pulumi/azure-native/web/index.js';
 /** @category Interface */
 export interface FunctionAppProps extends WebAppArgs {
     name?: string;
 }
 /** @category Interface */
-export interface FunctionProps {
+export interface FunctionProps extends WebAppFunctionArgs {
     name: string;
     functionAppId: string;
     language?: string;

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

@@ -30,16 +30,12 @@ export class AzureKeyVaultManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Vault(`${id}-kv`, {
             ...props,
             vaultName: scope.resourceNameFormatter.format(props.vaultName?.toString(), scope.props.resourceNameOptions?.keyVault),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             properties: {
                 ...props.properties,
                 sku: props.properties?.sku ?? {
@@ -52,8 +48,10 @@ export class AzureKeyVaultManager {
                 softDeleteRetentionInDays: props.properties?.softDeleteRetentionInDays ?? 90,
                 enablePurgeProtection: props.properties?.enablePurgeProtection ?? true,
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/operational-insights/main.js

@@ -30,22 +30,20 @@ export class AzureOperationalInsightsManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Workspace(`${id}-lw`, {
             ...props,
             workspaceName: scope.resourceNameFormatter.format(props.workspaceName?.toString(), scope.props.resourceNameOptions?.logAnalyticsWorkspace),
             location: props.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             sku: props.sku ?? {
                 name: WorkspaceSkuNameEnum.PerGB2018,
             },
             retentionInDays: props.retentionInDays ?? 30,
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/redis/main.js

@@ -31,16 +31,12 @@ export class AzureRedisManager {
         if (!clusterProps)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : clusterProps.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = clusterProps.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         const cluster = new RedisEnterprise(`${id}-rc`, {
             ...clusterProps,
             clusterName: scope.resourceNameFormatter.format(clusterProps.clusterName?.toString(), scope.props.resourceNameOptions?.managedRedis),
             location: clusterProps.location ?? scope.props.location,
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             sku: clusterProps.sku ?? {
                 name: SkuName.Balanced_B0,
             },
@@ -51,7 +47,7 @@ export class AzureRedisManager {
         const database = new Database(`${id}-db`, {
             ...databaseProps,
             clusterName: cluster.name,
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             databaseName: databaseProps?.databaseName ?? 'default',
         }, { parent: scope, dependsOn: [cluster], ...resourceOptions });
         return { cluster, database };

package/dist/src/services/resource-group/main.js

@@ -33,8 +33,10 @@ export class AzureResourceGroupManager {
             ...props,
             resourceGroupName: scope.resourceNameFormatter.format(props.resourceGroupName?.toString(), scope.props.resourceNameOptions?.resourceGroup),
             location: props.location,
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }

package/dist/src/services/servicebus/main.js

@@ -30,15 +30,11 @@ export class AzureServiceBusManager {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : props.resourceGroupName;
-        if (!resourceGroupName)
-            throw new Error(`Resource group name undefined for ${id}`);
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Namespace(`${id}-sn`, {
             ...props,
             namespaceName: scope.resourceNameFormatter.format(props.namespaceName?.toString(), scope.props.resourceNameOptions?.serviceBusNamespace),
-            resourceGroupName: resourceGroupName,
+            resourceGroupName,
             location: props.location ?? scope.props.location,
             identity: props.identity ?? {
                 type: ManagedServiceIdentityType.SystemAssigned,
@@ -46,8 +42,10 @@ export class AzureServiceBusManager {
             sku: props.sku ?? {
                 name: SkuName.Standard,
             },
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
     }
@@ -65,8 +63,6 @@ export class AzureServiceBusManager {
         return new Topic(`${id}-st`, {
             ...props,
             topicName: scope.resourceNameFormatter.format(props.topicName?.toString(), scope.props.resourceNameOptions?.serviceBusTopic),
-            namespaceName: props.namespaceName,
-            resourceGroupName: props.resourceGroupName,
         }, { parent: scope, ...resourceOptions });
     }
     /**
@@ -83,8 +79,6 @@ export class AzureServiceBusManager {
         return new Queue(`${id}-sq`, {
             ...props,
             queueName: scope.resourceNameFormatter.format(props.queueName?.toString(), scope.props.resourceNameOptions?.serviceBusQueue),
-            namespaceName: props.namespaceName,
-            resourceGroupName: props.resourceGroupName,
             duplicateDetectionHistoryTimeWindow: props.duplicateDetectionHistoryTimeWindow ?? 'PT1M',
             requiresDuplicateDetection: props.requiresDuplicateDetection ?? true,
             deadLetteringOnMessageExpiration: props.deadLetteringOnMessageExpiration ?? true,

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

@@ -30,9 +30,7 @@ export class AzureStorageManager {
     createStorageAccount(id, scope, props, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : `${props.resourceGroupName}`;
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         const storageAccount = new StorageAccount(`${id}-sa`, {
             ...props,
             accountName: scope.resourceNameFormatter
@@ -46,8 +44,10 @@ export class AzureStorageManager {
             },
             kind: props.kind ?? Kind.StorageV2,
             location: props.location ?? scope.props.location,
-            tags: props.tags ?? {
+            tags: {
                 environment: scope.props.stage,
+                ...scope.props.defaultTags,
+                ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
         new BlobServiceProperties(`${id}-blob-props`, {
@@ -75,9 +75,7 @@ export class AzureStorageManager {
     createStorageContainer(id, scope, props, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : `${props.resourceGroupName}`;
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new BlobContainer(`${id}-sc`, {
             ...props,
             containerName: scope.resourceNameFormatter.format(props.containerName?.toString(), scope.props.resourceNameOptions?.storageContainer),
@@ -97,9 +95,7 @@ export class AzureStorageManager {
     createStorageBlob(id, scope, props, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : `${props.resourceGroupName}`;
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Blob(`${id}-sb`, {
             ...props,
             blobName: scope.resourceNameFormatter.format(props.blobName?.toString(), scope.props.resourceNameOptions?.storageBlob),
@@ -126,9 +122,7 @@ export class AzureStorageManager {
      * @see https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/liststorageaccountsas/
      */
     generateContainerSasToken(id, scope, props, storageAccount) {
-        const resourceGroupName = scope.props.resourceGroupName
-            ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-            : `${props.resourceGroupName}`;
+        const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return pulumi
             .all([storageAccount.name])
             .apply(([accountName]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils-azure",
-  "version": "2.15.0",
+  "version": "2.17.0",
   "description": "Azure Pulumi utilities for @gradientedge/cdk-utils",
   "type": "module",
   "main": "dist/src/index.js",