@gradientedge/cdk-utils 9.66.0 → 9.68.0

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

@@ -9,4 +9,4 @@ var AzureRemoteBackend;
 /**
  * List of Azure resources that excludes tags
  */
-exports.RESOURCES_TO_EXCLUDE_TAGS = new Set(['ApiManagementNamedValue']);
+exports.RESOURCES_TO_EXCLUDE_TAGS = new Set(['ApiManagementNamedValue', 'Application']);

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

@@ -1,9 +1,9 @@
 import { StorageAccount } from '@cdktf/provider-azurerm/lib/storage-account';
 import { StorageBlob } from '@cdktf/provider-azurerm/lib/storage-blob';
 import { StorageContainer } from '@cdktf/provider-azurerm/lib/storage-container';
-import { CommonAzureConstruct } from '../../common';
-import { StorageAccountProps, StorageBlobProps, StorageContainerProps } from './types';
 import { DataAzurermStorageAccountBlobContainerSas } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas';
+import { CommonAzureConstruct } from '../../common';
+import { StorageAccountProps, StorageBlobProps, StorageContainerProps, DataAzurermStorageAccountBlobContainerSasProps } from './types';
 /**
  * @classdesc Provides operations on Azure Storage
  * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
@@ -55,23 +55,16 @@ export declare class AzureStorageManager {
      *
      * @param id - Unique scoped identifier for the SAS token resource
      * @param scope - CDKTF construct scope in which the resource will be created
-     * @param props - Container details and SAS options:
-     *   - storageAccountName: The name of the existing Azure Storage Account
-     *   - storageContainerName: The name of the container within the storage account
-     *   - resourceGroupName: The name of the resource group containing the storage account
-     *   - sasStart: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
+     * @param props - SAS options:
+     *   - start: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
      *   To avoid diffs on every deploy, it is recommended to supply a fixed value.
-     *   - sasExpiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+     *   - expiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+     * @param storageAccount
+     * @param storageContainer
      *
      * @returns A `DataAzurermStorageAccountBlobContainerSas` instance with the generated SAS token
      *
      * @see https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/storage_account_blob_container_sas
      */
-    generateContainerSasToken(id: string, scope: CommonAzureConstruct, props: {
-        storageAccountName: string;
-        storageContainerName: string;
-        resourceGroupName: string;
-        sasStart?: string;
-        sasExpiry?: string;
-    }): DataAzurermStorageAccountBlobContainerSas;
+    generateContainerSasToken(id: string, scope: CommonAzureConstruct, props: DataAzurermStorageAccountBlobContainerSasProps, storageAccount: StorageAccount, storageContainer?: StorageContainer): DataAzurermStorageAccountBlobContainerSas;
 }

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

