@gradientedge/cdk-utils-azure 2.6.0 → 2.8.0

package/dist/src/common/construct.js

@@ -82,7 +82,7 @@ export class CommonAzureConstruct extends ComponentResource {
         if (this.resourceGroup)
             return;
         this.resourceGroup = this.resourceGroupManager.createResourceGroup(`${this.id}`, this, {
-            resourceGroupName: this.props.stackName,
+            resourceGroupName: this.id,
             location: this.props.location,
         });
         this.registerOutputs({

package/dist/src/construct/event-handler/main.d.ts

@@ -59,4 +59,5 @@ export declare class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to enable Microsoft Defender malware scanning on the data storage account
      */
     protected enableMalwareScanningOnDataStorageAccount(): void;
+    protected createFunctionAppSiteConfig(): void;
 }

package/dist/src/construct/event-handler/main.js

@@ -1,5 +1,6 @@
 import { Provider } from '@pulumi/azure-native';
 import { getTopicOutput } from '@pulumi/azure-native/eventgrid/index.js';
+import { getNamespaceOutput, getQueueOutput, listNamespaceKeysOutput } from '@pulumi/azure-native/servicebus/index.js';
 import { AzureFunctionApp } from '../function-app/index.js';
 /**
  * Provides a construct to create and deploy an Azure EventGrid Event Handler with Service Bus integration
@@ -47,6 +48,8 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the dead-letter queue storage account for EventGrid subscriptions
      */
     createEventGridSubscriptionDlqStorageAccount() {
+        if (this.props.serviceBus.useExisting)
+            return;
         this.eventGridEventSubscription.dlqStorageAccount = this.storageManager.createStorageAccount(`${this.id}-eventgrid-subscription-dlq-storage-account`, this, {
             ...this.props.eventGridSubscription.dlqStorageAccount,
             resourceGroupName: this.resourceGroup.name,
@@ -57,6 +60,8 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the dead-letter queue storage container for EventGrid subscriptions
      */
     createEventGridSubscriptionDlqStorageContainer() {
+        if (this.props.serviceBus.useExisting)
+            return;
         this.eventGridEventSubscription.dlqStorageContainer = this.storageManager.createStorageContainer(`${this.id}-eventgrid-subscription-dlq-container`, this, {
             ...this.props.eventGridSubscription.dlqStorageContainer,
             accountName: this.eventGridEventSubscription.dlqStorageAccount.name,
@@ -68,11 +73,19 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the Service Bus namespace
      */
     createServiceBusNamespace() {
-        this.serviceBus.namespace = this.serviceBusManager.createServiceBusNamespace(this.id, this, {
-            ...this.props.serviceBus.namespace,
-            namespaceName: this.props.serviceBus.namespace.namespaceName ?? this.id,
-            resourceGroupName: this.resourceGroup.name,
-        }, { ignoreChanges: ['location'] });
+        if (this.props.serviceBus.useExisting && this.props.serviceBus.namespace.namespaceName) {
+            this.serviceBus.namespace = getNamespaceOutput({
+                namespaceName: this.props.serviceBus.namespace.namespaceName,
+                resourceGroupName: this.props.serviceBus.namespace.resourceGroupName,
+            });
+        }
+        else {
+            this.serviceBus.namespace = this.serviceBusManager.createServiceBusNamespace(this.id, this, {
+                ...this.props.serviceBus.namespace,
+                namespaceName: this.props.serviceBus.namespace.namespaceName ?? this.id,
+                resourceGroupName: this.resourceGroup.name,
+            }, { ignoreChanges: ['location'] });
+        }
         this.registerOutputs({
             serviceBusNamespaceId: this.serviceBus.namespace.id,
         });
@@ -81,11 +94,22 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the Service Bus queue
      */
     createServiceBusQueue() {
-        this.serviceBus.queue = this.serviceBusManager.createServiceBusQueue(this.id, this, {
-            ...this.props.serviceBus.queue,
-            queueName: this.props.serviceBus.queue.queueName ?? this.id,
-            namespaceName: this.serviceBus.namespace.name,
-        });
+        if (this.props.serviceBus.useExisting &&
+            this.props.serviceBus.namespace.namespaceName &&
+            this.props.serviceBus.queue.queueName) {
+            this.serviceBus.queue = getQueueOutput({
+                namespaceName: this.props.serviceBus.namespace.namespaceName,
+                queueName: this.props.serviceBus.queue.queueName,
+                resourceGroupName: this.props.serviceBus.namespace.resourceGroupName,
+            });
+        }
+        else {
+            this.serviceBus.queue = this.serviceBusManager.createServiceBusQueue(this.id, this, {
+                ...this.props.serviceBus.queue,
+                queueName: this.props.serviceBus.queue.queueName ?? this.id,
+                namespaceName: this.serviceBus.namespace.name,
+            });
+        }
         this.registerOutputs({
             serviceBusQueueId: this.serviceBus.queue.id,
             serviceBusQueueName: this.serviceBus.queue.name,
@@ -124,6 +148,8 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the EventGrid event subscription with Service Bus queue destination
      */
     createEventGridEventSubscription() {
+        if (this.props.serviceBus.useExisting)
+            return;
         this.eventGridEventSubscription.eventSubscription = this.eventgridManager.createEventgridSubscription(this.id, this, {
             ...this.props.eventGridEventSubscription,
             eventSubscriptionName: this.props.eventGridEventSubscription.eventSubscriptionName ?? this.id,
@@ -143,8 +169,10 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create diagnostic log settings for the Service Bus namespace
      */
     createServiceBusDiagnosticLog() {
+        if (this.props.serviceBus.useExisting)
+            return;
         this.monitorManager.createMonitorDiagnosticSettings(this.id, this, {
-            name: `${this.props.stackName}-servicebus`,
+            name: `${this.id}-servicebus`,
             resourceUri: this.serviceBus.namespace.id,
             workspaceId: this.commonLogAnalyticsWorkspace.id,
             logAnalyticsDestinationType: 'Dedicated',
@@ -178,4 +206,22 @@ export class AzureEventHandler extends AzureFunctionApp {
             },
         });
     }
+    createFunctionAppSiteConfig() {
+        super.createFunctionAppSiteConfig();
+        this.appEnvironmentVariables = {
+            ...this.appEnvironmentVariables,
+            EVENT_INGEST_QUEUE_NAME: this.serviceBus.queue.name,
+        };
+        this.appConnectionStrings = [
+            {
+                name: 'EVENT_INGEST_SERVICE_BUS',
+                value: listNamespaceKeysOutput({
+                    resourceGroupName: this.props.serviceBus.namespace.resourceGroupName,
+                    namespaceName: this.serviceBus.namespace.name,
+                    authorizationRuleName: 'RootManageSharedAccessKey',
+                }).primaryConnectionString,
+                type: 'ServiceBus',
+            },
+        ];
+    }
 }

package/dist/src/construct/event-handler/types.d.ts

@@ -1,7 +1,7 @@
 import { EventSubscription } from '@pulumi/azure-native/eventgrid/index.js';
-import { Namespace, Queue } from '@pulumi/azure-native/servicebus/index.js';
+import { GetNamespaceResult, GetQueueResult, Namespace, Queue } from '@pulumi/azure-native/servicebus/index.js';
 import { BlobContainer, StorageAccount } from '@pulumi/azure-native/storage/index.js';
-import { Input } from '@pulumi/pulumi';
+import { Input, Output } from '@pulumi/pulumi';
 import { DefenderForStorageProps, EventgridEventSubscriptionProps, EventgridTopicProps, ServiceBusNamespaceProps, ServiceBusQueueProps, StorageAccountProps, StorageContainerProps } from '../../services/index.js';
 import { AzureFunctionAppProps } from '../function-app/index.js';
 /** @category Interface */
@@ -19,11 +19,12 @@ export interface EventHandlerEventGridSubscription {
 export interface EventHandlerServiceBusProps {
     namespace: ServiceBusNamespaceProps;
     queue: ServiceBusQueueProps;
+    useExisting?: boolean;
 }
 /** @category Interface */
 export interface EventHandlerServiceBus {
-    namespace: Namespace;
-    queue: Queue;
+    namespace: Namespace | Output<GetNamespaceResult>;
+    queue: Queue | Output<GetQueueResult>;
 }
 /** @category Interface */
 export interface EventHandlerEventGridTopicProps extends EventgridTopicProps {

package/dist/src/construct/rest-api/main.js

@@ -89,7 +89,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             }
             this.api.apim = this.apiManagementManager.createApiManagementService(this.id, this, {
                 ...this.props.apiManagement,
-                serviceName: this.props.stackName,
+                serviceName: this.id,
                 location: this.resourceGroup.location,
                 resourceGroupName: this.resourceGroup.name,
                 hostnameConfigurations,
@@ -131,7 +131,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             return;
         this.api.namedValueSecret = this.keyVaultManager.createKeyVaultSecret(`${this.id}-key-vault-api-namespace-secret`, this, {
             vaultName: this.api.authKeyVault.name,
-            secretName: `${this.applicationInsights.name}-${this.props.stackName}-key`,
+            secretName: `${this.applicationInsights.name}-${this.id}-key`,
             resourceGroupName: this.resourceGroup.name,
             properties: {
                 value: this.applicationInsights.instrumentationKey,
@@ -154,7 +154,7 @@ export class AzureRestApi extends CommonAzureConstruct {
         });
         this.keyVaultManager.createKeyVaultSecret(`${this.id}-key-vault-api-subscription-key-secret`, this, {
             vaultName: this.api.authKeyVault.name,
-            secretName: `${this.props.stackName}-subscription-key`,
+            secretName: `${this.id}-subscription-key`,
             resourceGroupName: this.resourceGroup.name,
             properties: {
                 value: apiManagementSubscription.primaryKey.apply(key => key ?? ''),
@@ -209,7 +209,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             return;
         this.monitorManager.createMonitorDiagnosticSettings(`${this.id}-apim-diagnostic`, this, {
             ...this.props.apiManagementDiagnosticSettings,
-            name: `${this.props.stackName}-api-management`,
+            name: `${this.id}-api-management`,
             resourceUri: this.api.apim.id,
             workspaceId: this.commonLogAnalyticsWorkspace.id,
         });

package/dist/src/construct/rest-api-function/main.js

@@ -111,7 +111,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
             }
             this.api.apim = this.apiManagementManager.createApiManagementService(this.id, this, {
                 ...this.props.apiManagement,
-                serviceName: this.props.stackName,
+                serviceName: this.id,
                 location: this.resourceGroup.location,
                 resourceGroupName: this.resourceGroup.name,
                 hostnameConfigurations,
@@ -143,7 +143,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         });
         this.api.backend = this.apiManagementManager.createBackend(this.id, this, {
             ...this.props.apiManagementBackend,
-            title: this.props.stackName,
+            title: this.id,
             resourceGroupName: this.api.resourceGroupName,
             serviceName: this.api.name,
             url: pulumi.interpolate `https://${this.app.name}.azurewebsites.net/${this.props.apiManagementBackend.backendUrlPath}`,
@@ -161,7 +161,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
     createApiManagementRoutes() {
         this.api.managementApi = this.apiManagementManager.createApi(`${this.id}-apim-api`, this, {
             ...this.props.apiManagementApi,
-            displayName: this.props.apiManagementApi.displayName ?? this.props.stackName,
+            displayName: this.props.apiManagementApi.displayName ?? this.id,
             serviceName: this.api.name,
             resourceGroupName: this.api.resourceGroupName,
             isCurrent: this.props.apiManagementApi.isCurrent ?? true,

package/dist/src/construct/rest-api-with-cache/main.js

@@ -37,7 +37,7 @@ export class AzureRestApiWithCache extends AzureRestApi {
     createRedisCache() {
         this.api.redis = this.redisManager.createManagedRedis(this.id, this, {
             ...this.props.apiManagementManagedRedis,
-            name: this.props.stackName,
+            name: this.id,
             location: this.resourceGroup.location,
             resourceGroupName: this.resourceGroup.name,
         }, { ignoreChanges: ['location'] });

package/dist/src/services/authorisation/main.d.ts

@@ -40,7 +40,7 @@ export declare class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToKeyVault(id: string, scope: CommonAzureConstruct, vaultName: string, resourceGroupName: string, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToKeyVault(id: string, scope: CommonAzureConstruct, vaultName: string, resourceGroupName: Input<string>, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
     /**
      * @summary Method to grant a role assignment to event grid topic
      * @param id scoped id of the resource
@@ -51,7 +51,7 @@ export declare class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToEventgridTopic(id: string, scope: CommonAzureConstruct, topicName: string, resourceGroupName: string, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToEventgridTopic(id: string, scope: CommonAzureConstruct, topicName: Input<string>, resourceGroupName: Input<string>, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
     /**
      * @summary Method to grant a role assignment to application configuration
      * @param id scoped id of the resource

package/dist/src/services/key-vault/main.d.ts

@@ -1,4 +1,4 @@
-import { ResourceOptions } from '@pulumi/pulumi';
+import { Input, ResourceOptions } from '@pulumi/pulumi';
 import { CommonAzureConstruct } from '../../common/index.js';
 import { KeyVaultProps, SecretProps } from './types.js';
 /**
@@ -46,5 +46,5 @@ export declare class AzureKeyVaultManager {
      * @param resourceGroupName the resource group name
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    resolveKeyVault(scope: CommonAzureConstruct, vaultName: string, resourceGroupName: string, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/keyvault/getVault.js").GetVaultResult>;
+    resolveKeyVault(scope: CommonAzureConstruct, vaultName: string, resourceGroupName: Input<string>, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/keyvault/getVault.js").GetVaultResult>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils-azure",
-  "version": "2.6.0",
+  "version": "2.8.0",
   "description": "Azure Pulumi utilities for @gradientedge/cdk-utils",
   "type": "module",
   "main": "dist/src/index.js",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@pulumi/archive": "0.3.7",
     "@pulumi/azure-native": "3.16.0",
-    "@pulumi/pulumi": "3.229.0",
+    "@pulumi/pulumi": "3.230.0",
     "@types/lodash": "4.17.24",
     "app-root-path": "3.1.0",
     "lodash": "4.18.1",