@gradientedge/cdk-utils 9.49.0 → 9.51.0

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

@@ -1,6 +1,6 @@
 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 { AzureStorageManager, AzureKeyVaultManager, AzureApiManagementManager, AzureFunctionManager, AzureResourceGroupManager, AzureAppServiceManager, AzureApplicationInsightsManager, AzureAppConfigurationManager, AzureCosmosDbManager, AzureServicebusManager, AzureEventgridManager, AzureDnsManager, AzureLogAnalyticsWorkspaceManager, AzureMonitorManager } from '../services';
 import { CommonAzureStackProps } from './types';
 import { AzureResourceNameFormatter } from './resource-name-formatter';
 export declare class CommonAzureConstruct extends TerraformStack {
@@ -17,6 +17,7 @@ export declare class CommonAzureConstruct extends TerraformStack {
     id: string;
     keyVaultManager: AzureKeyVaultManager;
     logAnalyticsWorkspaceManager: AzureLogAnalyticsWorkspaceManager;
+    monitorManager: AzureMonitorManager;
     resourceGroupManager: AzureResourceGroupManager;
     resourceNameFormatter: AzureResourceNameFormatter;
     servicebusManager: AzureServicebusManager;

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

@@ -22,6 +22,7 @@ class CommonAzureConstruct extends cdktf_1.TerraformStack {
     id;
     keyVaultManager;
     logAnalyticsWorkspaceManager;
+    monitorManager;
     resourceGroupManager;
     resourceNameFormatter;
     servicebusManager;
@@ -41,6 +42,7 @@ class CommonAzureConstruct extends cdktf_1.TerraformStack {
         this.functiontManager = new services_1.AzureFunctionManager();
         this.keyVaultManager = new services_1.AzureKeyVaultManager();
         this.logAnalyticsWorkspaceManager = new services_1.AzureLogAnalyticsWorkspaceManager();
+        this.monitorManager = new services_1.AzureMonitorManager();
         this.resourceGroupManager = new services_1.AzureResourceGroupManager();
         this.resourceNameFormatter = new resource_name_formatter_1.AzureResourceNameFormatter(this, `${id}-rnf`, props);
         this.servicebusManager = new services_1.AzureServicebusManager();

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

@@ -144,6 +144,7 @@ class AzureApiManagementManager {
             ignoreMissingProperty: true,
             ignoreCasing: true,
             schemaValidationEnabled: false,
+            lifecycle: props.lifecycle,
         });
         if (applicationInsightsKey) {
             new api_management_logger_1.ApiManagementLogger(scope, `${id}-am-logger`, {
@@ -173,8 +174,8 @@ class AzureApiManagementManager {
         const apiManagementBackend = new api_management_backend_1.ApiManagementBackend(scope, `${id}-am-be`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-            description: props.description || `Backend for ${props.name}-${scope.props.stage}`,
-            protocol: props.protocol || 'http',
+            description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+            protocol: props.protocol ?? 'http',
         });
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name);
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendFriendlyUniqueId`, scope, apiManagementBackend.friendlyUniqueId);
@@ -194,9 +195,9 @@ class AzureApiManagementManager {
         const apiManagementApi = new api_management_api_1.ApiManagementApi(scope, `${id}-am-api`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementApi),
-            displayName: props.displayName || props.name,
-            revision: props.revision || '1',
-            protocols: props.protocols || ['https'],
+            displayName: props.displayName ?? props.name,
+            revision: props.revision ?? '1',
+            protocols: props.protocols ?? ['https'],
         });
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementApiName`, scope, apiManagementApi.name);
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementApiFriendlyUniqueId`, scope, apiManagementApi.friendlyUniqueId);

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

@@ -43,6 +43,9 @@ class AzureAppConfigurationManager {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.appConfiguration),
             resourceGroupName: resourceGroup.name,
+            identity: {
+                type: 'SystemAssigned',
+            },
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

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

@@ -75,7 +75,7 @@ class AzureAppServiceManager {
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.linuxWebApp),
             resourceGroupName: resourceGroup.name,
             httpsOnly: props.httpsOnly ?? true,
-            identity: props.identity || {
+            identity: props.identity ?? {
                 type: 'SystemAssigned',
             },
             siteConfig: {

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

@@ -43,7 +43,7 @@ class AzureApplicationInsightsManager {
             ...props,
             name: scope.resourceNameFormatter.format(props.name ?? '', scope.props.resourceNameOptions?.applicationInsights),
             resourceGroupName: resourceGroup.name,
-            applicationType: props.applicationType || 'web',
+            applicationType: props.applicationType ?? 'web',
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

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

@@ -49,7 +49,7 @@ class AzureCosmosDbManager {
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },
-            identity: props.identity || {
+            identity: props.identity ?? {
                 type: 'SystemAssigned',
             },
         });

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

@@ -67,7 +67,7 @@ class AzureDnsManager {
             throw `Props undefined for ${id}`;
         const dnsARecord = new dns_a_record_1.DnsARecord(scope, `${id}-da`, {
             ...props,
-            ttl: props.ttl || 300,
+            ttl: props.ttl ?? 300,
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },
@@ -89,7 +89,7 @@ class AzureDnsManager {
             throw `Props undefined for ${id}`;
         const dnsCnameRecord = new dns_cname_record_1.DnsCnameRecord(scope, `${id}-dc`, {
             ...props,
-            ttl: props.ttl || 300,
+            ttl: props.ttl ?? 300,
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },
@@ -111,7 +111,7 @@ class AzureDnsManager {
             throw `Props undefined for ${id}`;
         const dnsTxtRecord = new dns_txt_record_1.DnsTxtRecord(scope, `${id}-dc`, {
             ...props,
-            ttl: props.ttl || 300,
+            ttl: props.ttl ?? 300,
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

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

@@ -97,8 +97,8 @@ class AzureEventgridManager {
         const eventgridSubscription = new eventgrid_event_subscription_1.EventgridEventSubscription(scope, `${id}-es`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventGridEventSubscription),
-            eventDeliverySchema: props.eventDeliverySchema || 'CloudEventSchemaV1_0',
-            advancedFilteringOnArraysEnabled: props.advancedFilteringOnArraysEnabled || true,
+            eventDeliverySchema: props.eventDeliverySchema ?? 'CloudEventSchemaV1_0',
+            advancedFilteringOnArraysEnabled: props.advancedFilteringOnArraysEnabled ?? true,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-eventgridSubscriptiontName`, scope, eventgridSubscription.name);
         (0, utils_1.createAzureTfOutput)(`${id}-eventgridSubscriptionFriendlyUniqueId`, scope, eventgridSubscription.friendlyUniqueId);

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

@@ -1,6 +1,6 @@
 import { LinuxFunctionApp } from '@cdktf/provider-azurerm/lib/linux-function-app';
 import { FunctionAppFunction } from '@cdktf/provider-azurerm/lib/function-app-function';
-import { Resource } from '../../.gen/providers/azapi/resource';
+import { FunctionAppFlexConsumption } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption';
 import { CommonAzureConstruct } from '../../common';
 import { FunctionAppProps, FunctionProps, FunctionAppFlexConsumptionProps } from './types';
 /**
@@ -43,5 +43,5 @@ export declare class AzureFunctionManager {
      * @param scope scope in which this resource is defined
      * @param props flex consumption function app properties
      */
-    createFunctionAppFlexConsumption(id: string, scope: CommonAzureConstruct, props: FunctionAppFlexConsumptionProps): Resource;
+    createFunctionAppFlexConsumption(id: string, scope: CommonAzureConstruct, props: FunctionAppFlexConsumptionProps): FunctionAppFlexConsumption;
 }

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

@@ -4,7 +4,7 @@ exports.AzureFunctionManager = void 0;
 const data_azurerm_resource_group_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-resource-group");
 const linux_function_app_1 = require("@cdktf/provider-azurerm/lib/linux-function-app");
 const function_app_function_1 = require("@cdktf/provider-azurerm/lib/function-app-function");
-const resource_1 = require("../../.gen/providers/azapi/resource");
+const function_app_flex_consumption_1 = require("@cdktf/provider-azurerm/lib/function-app-flex-consumption");
 const cdktf_local_exec_1 = require("cdktf-local-exec");
 const utils_1 = require("../../utils");
 /**
@@ -68,7 +68,7 @@ class AzureFunctionManager {
         const functionAppFunction = new function_app_function_1.FunctionAppFunction(scope, `${id}-fc`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionAppFunction),
-            configJson: JSON.stringify(props.configJson || {}),
+            configJson: JSON.stringify(props.configJson ?? {}),
         });
         (0, utils_1.createAzureTfOutput)(`${id}-functionName`, scope, functionAppFunction.name);
         (0, utils_1.createAzureTfOutput)(`${id}-functionFriendlyUniqueId`, scope, functionAppFunction.friendlyUniqueId);
@@ -91,62 +91,27 @@ class AzureFunctionManager {
         });
         if (!resourceGroup)
             throw `Resource group undefined for ${id}`;
-        const functionApp = new resource_1.Resource(scope, `${id}-fa`, {
-            type: 'Microsoft.Web/sites@2024-04-01',
+        const functionApp = new function_app_flex_consumption_1.FunctionAppFlexConsumption(scope, `${id}-fc`, {
+            ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
             location: resourceGroup.location,
-            parentId: resourceGroup.id,
-            body: {
-                kind: props.kind || 'functionapp,linux',
-                properties: {
-                    serverFarmId: props.appServicePlanId,
-                    httpsOnly: props.httpsOnly || true,
-                    functionAppConfig: {
-                        deployment: {
-                            storage: {
-                                type: props.deploymentStorageType || 'blobContainer',
-                                value: `${props.blobEndpoint}${props.containerName}`,
-                                authentication: {
-                                    type: props.deploymentAuthenticationType || 'StorageAccountConnectionString',
-                                    storageAccountConnectionStringName: props.storageAccountConnectionStringName || 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                                },
-                            },
-                        },
-                        runtime: {
-                            name: props.runtime || 'node',
-                            version: props.runtimeVersion || '20',
-                        },
-                        scaleAndConcurrency: {
-                            alwaysReady: props.alwaysReady,
-                            instanceMemoryMB: props.instanceMemory || 2048,
-                            maximumInstanceCount: props.maximumInstanceCount || 40,
-                            triggers: {},
-                        },
-                    },
-                    siteConfig: {
-                        appSettings: props.appSettings.concat([
-                            {
-                                name: 'FUNCTIONS_EXTENSION_VERSION',
-                                value: '~4',
-                            },
-                            {
-                                name: 'AzureWebJobsStorage',
-                                value: props.storageConnectionString,
-                            },
-                            {
-                                name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                                value: props.storageConnectionString,
-                            },
-                        ]),
-                        connectionStrings: props.connectionStrings,
-                        minTlsVersion: props.minTlsVersion ?? '1.3',
-                    },
-                },
+            resourceGroupName: resourceGroup.name,
+            runtimeName: props.runtimeName ?? 'node',
+            runtimeVersion: props.runtimeVersion ?? '20',
+            storageAuthenticationType: props.storageAuthenticationType ?? 'StorageAccountConnectionString',
+            storageContainerType: props.storageContainerType ?? 'blobContainer',
+            maximumInstanceCount: props.maximumInstanceCount ?? 40,
+            instanceMemoryInMb: props.instanceMemoryInMb ?? 2048,
+            siteConfig: {
+                http2Enabled: props.siteConfig.http2Enabled ?? true,
+                ...props.siteConfig,
+            },
+            identity: props.identity ?? {
+                type: 'SystemAssigned',
+            },
+            tags: props.tags ?? {
+                environment: scope.props.stage,
             },
-            identity: [{ type: 'SystemAssigned' }],
-            ignoreMissingProperty: true,
-            ignoreCasing: true,
-            schemaValidationEnabled: false,
         });
         new cdktf_local_exec_1.Provider(scope, `${id}-local-exec-provider`);
         new cdktf_local_exec_1.LocalExec(scope, `${id}-function-app-deploy`, {

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

@@ -1,29 +1,11 @@
 import { LinuxFunctionAppConfig } from '@cdktf/provider-azurerm/lib/linux-function-app';
 import { FunctionAppFunctionConfig } from '@cdktf/provider-azurerm/lib/function-app-function';
+import { FunctionAppFlexConsumptionConfig } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption';
 export interface FunctionAppProps extends LinuxFunctionAppConfig {
 }
 export interface FunctionProps extends FunctionAppFunctionConfig {
 }
-export interface FunctionAppFlexConsumptionProps {
-    alwaysReady?: any;
-    appServicePlanId: string;
-    appSettings: any;
-    blobEndpoint: string;
-    connectionStrings: any;
-    containerName: string;
-    deploymentAuthenticationType?: string;
-    deploymentStorageType?: string;
-    deploySource: string;
-    httpsOnly?: string;
-    instanceMemory?: number;
-    kind?: string;
-    maximumInstanceCount?: number;
-    name: string;
-    resourceGroupName: string;
-    runtime?: string;
-    runtimeVersion?: string;
-    storageAccountConnectionStringName?: string;
-    storageConnectionString: string;
+export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
     sourceCodeHash: string;
-    minTlsVersion?: string;
+    deploySource: string;
 }

package/dist/src/lib/azure/services/index.d.ts

@@ -8,6 +8,7 @@ export * from './eventgrid';
 export * from './function';
 export * from './key-vault';
 export * from './log-analytics-workspace';
+export * from './monitor';
 export * from './resource-group';
 export * from './servicebus';
 export * from './storage';

package/dist/src/lib/azure/services/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./eventgrid"), exports);
 __exportStar(require("./function"), exports);
 __exportStar(require("./key-vault"), exports);
 __exportStar(require("./log-analytics-workspace"), exports);
+__exportStar(require("./monitor"), exports);
 __exportStar(require("./resource-group"), exports);
 __exportStar(require("./servicebus"), exports);
 __exportStar(require("./storage"), exports);

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

@@ -44,7 +44,7 @@ class AzureKeyVaultManager {
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.keyVault),
             location: resourceGroup.location,
             resourceGroupName: resourceGroup.name,
-            skuName: props.skuName || 'standard',
+            skuName: props.skuName ?? 'standard',
             enableRbacAuthorization: props.enableRbacAuthorization ?? true,
             softDeleteRetentionDays: props.softDeleteRetentionDays ?? 90,
             purgeProtectionEnabled: props.purgeProtectionEnabled ?? true,

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

@@ -44,6 +44,8 @@ class AzureLogAnalyticsWorkspaceManager {
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.logAnalyticsWorkspace),
             location: resourceGroup.location,
             resourceGroupName: resourceGroup.name,
+            sku: props.sku ?? 'PerGB2018',
+            retentionInDays: props.retentionInDays ?? 30,
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

package/dist/src/lib/azure/services/monitor/index.d.ts

@@ -0,0 +1,2 @@
+export * from './main';
+export * from './types';

package/dist/src/lib/azure/services/monitor/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./main"), exports);
+__exportStar(require("./types"), exports);

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

@@ -0,0 +1,30 @@
+import { MonitorDiagnosticSetting } from '@cdktf/provider-azurerm/lib/monitor-diagnostic-setting';
+import { CommonAzureConstruct } from '../../common';
+import { MonitorDiagnosticSettingProps } from './types';
+/**
+ * @classdesc Provides operations on Azure Key Vault
+ * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
+ * - If a custom construct extends {@link CommonAzureConstruct}, an instance is available within the context.
+ * @example
+ * ```
+ * import { CommonAzureConstruct, CommonAzureStackProps } from '@gradientedge/cdk-utils'
+ *
+ * class CustomConstruct extends CommonAzureConstruct {
+ *   constructor(parent: Construct, id: string, props: CommonAzureStackProps) {
+ *     super(parent, id, props)
+ *     this.props = props
+ *     this.monitorManager.createMonitor('MyMonitor', this, props)
+ *   }
+ * }
+ * ```
+ */
+export declare class AzureMonitorManager {
+    /**
+     * @summary Method to create a new monitor diagnostic setting
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param props monitor diagnostics settings properties
+     * @see [CDKTF Monitor Diagnostics Settings Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/monitorDiagnosticSetting.typescript.md}
+     */
+    createMonitorDiagnosticSettings(id: string, scope: CommonAzureConstruct, props: MonitorDiagnosticSettingProps): MonitorDiagnosticSetting;
+}

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

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureMonitorManager = void 0;
+const monitor_diagnostic_setting_1 = require("@cdktf/provider-azurerm/lib/monitor-diagnostic-setting");
+const utils_1 = require("../../utils");
+/**
+ * @classdesc Provides operations on Azure Key Vault
+ * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
+ * - If a custom construct extends {@link CommonAzureConstruct}, an instance is available within the context.
+ * @example
+ * ```
+ * import { CommonAzureConstruct, CommonAzureStackProps } from '@gradientedge/cdk-utils'
+ *
+ * class CustomConstruct extends CommonAzureConstruct {
+ *   constructor(parent: Construct, id: string, props: CommonAzureStackProps) {
+ *     super(parent, id, props)
+ *     this.props = props
+ *     this.monitorManager.createMonitor('MyMonitor', this, props)
+ *   }
+ * }
+ * ```
+ */
+class AzureMonitorManager {
+    /**
+     * @summary Method to create a new monitor diagnostic setting
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param props monitor diagnostics settings properties
+     * @see [CDKTF Monitor Diagnostics Settings Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/monitorDiagnosticSetting.typescript.md}
+     */
+    createMonitorDiagnosticSettings(id, scope, props) {
+        if (!props)
+            throw `Props undefined for ${id}`;
+        const monitorDiagnosticSetting = new monitor_diagnostic_setting_1.MonitorDiagnosticSetting(scope, `${id}-ds`, {
+            ...props,
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.monitorDiagnosticSetting),
+        });
+        (0, utils_1.createAzureTfOutput)(`${id}-monitorDiagnosticSettingName`, scope, monitorDiagnosticSetting.name);
+        (0, utils_1.createAzureTfOutput)(`${id}-monitorDiagnosticSettingFriendlyUniqueId`, scope, monitorDiagnosticSetting.friendlyUniqueId);
+        (0, utils_1.createAzureTfOutput)(`${id}-monitorDiagnosticSettingId`, scope, monitorDiagnosticSetting.id);
+        return monitorDiagnosticSetting;
+    }
+}
+exports.AzureMonitorManager = AzureMonitorManager;

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

@@ -0,0 +1,3 @@
+import { MonitorDiagnosticSettingConfig } from '@cdktf/provider-azurerm/lib/monitor-diagnostic-setting';
+export interface MonitorDiagnosticSettingProps extends MonitorDiagnosticSettingConfig {
+}

package/dist/src/lib/azure/services/monitor/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -48,9 +48,9 @@ class AzureServicebusManager {
             resourceGroupName: resourceGroup.name,
             location: resourceGroup.location,
             identity: {
-                type: props.identity?.type || 'SystemAssigned',
+                type: props.identity?.type ?? 'SystemAssigned',
             },
-            sku: props.sku || 'Standard',
+            sku: props.sku ?? 'Standard',
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },
@@ -113,7 +113,7 @@ class AzureServicebusManager {
         const servicebusSubscription = new servicebus_subscription_1.ServicebusSubscription(scope, `${id}-ss`, {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.serviceBusSubscription),
-            maxDeliveryCount: props.maxDeliveryCount || 1,
+            maxDeliveryCount: props.maxDeliveryCount ?? 1,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-servicebusSubscriptionName`, scope, servicebusSubscription.name);
         (0, utils_1.createAzureTfOutput)(`${id}-servicebusSubscriptionFriendlyUniqueId`, scope, servicebusSubscription.friendlyUniqueId);

package/package.json

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

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

@@ -18,6 +18,7 @@ import {
   AzureEventgridManager,
   AzureDnsManager,
   AzureLogAnalyticsWorkspaceManager,
+  AzureMonitorManager,
 } from '../services'
 import { CommonAzureStackProps } from './types'
 import { AzureRemoteBackend } from './constants'
@@ -37,6 +38,7 @@ export class CommonAzureConstruct extends TerraformStack {
   id: string
   keyVaultManager: AzureKeyVaultManager
   logAnalyticsWorkspaceManager: AzureLogAnalyticsWorkspaceManager
+  monitorManager: AzureMonitorManager
   resourceGroupManager: AzureResourceGroupManager
   resourceNameFormatter: AzureResourceNameFormatter
   servicebusManager: AzureServicebusManager
@@ -58,6 +60,7 @@ export class CommonAzureConstruct extends TerraformStack {
     this.functiontManager = new AzureFunctionManager()
     this.keyVaultManager = new AzureKeyVaultManager()
     this.logAnalyticsWorkspaceManager = new AzureLogAnalyticsWorkspaceManager()
+    this.monitorManager = new AzureMonitorManager()
     this.resourceGroupManager = new AzureResourceGroupManager()
     this.resourceNameFormatter = new AzureResourceNameFormatter(this, `${id}-rnf`, props)
     this.servicebusManager = new AzureServicebusManager()

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

@@ -176,6 +176,8 @@ export class AzureApiManagementManager {
       ignoreMissingProperty: true,
       ignoreCasing: true,
       schemaValidationEnabled: false,
+
+      lifecycle: props.lifecycle,
     })
 
     if (applicationInsightsKey) {
@@ -209,8 +211,8 @@ export class AzureApiManagementManager {
     const apiManagementBackend = new ApiManagementBackend(scope, `${id}-am-be`, {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-      description: props.description || `Backend for ${props.name}-${scope.props.stage}`,
-      protocol: props.protocol || 'http',
+      description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+      protocol: props.protocol ?? 'http',
     })
 
     createAzureTfOutput(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name)
@@ -233,9 +235,9 @@ export class AzureApiManagementManager {
     const apiManagementApi = new ApiManagementApi(scope, `${id}-am-api`, {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementApi),
-      displayName: props.displayName || props.name,
-      revision: props.revision || '1',
-      protocols: props.protocols || ['https'],
+      displayName: props.displayName ?? props.name,
+      revision: props.revision ?? '1',
+      protocols: props.protocols ?? ['https'],
     })
 
     createAzureTfOutput(`${id}-apiManagementApiName`, scope, apiManagementApi.name)

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

@@ -44,6 +44,9 @@ export class AzureAppConfigurationManager {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.appConfiguration),
       resourceGroupName: resourceGroup.name,
+      identity: {
+        type: 'SystemAssigned',
+      },
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

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

@@ -81,7 +81,7 @@ export class AzureAppServiceManager {
       resourceGroupName: resourceGroup.name,
       httpsOnly: props.httpsOnly ?? true,
 
-      identity: props.identity || {
+      identity: props.identity ?? {
         type: 'SystemAssigned',
       },
       siteConfig: {

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

@@ -44,7 +44,7 @@ export class AzureApplicationInsightsManager {
       ...props,
       name: scope.resourceNameFormatter.format(props.name ?? '', scope.props.resourceNameOptions?.applicationInsights),
       resourceGroupName: resourceGroup.name,
-      applicationType: props.applicationType || 'web',
+      applicationType: props.applicationType ?? 'web',
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

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

@@ -50,7 +50,7 @@ export class AzureCosmosDbManager {
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
-      identity: props.identity || {
+      identity: props.identity ?? {
         type: 'SystemAssigned',
       },
     })

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

@@ -71,7 +71,7 @@ export class AzureDnsManager {
 
     const dnsARecord = new DnsARecord(scope, `${id}-da`, {
       ...props,
-      ttl: props.ttl || 300,
+      ttl: props.ttl ?? 300,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
@@ -96,7 +96,7 @@ export class AzureDnsManager {
 
     const dnsCnameRecord = new DnsCnameRecord(scope, `${id}-dc`, {
       ...props,
-      ttl: props.ttl || 300,
+      ttl: props.ttl ?? 300,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
@@ -121,7 +121,7 @@ export class AzureDnsManager {
 
     const dnsTxtRecord = new DnsTxtRecord(scope, `${id}-dc`, {
       ...props,
-      ttl: props.ttl || 300,
+      ttl: props.ttl ?? 300,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

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

@@ -108,8 +108,8 @@ export class AzureEventgridManager {
     const eventgridSubscription = new EventgridEventSubscription(scope, `${id}-es`, {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventGridEventSubscription),
-      eventDeliverySchema: props.eventDeliverySchema || 'CloudEventSchemaV1_0',
-      advancedFilteringOnArraysEnabled: props.advancedFilteringOnArraysEnabled || true,
+      eventDeliverySchema: props.eventDeliverySchema ?? 'CloudEventSchemaV1_0',
+      advancedFilteringOnArraysEnabled: props.advancedFilteringOnArraysEnabled ?? true,
     })
 
     createAzureTfOutput(`${id}-eventgridSubscriptiontName`, scope, eventgridSubscription.name)

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

@@ -1,7 +1,7 @@
 import { DataAzurermResourceGroup } from '@cdktf/provider-azurerm/lib/data-azurerm-resource-group'
 import { LinuxFunctionApp } from '@cdktf/provider-azurerm/lib/linux-function-app'
 import { FunctionAppFunction } from '@cdktf/provider-azurerm/lib/function-app-function'
-import { Resource } from '../../.gen/providers/azapi/resource'
+import { FunctionAppFlexConsumption } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption'
 import { LocalExec, Provider } from 'cdktf-local-exec'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
@@ -72,7 +72,7 @@ export class AzureFunctionManager {
     const functionAppFunction = new FunctionAppFunction(scope, `${id}-fc`, {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionAppFunction),
-      configJson: JSON.stringify(props.configJson || {}),
+      configJson: JSON.stringify(props.configJson ?? {}),
     })
 
     createAzureTfOutput(`${id}-functionName`, scope, functionAppFunction.name)
@@ -103,69 +103,27 @@ export class AzureFunctionManager {
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
-    const functionApp = new Resource(scope, `${id}-fa`, {
-      type: 'Microsoft.Web/sites@2024-04-01',
+    const functionApp = new FunctionAppFlexConsumption(scope, `${id}-fc`, {
+      ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
       location: resourceGroup.location,
-      parentId: resourceGroup.id,
-
-      body: {
-        kind: props.kind || 'functionapp,linux',
-
-        properties: {
-          serverFarmId: props.appServicePlanId,
-          httpsOnly: props.httpsOnly || true,
-
-          functionAppConfig: {
-            deployment: {
-              storage: {
-                type: props.deploymentStorageType || 'blobContainer',
-                value: `${props.blobEndpoint}${props.containerName}`,
-                authentication: {
-                  type: props.deploymentAuthenticationType || 'StorageAccountConnectionString',
-                  storageAccountConnectionStringName:
-                    props.storageAccountConnectionStringName || 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                },
-              },
-            },
-            runtime: {
-              name: props.runtime || 'node',
-              version: props.runtimeVersion || '20',
-            },
-            scaleAndConcurrency: {
-              alwaysReady: props.alwaysReady,
-              instanceMemoryMB: props.instanceMemory || 2048,
-              maximumInstanceCount: props.maximumInstanceCount || 40,
-              triggers: {},
-            },
-          },
-
-          siteConfig: {
-            appSettings: props.appSettings.concat([
-              {
-                name: 'FUNCTIONS_EXTENSION_VERSION',
-                value: '~4',
-              },
-              {
-                name: 'AzureWebJobsStorage',
-                value: props.storageConnectionString,
-              },
-              {
-                name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                value: props.storageConnectionString,
-              },
-            ]),
-            connectionStrings: props.connectionStrings,
-            minTlsVersion: props.minTlsVersion ?? '1.3',
-          },
-        },
+      resourceGroupName: resourceGroup.name,
+      runtimeName: props.runtimeName ?? 'node',
+      runtimeVersion: props.runtimeVersion ?? '20',
+      storageAuthenticationType: props.storageAuthenticationType ?? 'StorageAccountConnectionString',
+      storageContainerType: props.storageContainerType ?? 'blobContainer',
+      maximumInstanceCount: props.maximumInstanceCount ?? 40,
+      instanceMemoryInMb: props.instanceMemoryInMb ?? 2048,
+      siteConfig: {
+        http2Enabled: props.siteConfig.http2Enabled ?? true,
+        ...props.siteConfig,
+      },
+      identity: props.identity ?? {
+        type: 'SystemAssigned',
+      },
+      tags: props.tags ?? {
+        environment: scope.props.stage,
       },
-
-      identity: [{ type: 'SystemAssigned' }],
-
-      ignoreMissingProperty: true,
-      ignoreCasing: true,
-      schemaValidationEnabled: false,
     })
 
     new Provider(scope, `${id}-local-exec-provider`)

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

@@ -1,31 +1,12 @@
 import { LinuxFunctionAppConfig } from '@cdktf/provider-azurerm/lib/linux-function-app'
 import { FunctionAppFunctionConfig } from '@cdktf/provider-azurerm/lib/function-app-function'
-import { ResourceConfig } from '../../.gen/providers/azapi/resource'
+import { FunctionAppFlexConsumptionConfig } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption'
 
 export interface FunctionAppProps extends LinuxFunctionAppConfig {}
 
 export interface FunctionProps extends FunctionAppFunctionConfig {}
 
-export interface FunctionAppFlexConsumptionProps {
-  alwaysReady?: any
-  appServicePlanId: string
-  appSettings: any
-  blobEndpoint: string
-  connectionStrings: any
-  containerName: string
-  deploymentAuthenticationType?: string
-  deploymentStorageType?: string
-  deploySource: string
-  httpsOnly?: string
-  instanceMemory?: number
-  kind?: string
-  maximumInstanceCount?: number
-  name: string
-  resourceGroupName: string
-  runtime?: string
-  runtimeVersion?: string
-  storageAccountConnectionStringName?: string
-  storageConnectionString: string
+export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
   sourceCodeHash: string
-  minTlsVersion?: string
+  deploySource: string
 }

package/src/lib/azure/services/index.ts

@@ -8,6 +8,7 @@ export * from './eventgrid'
 export * from './function'
 export * from './key-vault'
 export * from './log-analytics-workspace'
+export * from './monitor'
 export * from './resource-group'
 export * from './servicebus'
 export * from './storage'

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

@@ -45,7 +45,7 @@ export class AzureKeyVaultManager {
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.keyVault),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
-      skuName: props.skuName || 'standard',
+      skuName: props.skuName ?? 'standard',
       enableRbacAuthorization: props.enableRbacAuthorization ?? true,
       softDeleteRetentionDays: props.softDeleteRetentionDays ?? 90,
       purgeProtectionEnabled: props.purgeProtectionEnabled ?? true,

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

@@ -45,6 +45,8 @@ export class AzureLogAnalyticsWorkspaceManager {
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.logAnalyticsWorkspace),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
+      sku: props.sku ?? 'PerGB2018',
+      retentionInDays: props.retentionInDays ?? 30,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

package/src/lib/azure/services/monitor/index.ts

@@ -0,0 +1,2 @@
+export * from './main'
+export * from './types'

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

@@ -0,0 +1,53 @@
+import { MonitorDiagnosticSetting } from '@cdktf/provider-azurerm/lib/monitor-diagnostic-setting'
+import { CommonAzureConstruct } from '../../common'
+import { createAzureTfOutput } from '../../utils'
+import { MonitorDiagnosticSettingProps } from './types'
+
+/**
+ * @classdesc Provides operations on Azure Key Vault
+ * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
+ * - If a custom construct extends {@link CommonAzureConstruct}, an instance is available within the context.
+ * @example
+ * ```
+ * import { CommonAzureConstruct, CommonAzureStackProps } from '@gradientedge/cdk-utils'
+ *
+ * class CustomConstruct extends CommonAzureConstruct {
+ *   constructor(parent: Construct, id: string, props: CommonAzureStackProps) {
+ *     super(parent, id, props)
+ *     this.props = props
+ *     this.monitorManager.createMonitor('MyMonitor', this, props)
+ *   }
+ * }
+ * ```
+ */
+export class AzureMonitorManager {
+  /**
+   * @summary Method to create a new monitor diagnostic setting
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props monitor diagnostics settings properties
+   * @see [CDKTF Monitor Diagnostics Settings Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/monitorDiagnosticSetting.typescript.md}
+   */
+  public createMonitorDiagnosticSettings(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: MonitorDiagnosticSettingProps
+  ) {
+    if (!props) throw `Props undefined for ${id}`
+
+    const monitorDiagnosticSetting = new MonitorDiagnosticSetting(scope, `${id}-ds`, {
+      ...props,
+      name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.monitorDiagnosticSetting),
+    })
+
+    createAzureTfOutput(`${id}-monitorDiagnosticSettingName`, scope, monitorDiagnosticSetting.name)
+    createAzureTfOutput(
+      `${id}-monitorDiagnosticSettingFriendlyUniqueId`,
+      scope,
+      monitorDiagnosticSetting.friendlyUniqueId
+    )
+    createAzureTfOutput(`${id}-monitorDiagnosticSettingId`, scope, monitorDiagnosticSetting.id)
+
+    return monitorDiagnosticSetting
+  }
+}

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

@@ -0,0 +1,3 @@
+import { MonitorDiagnosticSettingConfig } from '@cdktf/provider-azurerm/lib/monitor-diagnostic-setting'
+
+export interface MonitorDiagnosticSettingProps extends MonitorDiagnosticSettingConfig {}

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

@@ -54,9 +54,9 @@ export class AzureServicebusManager {
       resourceGroupName: resourceGroup.name,
       location: resourceGroup.location,
       identity: {
-        type: props.identity?.type || 'SystemAssigned',
+        type: props.identity?.type ?? 'SystemAssigned',
       },
-      sku: props.sku || 'Standard',
+      sku: props.sku ?? 'Standard',
       tags: props.tags ?? {
         environment: scope.props.stage,
       },
@@ -128,7 +128,7 @@ export class AzureServicebusManager {
     const servicebusSubscription = new ServicebusSubscription(scope, `${id}-ss`, {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.serviceBusSubscription),
-      maxDeliveryCount: props.maxDeliveryCount || 1,
+      maxDeliveryCount: props.maxDeliveryCount ?? 1,
     })
 
     createAzureTfOutput(`${id}-servicebusSubscriptionName`, scope, servicebusSubscription.name)