@gradientedge/cdk-utils-azure 2.11.0 → 2.11.1

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

@@ -26,6 +26,8 @@ export class AzureEventHandler extends AzureFunctionApp {
         super(id, props);
         this.props = props;
         this.id = id;
+        this.eventGridEventSubscription = {};
+        this.serviceBus = {};
     }
     /**
      * @summary Initialise and provision resources
@@ -48,7 +50,7 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the dead-letter queue storage account for EventGrid subscriptions
      */
     createEventGridSubscriptionDlqStorageAccount() {
-        if (!this.props.eventGridSubscription.dlqStorageAccount)
+        if (!this.props.eventGridSubscription || !this.props.eventGridSubscription.dlqStorageAccount)
             return;
         this.eventGridEventSubscription.dlqStorageAccount = this.storageManager.createStorageAccount(`${this.id}-eventgrid-subscription-dlq-storage-account`, this, {
             ...this.props.eventGridSubscription.dlqStorageAccount,
@@ -60,7 +62,7 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the dead-letter queue storage container for EventGrid subscriptions
      */
     createEventGridSubscriptionDlqStorageContainer() {
-        if (!this.eventGridEventSubscription.dlqStorageAccount)
+        if (!this.eventGridEventSubscription || !this.eventGridEventSubscription.dlqStorageAccount)
             return;
         this.eventGridEventSubscription.dlqStorageContainer = this.storageManager.createStorageContainer(`${this.id}-eventgrid-subscription-dlq-container`, this, {
             ...this.props.eventGridSubscription.dlqStorageContainer,
@@ -73,7 +75,7 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the Service Bus namespace
      */
     createServiceBusNamespace() {
-        if (this.props.serviceBus.useExisting && this.props.serviceBus.namespace.namespaceName) {
+        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,
@@ -81,8 +83,8 @@ export class AzureEventHandler extends AzureFunctionApp {
         }
         else {
             this.serviceBus.namespace = this.serviceBusManager.createServiceBusNamespace(this.id, this, {
-                ...this.props.serviceBus.namespace,
-                namespaceName: this.props.serviceBus.namespace.namespaceName ?? this.id,
+                ...this.props.serviceBus?.namespace,
+                namespaceName: this.props.serviceBus?.namespace?.namespaceName ?? this.id,
                 resourceGroupName: this.resourceGroup.name,
             }, { ignoreChanges: ['location'] });
         }
@@ -94,9 +96,9 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the Service Bus queue
      */
     createServiceBusQueue() {
-        if (this.props.serviceBus.useExisting &&
-            this.props.serviceBus.namespace.namespaceName &&
-            this.props.serviceBus.queue.queueName) {
+        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,
@@ -105,9 +107,10 @@ export class AzureEventHandler extends AzureFunctionApp {
         }
         else {
             this.serviceBus.queue = this.serviceBusManager.createServiceBusQueue(this.id, this, {
-                ...this.props.serviceBus.queue,
-                queueName: this.props.serviceBus.queue.queueName ?? this.id,
+                ...this.props.serviceBus?.queue,
+                queueName: this.props.serviceBus?.queue?.queueName ?? this.id,
                 namespaceName: this.serviceBus.namespace.name,
+                resourceGroupName: this.resourceGroup.name,
             });
         }
         this.registerOutputs({
@@ -148,20 +151,20 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create the EventGrid event subscription with Service Bus queue destination
      */
     createEventGridEventSubscription() {
-        if (this.props.serviceBus.useExisting)
+        if (this.props.serviceBus?.useExisting || !this.eventGridEventSubscription.dlqStorageAccount)
             return;
         this.eventGridEventSubscription.eventSubscription = this.eventgridManager.createEventgridSubscription(this.id, this, {
             ...this.props.eventGridEventSubscription,
-            eventSubscriptionName: this.props.eventGridEventSubscription.eventSubscriptionName ?? this.id,
+            eventSubscriptionName: this.props.eventGridEventSubscription?.eventSubscriptionName ?? this.id,
             scope: this.eventGridTopic.id,
             destination: {
                 endpointType: 'ServiceBusQueue',
                 resourceId: this.serviceBus.queue.id,
             },
             deadLetterDestination: {
-                blobContainerName: this.eventGridEventSubscription.dlqStorageContainer.name,
+                blobContainerName: this.eventGridEventSubscription.dlqStorageContainer?.name,
                 endpointType: 'StorageBlob',
-                resourceId: this.eventGridEventSubscription.dlqStorageAccount.id,
+                resourceId: this.eventGridEventSubscription.dlqStorageAccount?.id,
             },
         }, { dependsOn: [this.eventGridTopic] });
     }
@@ -169,7 +172,7 @@ export class AzureEventHandler extends AzureFunctionApp {
      * @summary Method to create diagnostic log settings for the Service Bus namespace
      */
     createServiceBusDiagnosticLog() {
-        if (this.props.serviceBus.useExisting)
+        if (this.props.serviceBus?.useExisting)
             return;
         this.monitorManager.createMonitorDiagnosticSettings(this.id, this, {
             name: `${this.id}-servicebus`,
@@ -216,7 +219,7 @@ export class AzureEventHandler extends AzureFunctionApp {
             {
                 name: 'EVENT_INGEST_SERVICE_BUS',
                 value: listNamespaceKeysOutput({
-                    resourceGroupName: this.props.serviceBus.namespace.resourceGroupName,
+                    resourceGroupName: this.props.serviceBus?.namespace?.resourceGroupName ?? this.resourceGroup.name,
                     namespaceName: this.serviceBus.namespace.name,
                     authorizationRuleName: 'RootManageSharedAccessKey',
                 }).primaryConnectionString,

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

@@ -17,8 +17,8 @@ export interface EventHandlerEventGridSubscription {
 }
 /** @category Interface */
 export interface EventHandlerServiceBusProps {
-    namespace: ServiceBusNamespaceProps;
-    queue: ServiceBusQueueProps;
+    namespace?: ServiceBusNamespaceProps;
+    queue?: ServiceBusQueueProps;
     useExisting?: boolean;
 }
 /** @category Interface */
@@ -36,8 +36,8 @@ export interface EventHandlerEventGridTopicProps extends EventgridTopicProps {
 /** @category Interface */
 export interface AzureEventHandlerProps extends AzureFunctionAppProps {
     defender?: DefenderForStorageProps;
-    eventGridEventSubscription: EventgridEventSubscriptionProps;
+    eventGridEventSubscription?: EventgridEventSubscriptionProps;
     eventGridSubscription: EventHandlerEventGridSubscriptionProps;
     eventGridTopic: EventHandlerEventGridTopicProps;
-    serviceBus: EventHandlerServiceBusProps;
+    serviceBus?: EventHandlerServiceBusProps;
 }

package/dist/src/construct/function-app/main.js

@@ -37,8 +37,8 @@ export class AzureFunctionApp extends CommonAzureConstruct {
     appConfig;
     appCodeArchiveFile;
     appConfigHash;
-    appKeyVaultsByResourceGroup;
-    appConnectionStrings;
+    appKeyVaultsByResourceGroup = {};
+    appConnectionStrings = [];
     appConfigPrefix;
     appConfigurationsParsedConfig;
     appConfigurationsOriginalParsedConfig;
@@ -271,7 +271,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
     createFunctionApp(resourceOptions) {
         this.app = this.functionManager.createFunctionAppFlexConsumption(`${this.id}-function-app-flex`, this, {
             ...this.props.functionApp,
-            name: this.props.functionApp.app.name ?? this.id,
+            name: this.props.functionApp.app?.name ?? this.id,
             serverFarmId: this.appServicePlan.id,
             resourceGroupName: this.resourceGroup.name,
             functionAppConfig: {
@@ -307,7 +307,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
                 ],
                 connectionStrings: Object.fromEntries(this.appConnectionStrings.map(cs => [cs.name, { type: cs.type, value: cs.value }])),
             },
-            httpsOnly: this.props.functionApp.app.httpsOnly ?? true,
+            httpsOnly: this.props.functionApp.app?.httpsOnly ?? true,
         }, { ...resourceOptions });
     }
     /**
@@ -369,7 +369,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
             resourceGroupName: this.resourceGroup.name,
             variables: this.dashboardVariables(),
             panes: this.props.functionApp.dashboard.panes,
-            properties: this.appConfigurationsOriginalParsedConfig.appConfig,
+            properties: this.appConfigurationsOriginalParsedConfig?.appConfig,
         });
     }
 }

package/dist/src/construct/function-app/types.d.ts

@@ -5,7 +5,7 @@ export interface OtelProps {
 }
 /** @category Interface */
 export interface FunctionAppProperties {
-    app: FunctionAppFlexConsumptionProps;
+    app?: FunctionAppFlexConsumptionProps;
     appConfiguration: AppConfigurationProps;
     dashboard: PortalDashboardProps;
     deploymentStorageContainer: StorageContainerProps;

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

@@ -21,7 +21,7 @@ import { RoleDefinitionId } from '../../services/index.js';
  */
 export class AzureRestApi extends CommonAzureConstruct {
     props;
-    api;
+    api = {};
     applicationInsights;
     constructor(id, props) {
         super(id, props);

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

@@ -22,11 +22,12 @@ import { AzureFunctionApp } from '../function-app/index.js';
  */
 export class AzureRestApiFunction extends AzureFunctionApp {
     props;
-    api;
+    api = {};
     constructor(id, props) {
         super(id, props);
         this.props = props;
         this.id = id;
+        this.api.apiOperations = {};
     }
     /**
      * @summary Initialise and provision resources

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

@@ -60,13 +60,15 @@ export class AzureAppConfigurationManager {
             return false;
         if ('databaseName' in obj || 'tableName' in obj)
             return true;
-        return Object.values(obj).some(val => this.hasCosmosDependencies(val));
+        return Object.values(obj).some(v => this.hasCosmosDependencies(v));
     };
     /**
      * @summary Determine if the config object has eventgrid target dependencies
      * @param obj the config object value
      */
     static hasEventGridTargets(obj) {
-        return (obj && typeof obj === 'object' && ('eventGridTargets' in obj || Object.values(obj).some(this.hasEventGridTargets)));
+        return (obj &&
+            typeof obj === 'object' &&
+            ('eventGridTargets' in obj || Object.values(obj).some(v => this.hasEventGridTargets(v))));
     }
 }

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

@@ -37,7 +37,7 @@ export class AzurePortalManager {
         const dashboardRenderer = renderer ?? new AzureDashboardRenderer();
         const templateFile = dashboardRenderer.renderToFile(dashboardName, props);
         const template = fs.readFileSync(templateFile, 'utf-8');
-        const content = Object.entries(props.variables).reduce((result, [key, value]) => result.replaceAll(`\${${key}}`, String(value)), template);
+        const content = Object.entries(props.variables).reduce((result, [key, value]) => result.replaceAll(`\${${key}}`, JSON.stringify(String(value)).slice(1, -1)), template);
         return new Dashboard(`${id}-dashboard`, {
             ...props,
             dashboardName: scope.resourceNameFormatter.format(props.dashboardName?.toString(), scope.props.resourceNameOptions?.portalDashboard),

package/dist/src/services/portal/renderer.js

@@ -19,14 +19,14 @@ export class AzureDashboardRenderer {
         return paneTemplate;
     }
     getMissingProperties(template, properties = []) {
-        const keys = Object.keys(template.properties).filter(key => !(key in properties));
+        const keys = Object.keys(template.properties ?? {}).filter(key => !(key in properties));
         return {
             keys,
             hasMissingKeys: keys.length !== 0,
         };
     }
     getMissingVariables(template, variables) {
-        const keys = Object.keys(template.variables).filter(key => !(key in variables));
+        const keys = Object.keys(template.variables ?? {}).filter(key => !(key in variables));
         return {
             keys,
             hasMissingKeys: keys.length !== 0,

package/package.json

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