@gradientedge/cdk-utils-azure 2.20.0 → 2.22.0

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

@@ -94,6 +94,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
         this.appServicePlan = this.appServiceManager.createAppServicePlan(`${this.id}-app-service-plan`, this, {
             ...this.props.functionApp.servicePlan,
             name: this.id,
+            kind: this.props.functionApp.servicePlan?.kind ?? 'functionapp',
             resourceGroupName: this.resourceGroup.name,
             location: this.resourceGroup.location,
         });
@@ -241,7 +242,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
      * @summary Method to create and configure the function host.json
      */
     createFunctionHosts() {
-        const currentDirectory = path.resolve();
+        const currentDirectory = path.resolve(process.cwd(), '..');
         const hostsJsonFile = `${currentDirectory}/${this.props.functionApp.deploySource}/host.json`;
         if (!fs.existsSync(hostsJsonFile))
             return;
@@ -253,7 +254,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
      * @summary Method to create the code package archive for deployment
      */
     createCodePackage() {
-        const currentDirectory = path.resolve();
+        const currentDirectory = path.resolve(process.cwd(), '..');
         this.appCodeArchiveFile = archive.getFileOutput({
             type: 'zip',
             sourceDir: `${currentDirectory}/${this.props.functionApp.deploySource}`,
@@ -273,6 +274,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
         this.app = this.functionManager.createFunctionAppFlexConsumption(`${this.id}-function-app-flex`, this, {
             ...this.props.functionApp,
             name: this.props.functionApp.app?.name ?? this.id,
+            scaleAndConcurrency: this.props.functionApp.app?.scaleAndConcurrency,
             serverFarmId: this.appServicePlan.id,
             resourceGroupName: this.resourceGroup.name,
             functionAppConfig: {
@@ -282,7 +284,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
                         value: pulumi.interpolate `${this.appStorageAccount.primaryEndpoints.apply(e => e?.blob)}${this.appDeploymentStorageContainer.name}`,
                         authentication: {
                             type: AuthenticationType.StorageAccountConnectionString,
-                            storageAccountConnectionStringName: 'AzureWebJobsStorage',
+                            storageAccountConnectionStringName: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
                         },
                     },
                 },
@@ -299,7 +301,7 @@ export class AzureFunctionApp extends CommonAzureConstruct {
                         value: this.applicationInsights.instrumentationKey,
                     },
                     {
-                        name: 'AzureWebJobsStorage',
+                        name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
                         value: pulumi.interpolate `DefaultEndpointsProtocol=https;AccountName=${this.appStorageAccount.name};AccountKey=${listStorageAccountKeysOutput({
                             resourceGroupName: this.resourceGroup.name,
                             accountName: this.appStorageAccount.name,
@@ -322,9 +324,9 @@ export class AzureFunctionApp extends CommonAzureConstruct {
      */
     createRoleAssignments() {
         if (this.props.dataStorageAccount) {
-            this.authorisationManager.grantRoleAssignmentToStorageAccount(`${this.id}-data`, this, this.dataStorageAccount.id, this.getFunctionAppPrincipalId(), this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.STORAGE_BLOB_DATA_CONTRIBUTOR));
+            this.authorisationManager.grantRoleAssignmentToStorageAccount(`${this.id}-data`, this, this.dataStorageAccount.id, this.getFunctionAppPrincipalId(), PrincipalType.ServicePrincipal, this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.STORAGE_BLOB_DATA_CONTRIBUTOR));
         }
-        this.authorisationManager.grantRoleAssignmentToStorageAccount(this.id, this, this.appStorageAccount.id, this.getFunctionAppPrincipalId(), this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.STORAGE_BLOB_DATA_CONTRIBUTOR));
+        this.authorisationManager.grantRoleAssignmentToStorageAccount(this.id, this, this.appStorageAccount.id, this.getFunctionAppPrincipalId(), PrincipalType.ServicePrincipal, this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.STORAGE_BLOB_DATA_CONTRIBUTOR));
         if (!this.props.useConfigOverride) {
             this.authorisationManager.grantRoleAssignmentToApplicationConfiguration(this.id, this, this.appConfig.id, this.getFunctionAppPrincipalId(), PrincipalType.ServicePrincipal, this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.APP_CONFIGURATION_DATA_READER));
         }
@@ -335,12 +337,12 @@ export class AzureFunctionApp extends CommonAzureConstruct {
         if (this.appKeyVaultsByResourceGroup && this.appKeyVaultsByResourceGroup.size > 0) {
             this.appKeyVaultsByResourceGroup.forEach((keyVaultNames, resourceGroup) => {
                 keyVaultNames.forEach(keyVaultName => {
-                    this.authorisationManager.grantRoleAssignmentToKeyVault(this.id, this, keyVaultName, resourceGroup, this.getFunctionAppPrincipalId(), this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.KEY_VAULT_SECRETS_USER));
+                    this.authorisationManager.grantRoleAssignmentToKeyVault(this.id, this, keyVaultName, resourceGroup, this.getFunctionAppPrincipalId(), PrincipalType.ServicePrincipal, this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.KEY_VAULT_SECRETS_USER));
                 });
             });
         }
         if (AzureAppConfigurationManager.hasEventGridTargets(this.appConfigurationsParsedConfig)) {
-            this.authorisationManager.grantRoleAssignmentToEventgridTopic(this.id, this, this.props.existingTopicName, this.props.existingTopicResourceGroupName, this.getFunctionAppPrincipalId(), this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.EVENTGRID_DATA_SENDER));
+            this.authorisationManager.grantRoleAssignmentToEventgridTopic(this.id, this, this.props.existingTopicName, this.props.existingTopicResourceGroupName, this.getFunctionAppPrincipalId(), PrincipalType.ServicePrincipal, this.authorisationManager.resolveRoleDefinitionId(this, RoleDefinitionId.EVENTGRID_DATA_SENDER));
         }
     }
     /**

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

@@ -1,4 +1,4 @@
-import { HostnameType, NamedValue } from '@pulumi/azure-native/apimanagement/index.js';
+import { HostnameType, NamedValue, PolicyContentFormat } from '@pulumi/azure-native/apimanagement/index.js';
 import { getVaultOutput } from '@pulumi/azure-native/keyvault/index.js';
 import { listWebAppHostKeysOutput } from '@pulumi/azure-native/web/index.js';
 import * as pulumi from '@pulumi/pulumi';
@@ -81,7 +81,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         this.api.namedValueSecret = this.keyVaultManager.createKeyVaultSecret(`${this.id}-key-vault-api-namespace-secret`, this, {
             vaultName: this.api.authKeyVault.name,
             secretName: pulumi.interpolate `${this.app.name}key`,
-            resourceGroupName: this.resourceGroup.name,
+            resourceGroupName: this.props.apiAuthKeyVault.resourceGroupName,
             properties: {
                 value: functionDefaultKey.functionKeys?.apply(keys => keys?.['default'] ?? ''),
             },
@@ -94,9 +94,10 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         if (this.props.apiManagement.useExistingApiManagement) {
             if (this.props.apiManagement.apiStackName) {
                 const apiStack = new pulumi.StackReference(this.props.apiManagement.apiStackName);
-                this.api.id = apiStack.getOutput('apiId');
-                this.api.name = apiStack.getOutput('apiName');
-                this.api.resourceGroupName = apiStack.getOutput('apiResourceGroupName');
+                const stackOutputs = apiStack.getOutput('stackOutputs');
+                this.api.id = stackOutputs.apply(o => o.apiId);
+                this.api.name = stackOutputs.apply(o => o.apiName);
+                this.api.resourceGroupName = stackOutputs.apply(o => o.resourceGroupName);
             }
         }
         else {
@@ -136,14 +137,15 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         this.api.namedValue = new NamedValue(`${this.id}-am-nv`, {
             displayName: this.app.name,
             keyVault: {
-                secretIdentifier: this.api.namedValueSecret.id,
+                secretIdentifier: this.api.namedValueSecret.properties.apply(p => p.secretUri),
             },
             resourceGroupName: this.api.resourceGroupName,
             secret: true,
             serviceName: this.api.name,
-        });
+        }, { parent: this });
         this.api.backend = this.apiManagementManager.createBackend(this.id, this, {
             ...this.props.apiManagementBackend,
+            backendId: this.id,
             title: this.id,
             resourceGroupName: this.api.resourceGroupName,
             serviceName: this.api.name,
@@ -151,7 +153,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
             resourceId: pulumi.interpolate `https://management.azure.com/subscriptions/${this.props.subscriptionId}/resourceGroups/${this.resourceGroup.name}/providers/Microsoft.Web/sites/${this.app.name}`,
             credentials: {
                 header: {
-                    'x-functions-key': [`{{${this.api.namedValue.name}}}`],
+                    'x-functions-key': [pulumi.interpolate `{{${this.api.namedValue.name}}}`],
                 },
             },
         });
@@ -162,6 +164,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
     createApiManagementRoutes() {
         this.api.managementApi = this.apiManagementManager.createApi(`${this.id}-apim-api`, this, {
             ...this.props.apiManagementApi,
+            apiId: this.id,
             displayName: this.props.apiManagementApi.displayName ?? this.id,
             serviceName: this.api.name,
             resourceGroupName: this.api.resourceGroupName,
@@ -182,7 +185,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
             method: operation.method.toString().toUpperCase(),
             serviceName: this.api.name,
             resourceGroupName: this.api.resourceGroupName,
-            apiId: this.api.id,
+            apiId: this.resourceNameFormatter.format(this.id, this.props.resourceNameOptions?.apiManagementApi),
             displayName: operation.displayName,
             urlTemplate: operation.urlTemplate,
             templateParameters: operation.templateParameters,
@@ -195,28 +198,28 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         if (!operation.caching || !operation.caching.enableCacheSet)
             return;
         this.apiManagementManager.createOperationPolicy(`${this.id}-apim-api-operation-policy-${operation.displayName}-${operation.method}`, this, {
-            apiId: this.api.id,
+            apiId: this.resourceNameFormatter.format(this.id, this.props.resourceNameOptions?.apiManagementApi),
             resourceGroupName: this.api.resourceGroupName,
             serviceName: this.api.name,
             operationId: `${operation.displayName}-${operation.method}`,
+            format: PolicyContentFormat.Rawxml,
             value: `
         <policies>
-          <policies>
-            <inbound>
-              <base />
-                ${this.props.apiManagementApi.cacheSetInboundPolicy}
-            </inbound>
-            <backend>
-              <base />
-            </backend>
-            <outbound>
-              <base />
-                ${this.props.apiManagementApi.cacheSetOutboundPolicy}
-            </outbound>
-            <on-error>
-              <base />
-            </on-error>
-        </policies>`.replace(/\n[ \t]*\n/g, '\n'), // move to utils
+          <inbound>
+            <base />
+              ${this.props.apiManagementApi.cacheSetInboundPolicy ?? ''}
+          </inbound>
+          <backend>
+            <base />
+          </backend>
+          <outbound>
+            <base />
+              ${this.props.apiManagementApi.cacheSetOutboundPolicy ?? ''}
+          </outbound>
+          <on-error>
+            <base />
+          </on-error>
+        </policies>`.replace(/\n[ \t]*\n/g, '\n'),
         });
     }
     /**
@@ -287,8 +290,9 @@ export class AzureRestApiFunction extends AzureFunctionApp {
       </policies>`;
         this.apiManagementManager.createPolicy(`${this.id}-apim-api-policy`, this, {
             serviceName: this.api.name,
-            apiId: this.api.id,
+            apiId: this.resourceNameFormatter.format(this.id, this.props.resourceNameOptions?.apiManagementApi),
             resourceGroupName: this.api.resourceGroupName,
+            format: PolicyContentFormat.Rawxml,
             value: policyXmlContent.apply(xml => xml.replace(/\n[ \t]*\n/g, '\n')),
         });
     }

package/dist/src/construct/site-with-webapp/main.js

@@ -60,6 +60,8 @@ export class SiteWithWebApp extends CommonAzureConstruct {
     createSiteAppServicePlan() {
         this.site.appServicePlan = this.appServiceManager.createAppServicePlan(`${this.id}-app-service-plan`, this, {
             ...this.props.site.appServicePlan,
+            name: this.id,
+            kind: this.props.site.appServicePlan?.kind ?? 'linux',
             location: this.resourceGroup.location,
             resourceGroupName: this.resourceGroup.name,
         });
@@ -131,6 +133,7 @@ export class SiteWithWebApp extends CommonAzureConstruct {
     createWebApp(resourceOptions) {
         this.site.webApp = this.appServiceManager.createLinuxWebApp(`${this.id}-web-app`, this, {
             ...this.props.site.webApp,
+            kind: this.props.site.webApp.kind ?? 'app,linux',
             location: this.resourceGroup.location,
             resourceGroupName: this.resourceGroup.name,
             serverFarmId: this.site.appServicePlan.id,

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

@@ -222,7 +222,7 @@ export class AzureApiManagementManager {
      * @see [Pulumi Azure Native API Management Operation Policy]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/apimanagement/apioperationpolicy/}
      */
     createOperationPolicy(id, scope, props, resourceOptions) {
-        return new ApiOperationPolicy(`${id}`, props, { parent: scope, ...resourceOptions });
+        return new ApiOperationPolicy(`${id}`, { ...props, policyId: 'policy' }, { parent: scope, ...resourceOptions });
     }
     /**
      * @summary Method to create a new API policy
@@ -233,7 +233,7 @@ export class AzureApiManagementManager {
      * @see [Pulumi Azure Native API Management Policy]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/apimanagement/apipolicy/}
      */
     createPolicy(id, scope, props, resourceOptions) {
-        return new ApiPolicy(`${id}`, props, { parent: scope, ...resourceOptions });
+        return new ApiPolicy(`${id}`, { ...props, policyId: 'policy' }, { parent: scope, ...resourceOptions });
     }
     /**
      * @summary Method to create a new API Management custom domain

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

@@ -36,6 +36,7 @@ export class AzureAppServiceManager {
             name: scope.resourceNameFormatter.format(props.name?.toString(), scope.props.resourceNameOptions?.appServicePlan),
             resourceGroupName,
             location: props.location ?? scope.props.location,
+            kind: props.kind ?? 'functionapp',
             sku: props.sku ?? {
                 name: 'FC1',
                 tier: 'FlexConsumption',

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

@@ -41,7 +41,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: Input<string>, principalId: Input<string>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToKeyVault(id: string, scope: CommonAzureConstruct, vaultName: string, resourceGroupName: Input<string>, principalId: Input<string>, principalType: Input<PrincipalType>, roleDefinitionId: string, 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
@@ -52,7 +52,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: Input<string>, resourceGroupName: Input<string>, principalId: Input<string>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToEventgridTopic(id: string, scope: CommonAzureConstruct, topicName: Input<string>, resourceGroupName: Input<string>, principalId: Input<string>, principalType: Input<PrincipalType>, roleDefinitionId: string, 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
@@ -72,7 +72,7 @@ export declare class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToStorageAccount(id: string, scope: CommonAzureConstruct, accountId: Input<string>, principalId: Input<string>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToStorageAccount(id: string, scope: CommonAzureConstruct, accountId: Input<string>, principalId: Input<string>, principalType: Input<PrincipalType>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
     /**
      * @summary Method to grant a role assignment to storage table
      * @param id scoped id of the resource
@@ -82,6 +82,6 @@ export declare class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToStorageTable(id: string, scope: CommonAzureConstruct, tableId: Input<string>, principalId: Input<string>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToStorageTable(id: string, scope: CommonAzureConstruct, tableId: Input<string>, principalId: Input<string>, principalType: Input<PrincipalType>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
     resolveRoleDefinitionId(scope: CommonAzureConstruct, roleDefinitionId: RoleDefinitionId): string;
 }

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

@@ -41,10 +41,11 @@ export class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToKeyVault(id, scope, vaultName, resourceGroupName, principalId, roleDefinitionId, resourceOptions) {
+    grantRoleAssignmentToKeyVault(id, scope, vaultName, resourceGroupName, principalId, principalType, roleDefinitionId, resourceOptions) {
         const keyVault = scope.keyVaultManager.resolveKeyVault(scope, vaultName, resourceGroupName, resourceOptions);
         return this.createRoleAssignment(`${id}-kv-role-${vaultName}`, scope, {
             principalId,
+            principalType,
             roleDefinitionId,
             scope: keyVault.id,
         }, resourceOptions);
@@ -59,13 +60,14 @@ export class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToEventgridTopic(id, scope, topicName, resourceGroupName, principalId, roleDefinitionId, resourceOptions) {
+    grantRoleAssignmentToEventgridTopic(id, scope, topicName, resourceGroupName, principalId, principalType, roleDefinitionId, resourceOptions) {
         const topic = scope.eventgridManager.resolveEventgridTopic(`${id}-egt-role-${topicName}`, scope, {
             topicName,
             resourceGroupName,
         }, resourceOptions);
         return this.createRoleAssignment(`${id}-egt-role-${topicName}`, scope, {
             principalId,
+            principalType,
             roleDefinitionId,
             scope: topic.id,
         }, resourceOptions);
@@ -96,9 +98,10 @@ export class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToStorageAccount(id, scope, accountId, principalId, roleDefinitionId, resourceOptions) {
+    grantRoleAssignmentToStorageAccount(id, scope, accountId, principalId, principalType, roleDefinitionId, resourceOptions) {
         return this.createRoleAssignment(`${id}-sa-role`, scope, {
             principalId,
+            principalType,
             roleDefinitionId,
             scope: accountId,
         }, resourceOptions);
@@ -112,9 +115,10 @@ export class AzureAuthorisationManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    grantRoleAssignmentToStorageTable(id, scope, tableId, principalId, roleDefinitionId, resourceOptions) {
+    grantRoleAssignmentToStorageTable(id, scope, tableId, principalId, principalType, roleDefinitionId, resourceOptions) {
         return this.createRoleAssignment(`${id}-st-role`, scope, {
             principalId,
+            principalType,
             roleDefinitionId,
             scope: tableId,
         }, resourceOptions);

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

@@ -1,5 +1,6 @@
 import { Deployment, DeploymentMode, Resource } from '@pulumi/azure-native/resources/index.js';
-import { ManagedServiceIdentityType, WebApp, WebAppFunction } from '@pulumi/azure-native/web/index.js';
+import { ClientCertMode, ManagedServiceIdentityType, WebApp, WebAppFunction } from '@pulumi/azure-native/web/index.js';
+import { v5 as uuidv5 } from 'uuid';
 import { CommonAzureStack } from '../../common/index.js';
 /**
  * Provides operations on Azure Functions using Pulumi
@@ -86,27 +87,37 @@ export class AzureFunctionManager {
             throw new Error(`Props undefined for ${id}`);
         // Get resource group name
         const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
+        const name = scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp);
+        const location = props.location ?? scope.props.location;
+        const runtime = {
+            ...props.runtime,
+            name: props.runtime?.name ?? 'node',
+            version: props.runtime?.version ?? CommonAzureStack.NODEJS_RUNTIME,
+        };
+        const scaleAndConcurrency = {
+            ...props.scaleAndConcurrency,
+            instanceMemoryMB: props.scaleAndConcurrency?.instanceMemoryMB ?? 4096,
+            maximumInstanceCount: props.scaleAndConcurrency?.maximumInstanceCount ?? 40,
+        };
         const functionApp = new WebApp(`${id}-fc`, {
             ...props,
-            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
-            location: props.location ?? scope.props.location,
+            name,
+            location,
             resourceGroupName,
             kind: props.kind ?? 'functionapp,linux',
+            reserved: props.reserved ?? true,
             httpsOnly: props.httpsOnly ?? true,
             identity: props.identity ?? {
                 type: ManagedServiceIdentityType.SystemAssigned,
             },
-            functionAppConfig: props.functionAppConfig ?? {
-                runtime: {
-                    ...props.runtime,
-                    name: props.runtime?.name ?? 'node',
-                    version: props.runtime?.version ?? CommonAzureStack.NODEJS_RUNTIME,
-                },
-                scaleAndConcurrency: {
-                    ...props.scaleAndConcurrency,
-                    instanceMemoryMB: props.scaleAndConcurrency?.instanceMemoryMB ?? 4096,
-                    maximumInstanceCount: props.scaleAndConcurrency?.maximumInstanceCount ?? 40,
-                },
+            clientAffinityEnabled: props.clientAffinityEnabled ?? false,
+            clientAffinityProxyEnabled: props.clientAffinityProxyEnabled ?? false,
+            clientCertMode: props.clientCertMode ?? ClientCertMode.Optional,
+            clientCertEnabled: props.clientCertEnabled ?? false,
+            functionAppConfig: {
+                ...props.functionAppConfig,
+                runtime,
+                scaleAndConcurrency,
             },
             siteConfig: props.siteConfig ?? {
                 http20Enabled: true,
@@ -118,8 +129,10 @@ export class AzureFunctionManager {
                 ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
-        const functionAppConfig = props.functionAppConfig;
-        new Deployment(`${id}-deployment`, {
+        // perform a deployment for the rolling update strategy
+        const deploymentId = uuidv5(`${id}-depl`, uuidv5.DNS);
+        new Deployment(deploymentId, {
+            deploymentName: deploymentId,
             resourceGroupName,
             properties: {
                 mode: DeploymentMode.Incremental,
@@ -130,27 +143,13 @@ export class AzureFunctionManager {
                         {
                             type: 'Microsoft.Web/sites',
                             apiVersion: '2024-04-01',
-                            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
-                            location: props.location ?? scope.props.location,
+                            name,
+                            location,
                             properties: {
                                 functionAppConfig: {
                                     ...props.functionAppConfig,
-                                    runtime: {
-                                        ...props.runtime,
-                                        name: props.runtime?.name ?? functionAppConfig?.runtime?.name ?? 'node',
-                                        version: props.runtime?.version ??
-                                            functionAppConfig?.runtime?.version ??
-                                            CommonAzureStack.NODEJS_RUNTIME,
-                                    },
-                                    scaleAndConcurrency: {
-                                        ...props.scaleAndConcurrency,
-                                        instanceMemoryMB: props.scaleAndConcurrency?.instanceMemoryMB ??
-                                            functionAppConfig?.scaleAndConcurrency?.instanceMemoryMB ??
-                                            4096,
-                                        maximumInstanceCount: props.scaleAndConcurrency?.maximumInstanceCount ??
-                                            functionAppConfig?.scaleAndConcurrency?.maximumInstanceCount ??
-                                            40,
-                                    },
+                                    runtime,
+                                    scaleAndConcurrency,
                                     siteUpdateStrategy: {
                                         type: 'RollingUpdate',
                                     },
@@ -160,7 +159,7 @@ export class AzureFunctionManager {
                     ],
                 },
             },
-        }, { parent: scope, ...resourceOptions });
+        }, { parent: functionApp, ...resourceOptions });
         return functionApp;
     }
     /**

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

@@ -38,6 +38,7 @@ export class AzureStorageManager {
                 .replace(/\W/g, '')
                 .toLowerCase(),
             allowBlobPublicAccess: props.allowBlobPublicAccess ?? false,
+            isHnsEnabled: props.isHnsEnabled ?? false,
             resourceGroupName,
             sku: props.sku ?? {
                 name: SkuName.Standard_LRS,
@@ -61,7 +62,7 @@ export class AzureStorageManager {
                 enabled: true,
                 days: 7,
             },
-        });
+        }, { parent: scope, ...resourceOptions });
         return storageAccount;
     }
     /**

package/package.json

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