@gradientedge/cdk-utils-azure 2.21.0 → 2.23.0

package/dist/src/common/tagging.js

@@ -14,6 +14,10 @@ export function isTaggableResource(resourceType) {
         return false;
     if (resourceType.startsWith('pulumi:'))
         return false;
+    if (resourceType.startsWith('command:'))
+        return false;
+    if (resourceType === 'azure-native:appconfiguration:KeyValue')
+        return false;
     if (resourceType.startsWith('azure-native:apimanagement:') &&
         resourceType !== 'azure-native:apimanagement:ApiManagementService')
         return false;

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

@@ -307,6 +307,13 @@ export class AzureFunctionApp extends CommonAzureConstruct {
                             accountName: this.appStorageAccount.name,
                         }).keys[0].value};EndpointSuffix=core.windows.net`,
                     },
+                    {
+                        name: 'AzureWebJobsStorage',
+                        value: pulumi.interpolate `DefaultEndpointsProtocol=https;AccountName=${this.appStorageAccount.name};AccountKey=${listStorageAccountKeysOutput({
+                            resourceGroupName: this.resourceGroup.name,
+                            accountName: this.appStorageAccount.name,
+                        }).keys[0].value};EndpointSuffix=core.windows.net`,
+                    },
                 ],
                 connectionStrings: Object.fromEntries(this.appConnectionStrings.map(cs => [cs.name, { type: cs.type, value: cs.value }])),
             },

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

@@ -1,6 +1,6 @@
 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 { listWebAppHostKeys } from '@pulumi/azure-native/web/index.js';
 import * as pulumi from '@pulumi/pulumi';
 import _ from 'lodash';
 import { RoleDefinitionId } from '../../services/index.js';
@@ -74,16 +74,38 @@ export class AzureRestApiFunction extends AzureFunctionApp {
     createNamespaceSecret() {
         if (!this.props.apiManagement.useExistingApiManagement)
             return;
-        const functionDefaultKey = listWebAppHostKeysOutput({
-            name: this.app.name,
-            resourceGroupName: this.resourceGroup.name,
+        // Fetch function host keys with retry — the runtime may not be ready immediately after code deployment
+        const functionKey = pulumi.all([this.app.name, this.resourceGroup.name]).apply(async ([appName, rgName]) => {
+            if (pulumi.runtime.isDryRun())
+                return 'previewing';
+            const maxRetries = 10;
+            const delayMs = 15000;
+            for (let i = 0; i < maxRetries; i++) {
+                try {
+                    const keys = await listWebAppHostKeys({ name: appName, resourceGroupName: rgName });
+                    const defaultKey = keys.functionKeys?.['default'];
+                    if (defaultKey)
+                        return defaultKey;
+                }
+                catch {
+                    // runtime not ready yet
+                }
+                if (i < maxRetries - 1) {
+                    await new Promise(resolve => setTimeout(resolve, delayMs));
+                }
+            }
+            throw new Error(`Failed to retrieve function host keys for ${appName} after ${maxRetries} attempts`);
         });
         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.props.apiAuthKeyVault.resourceGroupName,
             properties: {
-                value: functionDefaultKey.functionKeys?.apply(keys => keys?.['default'] ?? ''),
+                value: functionKey,
+                attributes: {
+                    enabled: true,
+                },
+                contentType: '',
             },
         });
     }

package/dist/src/construct/rest-api-function/types.d.ts

@@ -1,4 +1,5 @@
 import { Api, ApiOperation, Backend, NamedValue } from '@pulumi/azure-native/apimanagement/index.js';
+import { Input } from '@pulumi/pulumi';
 import { ApiManagementApiProps, ApiManagementBackendProps, ApiManagementProps, ApplicationInsightsProps, AzureApi, AzureFunctionAppProps, AzureRestApiProps } from '../../index.js';
 /** @category Interface */
 export interface ApiManagementRestApiProps extends ApiManagementProps {
@@ -30,5 +31,5 @@ export interface AzureApiFunction extends AzureApi {
     corsPolicyXmlContent?: string;
     managementApi: Api;
     namedValue: NamedValue;
-    validateJwtPolicyXmlContent?: string;
+    validateJwtPolicyXmlContent?: Input<string>;
 }

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

@@ -58,9 +58,7 @@ export class AzureEventgridManager {
             throw new Error(`Props undefined for ${id}`);
         return getTopicOutput({
             topicName: scope.resourceNameFormatter.format(props.topicName?.toString(), scope.props.resourceNameOptions?.eventGridTopic),
-            resourceGroupName: (props.resourceGroupName ?? scope.props.resourceGroupName)
-                ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
-                : props.resourceGroupName,
+            resourceGroupName: props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName),
         }, { parent: scope, ...resourceOptions });
     }
     /**

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

@@ -1,5 +1,6 @@
 import { Deployment, DeploymentMode, Resource } from '@pulumi/azure-native/resources/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,10 +87,22 @@ 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,
@@ -103,16 +116,8 @@ export class AzureFunctionManager {
             clientCertEnabled: props.clientCertEnabled ?? false,
             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,
-                },
+                runtime,
+                scaleAndConcurrency,
             },
             siteConfig: props.siteConfig ?? {
                 http20Enabled: true,
@@ -124,8 +129,10 @@ export class AzureFunctionManager {
                 ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
-        const functionAppConfig = props.functionAppConfig;
-        new Deployment(`${id}-depl`, {
+        // 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,
@@ -136,23 +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 ?? 4096,
-                                        maximumInstanceCount: props.scaleAndConcurrency?.maximumInstanceCount ?? 40,
-                                    },
+                                    runtime,
+                                    scaleAndConcurrency,
                                     siteUpdateStrategy: {
                                         type: 'RollingUpdate',
                                     },
@@ -162,7 +159,7 @@ export class AzureFunctionManager {
                     ],
                 },
             },
-        }, { parent: functionApp, ...resourceOptions });
+        }, { parent: functionApp, dependsOn: [functionApp], ...resourceOptions });
         return functionApp;
     }
     /**

package/package.json

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