@gradientedge/cdk-utils-azure 2.24.0 → 2.26.0

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

@@ -51,7 +51,7 @@ export declare class CommonAzureConstruct extends ComponentResource {
     storageManager: AzureStorageManager;
     commonLogAnalyticsWorkspace: Workspace | Output<GetWorkspaceResult>;
     constructor(name: string, props: CommonAzureStackProps, options?: ComponentResourceOptions);
-    protected resolveStack(stackName: string): pulumi.StackReference;
+    protected resolveStack(id: string, stackName?: string): pulumi.StackReference;
     protected createResourceGroup(): void;
     protected resolveCommonLogAnalyticsWorkspace(): void;
     /**

package/dist/src/common/construct.js

@@ -73,11 +73,12 @@ export class CommonAzureConstruct extends ComponentResource {
         this.storageManager = new AzureStorageManager();
         this.determineFullyQualifiedDomain();
     }
-    resolveStack(stackName) {
-        if (!stackName)
+    resolveStack(id, stackName) {
+        const name = stackName ?? id;
+        if (!name)
             throw new Error('Stack name undefined');
-        return new pulumi.StackReference(stackName, {
-            name: stackName,
+        return new pulumi.StackReference(id, {
+            name,
         });
     }
     createResourceGroup() {

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

@@ -117,8 +117,8 @@ export class SiteWithWebApp extends CommonAzureConstruct {
      */
     createWebAppSiteConfig() {
         this.site.environmentVariables = {
-            APPINSIGHTS_INSTRUMENTATIONKEY: this.applicationInsights.instrumentationKey,
-            APPLICATIONINSIGHTS_CONNECTION_STRING: this.applicationInsights.connectionString,
+            OTEL_APPINSIGHTS_INSTRUMENTATIONKEY: this.applicationInsights.instrumentationKey,
+            OTEL_APPLICATIONINSIGHTS_CONNECTION_STRING: this.applicationInsights.connectionString,
             ApplicationInsightsAgent_EXTENSION_VERSION: '~3',
             OTEL_SDK_DISABLED: 'false',
             BUILD_VERSION: '0.0.0',

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

@@ -82,7 +82,7 @@ export class AzureServiceBusManager {
             duplicateDetectionHistoryTimeWindow: props.duplicateDetectionHistoryTimeWindow ?? 'PT1M',
             requiresDuplicateDetection: props.requiresDuplicateDetection ?? true,
             deadLetteringOnMessageExpiration: props.deadLetteringOnMessageExpiration ?? true,
-            defaultMessageTimeToLive: props.defaultMessageTtl ?? 'P2D',
+            defaultMessageTimeToLive: props.defaultMessageTimeToLive ?? 'P14D',
             requiresSession: props.requiresSession ?? false,
             enablePartitioning: props.enablePartitioning ?? false,
         }, { parent: scope, ...resourceOptions });

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

@@ -51,18 +51,21 @@ export class AzureStorageManager {
                 ...props.tags,
             },
         }, { parent: scope, ...resourceOptions });
-        new BlobServiceProperties(`${id}-blob-props`, {
-            ...props.blobProperties,
-            accountName: scope.resourceNameFormatter
-                .format(props.accountName?.toString(), scope.props.resourceNameOptions?.storageAccount)
-                .replace(/\W/g, '')
-                .toLowerCase(),
-            resourceGroupName,
-            deleteRetentionPolicy: props.blobProperties?.deleteRetentionPolicy ?? {
-                enabled: true,
-                days: 7,
-            },
-        }, { parent: scope, ...resourceOptions });
+        if (!props.skipBlobServiceProperties) {
+            new BlobServiceProperties(`${id}-blob-props`, {
+                ...props.blobProperties,
+                blobServicesName: 'default',
+                accountName: scope.resourceNameFormatter
+                    .format(props.accountName?.toString(), scope.props.resourceNameOptions?.storageAccount)
+                    .replace(/\W/g, '')
+                    .toLowerCase(),
+                resourceGroupName,
+                deleteRetentionPolicy: props.blobProperties?.deleteRetentionPolicy ?? {
+                    enabled: true,
+                    days: 7,
+                },
+            }, { parent: scope, ...resourceOptions });
+        }
         return storageAccount;
     }
     /**
@@ -99,9 +102,11 @@ export class AzureStorageManager {
         const resourceGroupName = props.resourceGroupName ?? scope.resourceNameFormatter.format(scope.props.resourceGroupName);
         return new Blob(`${id}-sb`, {
             ...props,
-            blobName: scope.resourceNameFormatter.format(props.blobName?.toString(), scope.props.resourceNameOptions?.storageBlob),
+            blobName: props.skipBlobNameFormatting
+                ? props.blobName
+                : scope.resourceNameFormatter.format(props.blobName?.toString(), scope.props.resourceNameOptions?.storageBlob),
             accountName: props.accountName,
-            containerName: `${props.containerName}-${scope.props.stage}`,
+            containerName: props.containerName,
             resourceGroupName,
         }, { parent: scope, ...resourceOptions });
     }
@@ -151,7 +156,7 @@ export class AzureStorageManager {
     createManagementPolicy(id, scope, props, resourceOptions) {
         if (!props)
             throw new Error(`Props undefined for ${id}`);
-        return new ManagementPolicy(`${id}`, props, { parent: scope, ...resourceOptions });
+        return new ManagementPolicy(`${id}`, { ...props, managementPolicyName: 'default' }, { parent: scope, ...resourceOptions });
     }
     /**
      * @summary Method to create a new storage table

package/dist/src/services/storage/types.d.ts

@@ -3,12 +3,14 @@ import { BaseAzureConfigProps } from '../../types/index.js';
 /** @category Interface */
 export interface StorageAccountProps extends StorageAccountArgs {
     blobProperties?: BlobServicePropertiesArgs;
+    skipBlobServiceProperties?: boolean;
 }
 /** @category Interface */
 export interface StorageContainerProps extends BlobContainerArgs, BaseAzureConfigProps {
 }
 /** @category Interface */
 export interface StorageBlobProps extends BaseAzureConfigProps, BlobArgs {
+    skipBlobNameFormatting?: boolean;
 }
 /** @category Interface */
 export interface ManagementPolicyProps extends ManagementPolicyArgs {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils-azure",
-  "version": "2.24.0",
+  "version": "2.26.0",
   "description": "Azure Pulumi utilities for @gradientedge/cdk-utils",
   "type": "module",
   "main": "dist/src/index.js",
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "@pulumi/archive": "0.3.7",
-    "@pulumi/azure-native": "3.16.0",
+    "@pulumi/azure-native": "3.17.0",
     "@pulumi/azuread": "6.9.0",
     "@pulumi/pulumi": "3.231.0",
     "@types/lodash": "4.17.24",