@gradientedge/cdk-utils-azure 2.5.0 → 2.7.0

package/dist/src/common/construct.js

@@ -82,7 +82,7 @@ export class CommonAzureConstruct extends ComponentResource {
         if (this.resourceGroup)
             return;
         this.resourceGroup = this.resourceGroupManager.createResourceGroup(`${this.id}`, this, {
-            resourceGroupName: this.props.stackName,
+            resourceGroupName: this.id,
             location: this.props.location,
         });
         this.registerOutputs({

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

@@ -144,7 +144,7 @@ export class AzureEventHandler extends AzureFunctionApp {
      */
     createServiceBusDiagnosticLog() {
         this.monitorManager.createMonitorDiagnosticSettings(this.id, this, {
-            name: `${this.props.stackName}-servicebus`,
+            name: `${this.id}-servicebus`,
             resourceUri: this.serviceBus.namespace.id,
             workspaceId: this.commonLogAnalyticsWorkspace.id,
             logAnalyticsDestinationType: 'Dedicated',

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

@@ -1,6 +1,7 @@
 import { EventSubscription } from '@pulumi/azure-native/eventgrid/index.js';
 import { Namespace, Queue } from '@pulumi/azure-native/servicebus/index.js';
 import { BlobContainer, StorageAccount } from '@pulumi/azure-native/storage/index.js';
+import { Input } from '@pulumi/pulumi';
 import { DefenderForStorageProps, EventgridEventSubscriptionProps, EventgridTopicProps, ServiceBusNamespaceProps, ServiceBusQueueProps, StorageAccountProps, StorageContainerProps } from '../../services/index.js';
 import { AzureFunctionAppProps } from '../function-app/index.js';
 /** @category Interface */
@@ -29,7 +30,7 @@ export interface EventHandlerEventGridTopicProps extends EventgridTopicProps {
     useExistingTopic: boolean;
     existingSubscriptionId?: string;
     existingTopicName?: string;
-    existingResourceGroupName?: string;
+    existingResourceGroupName?: Input<string>;
 }
 /** @category Interface */
 export interface AzureEventHandlerProps extends AzureFunctionAppProps {

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

@@ -89,7 +89,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             }
             this.api.apim = this.apiManagementManager.createApiManagementService(this.id, this, {
                 ...this.props.apiManagement,
-                serviceName: this.props.stackName,
+                serviceName: this.id,
                 location: this.resourceGroup.location,
                 resourceGroupName: this.resourceGroup.name,
                 hostnameConfigurations,
@@ -131,7 +131,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             return;
         this.api.namedValueSecret = this.keyVaultManager.createKeyVaultSecret(`${this.id}-key-vault-api-namespace-secret`, this, {
             vaultName: this.api.authKeyVault.name,
-            secretName: `${this.applicationInsights.name}-${this.props.stackName}-key`,
+            secretName: `${this.applicationInsights.name}-${this.id}-key`,
             resourceGroupName: this.resourceGroup.name,
             properties: {
                 value: this.applicationInsights.instrumentationKey,
@@ -154,7 +154,7 @@ export class AzureRestApi extends CommonAzureConstruct {
         });
         this.keyVaultManager.createKeyVaultSecret(`${this.id}-key-vault-api-subscription-key-secret`, this, {
             vaultName: this.api.authKeyVault.name,
-            secretName: `${this.props.stackName}-subscription-key`,
+            secretName: `${this.id}-subscription-key`,
             resourceGroupName: this.resourceGroup.name,
             properties: {
                 value: apiManagementSubscription.primaryKey.apply(key => key ?? ''),
@@ -209,7 +209,7 @@ export class AzureRestApi extends CommonAzureConstruct {
             return;
         this.monitorManager.createMonitorDiagnosticSettings(`${this.id}-apim-diagnostic`, this, {
             ...this.props.apiManagementDiagnosticSettings,
-            name: `${this.props.stackName}-api-management`,
+            name: `${this.id}-api-management`,
             resourceUri: this.api.apim.id,
             workspaceId: this.commonLogAnalyticsWorkspace.id,
         });

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

@@ -5,8 +5,8 @@ import { Input, Output } from '@pulumi/pulumi';
 import { ApiDiagnosticProps, ApiManagementProps, CommonAzureStackProps, MonitorDiagnosticSettingProps } from '../../index.js';
 /** @category Interface */
 export interface ApiAuthKeyVault {
-    name: string;
-    resourceGroupName: string;
+    name: Input<string>;
+    resourceGroupName: Input<string>;
 }
 /** @category Interface */
 export interface AzureRestApiProps extends CommonAzureStackProps {

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

@@ -111,7 +111,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
             }
             this.api.apim = this.apiManagementManager.createApiManagementService(this.id, this, {
                 ...this.props.apiManagement,
-                serviceName: this.props.stackName,
+                serviceName: this.id,
                 location: this.resourceGroup.location,
                 resourceGroupName: this.resourceGroup.name,
                 hostnameConfigurations,
@@ -143,7 +143,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
         });
         this.api.backend = this.apiManagementManager.createBackend(this.id, this, {
             ...this.props.apiManagementBackend,
-            title: this.props.stackName,
+            title: this.id,
             resourceGroupName: this.api.resourceGroupName,
             serviceName: this.api.name,
             url: pulumi.interpolate `https://${this.app.name}.azurewebsites.net/${this.props.apiManagementBackend.backendUrlPath}`,
@@ -161,7 +161,7 @@ export class AzureRestApiFunction extends AzureFunctionApp {
     createApiManagementRoutes() {
         this.api.managementApi = this.apiManagementManager.createApi(`${this.id}-apim-api`, this, {
             ...this.props.apiManagementApi,
-            displayName: this.props.apiManagementApi.displayName ?? this.props.stackName,
+            displayName: this.props.apiManagementApi.displayName ?? this.id,
             serviceName: this.api.name,
             resourceGroupName: this.api.resourceGroupName,
             isCurrent: this.props.apiManagementApi.isCurrent ?? true,

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

@@ -37,7 +37,7 @@ export class AzureRestApiWithCache extends AzureRestApi {
     createRedisCache() {
         this.api.redis = this.redisManager.createManagedRedis(this.id, this, {
             ...this.props.apiManagementManagedRedis,
-            name: this.props.stackName,
+            name: this.id,
             location: this.resourceGroup.location,
             resourceGroupName: this.resourceGroup.name,
         }, { ignoreChanges: ['location'] });

package/dist/src/services/api-management/types.d.ts

@@ -1,7 +1,8 @@
 import { ApiArgs, ApiDiagnosticArgs, ApiManagementServiceArgs, ApiOperationArgs, ApiOperationPolicyArgs, ApiPolicyArgs, BackendArgs, CacheArgs, GetApiManagementServiceOutputArgs, LoggerArgs, NamedValueArgs, SubscriptionArgs } from '@pulumi/azure-native/apimanagement/index.js';
+import { Input } from '@pulumi/pulumi';
 /** @category Interface */
 export interface ApiManagementProps extends ApiManagementServiceArgs {
-    certificateKeyVaultId?: string;
+    certificateKeyVaultId?: Input<string>;
     apiStackName?: string;
     useExistingApiManagement?: boolean;
 }

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

@@ -40,7 +40,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: string, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToKeyVault(id: string, scope: CommonAzureConstruct, vaultName: string, resourceGroupName: Input<string>, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, 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
@@ -51,7 +51,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: string, resourceGroupName: string, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, resourceOptions?: ResourceOptions): import("@pulumi/azure-native/authorization/roleAssignment.js").RoleAssignment;
+    grantRoleAssignmentToEventgridTopic(id: string, scope: CommonAzureConstruct, topicName: string, resourceGroupName: Input<string>, principalId: Input<string>, roleDefinitionId: RoleDefinitionId, 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

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

@@ -73,7 +73,7 @@ export declare class AzureCosmosDbManager {
      * @param roleDefinitionId the role definition id
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    resolveSqlRoleDefinition(scope: CommonAzureConstruct, accountName: Input<string>, resourceGroupName: string, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/cosmosdb/getSqlResourceSqlRoleDefinition.js").GetSqlResourceSqlRoleDefinitionResult>;
+    resolveSqlRoleDefinition(scope: CommonAzureConstruct, accountName: Input<string>, resourceGroupName: Input<string>, roleDefinitionId: string, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/cosmosdb/getSqlResourceSqlRoleDefinition.js").GetSqlResourceSqlRoleDefinitionResult>;
     /**
      * @summary Method to assign a sql role assignment
      * @param id scoped id of the resource

package/dist/src/services/key-vault/main.d.ts

@@ -1,4 +1,4 @@
-import { ResourceOptions } from '@pulumi/pulumi';
+import { Input, ResourceOptions } from '@pulumi/pulumi';
 import { CommonAzureConstruct } from '../../common/index.js';
 import { KeyVaultProps, SecretProps } from './types.js';
 /**
@@ -46,5 +46,5 @@ export declare class AzureKeyVaultManager {
      * @param resourceGroupName the resource group name
      * @param resourceOptions Optional settings to control resource behaviour
      */
-    resolveKeyVault(scope: CommonAzureConstruct, vaultName: string, resourceGroupName: string, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/keyvault/getVault.js").GetVaultResult>;
+    resolveKeyVault(scope: CommonAzureConstruct, vaultName: string, resourceGroupName: Input<string>, resourceOptions?: ResourceOptions): import("@pulumi/pulumi").Output<import("@pulumi/azure-native/keyvault/getVault.js").GetVaultResult>;
 }

package/package.json

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