@@ -7,8 +7,8 @@ const data_azurerm_storage_container_1 = require("@cdktf/provider-azurerm/lib/da
 const storage_account_1 = require("@cdktf/provider-azurerm/lib/storage-account");
 const storage_blob_1 = require("@cdktf/provider-azurerm/lib/storage-blob");
 const storage_container_1 = require("@cdktf/provider-azurerm/lib/storage-container");
-const utils_1 = require("../../utils");
 const data_azurerm_storage_account_blob_container_sas_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas");
+const utils_1 = require("../../utils");
 /**
  * @classdesc Provides operations on Azure Storage
  * - A new instance of this class is injected into {@link CommonAzureConstruct} constructor.
@@ -127,30 +127,25 @@ class AzureStorageManager {
      *
      * @param id - Unique scoped identifier for the SAS token resource
      * @param scope - CDKTF construct scope in which the resource will be created
-     * @param props - Container details and SAS options:
-     *   - storageAccountName: The name of the existing Azure Storage Account
-     *   - storageContainerName: The name of the container within the storage account
-     *   - resourceGroupName: The name of the resource group containing the storage account
-     *   - sasStart: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
+     * @param props - SAS options:
+     *   - start: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
      *   To avoid diffs on every deploy, it is recommended to supply a fixed value.
-     *   - sasExpiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+     *   - expiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+     * @param storageAccount
+     * @param storageContainer
      *
      * @returns A `DataAzurermStorageAccountBlobContainerSas` instance with the generated SAS token
      *
      * @see https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/storage_account_blob_container_sas
      */
-    generateContainerSasToken(id, scope, props) {
-        const storageAccountLookup = new data_azurerm_storage_account_1.DataAzurermStorageAccount(scope, `${id}-lookup-sa`, {
-            name: props.storageAccountName,
-            resourceGroupName: props.resourceGroupName,
-        });
-        const containerSas = new data_azurerm_storage_account_blob_container_sas_1.DataAzurermStorageAccountBlobContainerSas(scope, `${id}-sas`, {
-            connectionString: storageAccountLookup.primaryConnectionString,
-            containerName: props.storageContainerName,
-            httpsOnly: true,
-            start: props.sasStart ?? new Date().toISOString().split('T')[0],
-            expiry: props.sasExpiry ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
-            permissions: {
+    generateContainerSasToken(id, scope, props, storageAccount, storageContainer) {
+        const containerSas = new data_azurerm_storage_account_blob_container_sas_1.DataAzurermStorageAccountBlobContainerSas(scope, `${id}-sc-sas`, {
+            connectionString: storageAccount.primaryConnectionString,
+            containerName: props.containerName ?? storageContainer?.name,
+            httpsOnly: props.httpsOnly ?? true,
+            start: props.start ?? new Date().toISOString().split('T')[0],
+            expiry: props.expiry ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+            permissions: props.permissions ?? {
                 read: true,
                 add: false,
                 create: false,

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

@@ -1,15 +1,13 @@
 import { StorageAccountConfig } from '@cdktf/provider-azurerm/lib/storage-account';
 import { StorageBlobConfig } from '@cdktf/provider-azurerm/lib/storage-blob';
 import { StorageContainerConfig } from '@cdktf/provider-azurerm/lib/storage-container';
+import { DataAzurermStorageAccountBlobContainerSasConfig } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas';
 import { BaseAzureConfigProps } from '../../types';
 export interface StorageAccountProps extends StorageAccountConfig {
 }
 export interface StorageContainerProps extends BaseAzureConfigProps, StorageContainerConfig {
 }
 export interface StorageBlobProps extends BaseAzureConfigProps, StorageBlobConfig {
-    /**
-     * Optional ISO date string representing the expiry date for the SAS token.
-     * Format: 'YYYY-MM-DD' (e.g., '2025-05-01')
-     */
-    sasExpiry?: string;
+}
+export interface DataAzurermStorageAccountBlobContainerSasProps extends DataAzurermStorageAccountBlobContainerSasConfig {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.66.0",
+  "version": "9.68.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -54,14 +54,14 @@
     "@aws-sdk/credential-providers": "^3.817.0",
     "@aws-sdk/types": "^3.804.0",
     "@cdktf/provider-aws": "^19.63.0",
-    "@cdktf/provider-azurerm": "^13.29.0",
-    "@cdktf/provider-cloudflare": "^12.4.0",
+    "@cdktf/provider-azurerm": "^14.4.0",
+    "@cdktf/provider-cloudflare": "^13.1.0",
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.15.17",
     "@types/uuid": "^10.0.0",
     "app-root-path": "^3.1.0",
     "aws-cdk-lib": "^2.195.0",
-    "cdktf": "^0.20.12",
+    "cdktf": "^0.21.0",
     "cdktf-local-exec": "^0.5.71",
     "constructs": "^10.4.2",
     "lodash": "^4.17.21",

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

@@ -6,4 +6,4 @@ export enum AzureRemoteBackend {
 /**
  * List of Azure resources that excludes tags
  */
-export const RESOURCES_TO_EXCLUDE_TAGS = new Set(['ApiManagementNamedValue'])
+export const RESOURCES_TO_EXCLUDE_TAGS = new Set(['ApiManagementNamedValue', 'Application'])

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

@@ -4,10 +4,15 @@ import { DataAzurermStorageContainer } from '@cdktf/provider-azurerm/lib/data-az
 import { StorageAccount } from '@cdktf/provider-azurerm/lib/storage-account'
 import { StorageBlob } from '@cdktf/provider-azurerm/lib/storage-blob'
 import { StorageContainer } from '@cdktf/provider-azurerm/lib/storage-container'
+import { DataAzurermStorageAccountBlobContainerSas } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
-import { StorageAccountProps, StorageBlobProps, StorageContainerProps } from './types'
-import { DataAzurermStorageAccountBlobContainerSas } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas'
+import {
+  StorageAccountProps,
+  StorageBlobProps,
+  StorageContainerProps,
+  DataAzurermStorageAccountBlobContainerSasProps,
+} from './types'
 
 /**
  * @classdesc Provides operations on Azure Storage
@@ -140,13 +145,12 @@ export class AzureStorageManager {
    *
    * @param id - Unique scoped identifier for the SAS token resource
    * @param scope - CDKTF construct scope in which the resource will be created
-   * @param props - Container details and SAS options:
-   *   - storageAccountName: The name of the existing Azure Storage Account
-   *   - storageContainerName: The name of the container within the storage account
-   *   - resourceGroupName: The name of the resource group containing the storage account
-   *   - sasStart: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
+   * @param props - SAS options:
+   *   - start: Optional start date in the format 'YYYY-MM-DD'. If not provided, defaults to today’s date.
    *   To avoid diffs on every deploy, it is recommended to supply a fixed value.
-   *   - sasExpiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+   *   - expiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+   * @param storageAccount
+   * @param storageContainer
    *
    * @returns A `DataAzurermStorageAccountBlobContainerSas` instance with the generated SAS token
    *
@@ -155,26 +159,17 @@ export class AzureStorageManager {
   public generateContainerSasToken(
     id: string,
     scope: CommonAzureConstruct,
-    props: {
-      storageAccountName: string
-      storageContainerName: string
-      resourceGroupName: string
-      sasStart?: string
-      sasExpiry?: string
-    }
-  ): DataAzurermStorageAccountBlobContainerSas {
-    const storageAccountLookup = new DataAzurermStorageAccount(scope, `${id}-lookup-sa`, {
-      name: props.storageAccountName,
-      resourceGroupName: props.resourceGroupName,
-    })
-
-    const containerSas = new DataAzurermStorageAccountBlobContainerSas(scope, `${id}-sas`, {
-      connectionString: storageAccountLookup.primaryConnectionString,
-      containerName: props.storageContainerName,
-      httpsOnly: true,
-      start: props.sasStart ?? new Date().toISOString().split('T')[0],
-      expiry: props.sasExpiry ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
-      permissions: {
+    props: DataAzurermStorageAccountBlobContainerSasProps,
+    storageAccount: StorageAccount,
+    storageContainer?: StorageContainer
+  ) {
+    const containerSas = new DataAzurermStorageAccountBlobContainerSas(scope, `${id}-sc-sas`, {
+      connectionString: storageAccount.primaryConnectionString,
+      containerName: props.containerName ?? storageContainer?.name,
+      httpsOnly: props.httpsOnly ?? true,
+      start: props.start ?? new Date().toISOString().split('T')[0],
+      expiry: props.expiry ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+      permissions: props.permissions ?? {
         read: true,
         add: false,
         create: false,

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

@@ -1,16 +1,14 @@
 import { StorageAccountConfig } from '@cdktf/provider-azurerm/lib/storage-account'
 import { StorageBlobConfig } from '@cdktf/provider-azurerm/lib/storage-blob'
 import { StorageContainerConfig } from '@cdktf/provider-azurerm/lib/storage-container'
+import { DataAzurermStorageAccountBlobContainerSasConfig } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas'
 import { BaseAzureConfigProps } from '../../types'
 
 export interface StorageAccountProps extends StorageAccountConfig {}
 
 export interface StorageContainerProps extends BaseAzureConfigProps, StorageContainerConfig {}
 
-export interface StorageBlobProps extends BaseAzureConfigProps, StorageBlobConfig {
-  /**
-   * Optional ISO date string representing the expiry date for the SAS token.
-   * Format: 'YYYY-MM-DD' (e.g., '2025-05-01')
-   */
-  sasExpiry?: string
-}
+export interface StorageBlobProps extends BaseAzureConfigProps, StorageBlobConfig {}
+
+export interface DataAzurermStorageAccountBlobContainerSasProps
+  extends DataAzurermStorageAccountBlobContainerSasConfig {}