@gradientedge/cdk-utils 9.46.0 → 9.47.1

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

@@ -74,14 +74,14 @@ class AzureAppServiceManager {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.linuxWebApp),
             resourceGroupName: resourceGroup.name,
-            httpsOnly: props.httpsOnly || true,
+            httpsOnly: props.httpsOnly ?? true,
             identity: props.identity || {
                 type: 'SystemAssigned',
             },
             siteConfig: {
                 ...props.siteConfig,
-                alwaysOn: props.siteConfig.alwaysOn || true,
-                applicationStack: props.siteConfig.applicationStack || { nodeVersion: '22-lts' },
+                alwaysOn: props.siteConfig.alwaysOn ?? true,
+                applicationStack: props.siteConfig.applicationStack ?? { nodeVersion: '22-lts' },
             },
             tags: props.tags ?? {
                 environment: scope.props.stage,

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

@@ -1,5 +1,6 @@
 import { AwsProvider } from '@cdktf/provider-aws/lib/provider';
-import { S3Backend, TerraformStack } from 'cdktf';
+import { AzurermProvider } from '@cdktf/provider-azurerm/lib/provider';
+import { AzurermBackend, S3Backend, TerraformStack } from 'cdktf';
 import { Construct } from 'constructs';
 import { CloudflareAccessManager, CloudflareApiShieldManager, CloudflareArgoManager, CloudflareFilterManager, CloudflareFirewallManager, CloudflarePageManager, CloudflareRecordManager, CloudflareRuleSetManager, CloudflareWorkerManager, CloudflareZoneManager } from '../services';
 import { CommonCloudflareStackProps } from './types';
@@ -19,6 +20,8 @@ export declare class CommonCloudflareConstruct extends TerraformStack {
     zoneManager: CloudflareZoneManager;
     awsProvider: AwsProvider;
     s3Backend: S3Backend;
+    azurermProvider: AzurermProvider;
+    azurermBackend: AzurermBackend;
     constructor(scope: Construct, id: string, props: CommonCloudflareStackProps);
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain

package/dist/src/lib/cloudflare/common/construct.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonCloudflareConstruct = void 0;
 const provider_1 = require("@cdktf/provider-aws/lib/provider");
 const provider_2 = require("@cdktf/provider-cloudflare/lib/provider");
+const provider_3 = require("@cdktf/provider-azurerm/lib/provider");
 const cdktf_1 = require("cdktf");
 const common_1 = require("../../common");
 const services_1 = require("../services");
@@ -22,6 +23,8 @@ class CommonCloudflareConstruct extends cdktf_1.TerraformStack {
     zoneManager;
     awsProvider;
     s3Backend;
+    azurermProvider;
+    azurermBackend;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
@@ -79,7 +82,11 @@ class CommonCloudflareConstruct extends cdktf_1.TerraformStack {
                 });
                 break;
             case constants_1.RemoteBackend.azurerm:
-                new cdktf_1.AzurermBackend(this, {
+                this.azurermProvider = new provider_3.AzurermProvider(this, `${this.id}-azurerm-provider`, {
+                    features: [{}],
+                    subscriptionId: this.props.remoteBackend.subscriptionId,
+                });
+                this.azurermBackend = new cdktf_1.AzurermBackend(this, {
                     storageAccountName: this.props.remoteBackend.storageAccountName,
                     containerName: this.props.remoteBackend.containerName,
                     key: `${this.id}`,

package/dist/src/lib/cloudflare/construct/worker-site/main.d.ts

@@ -53,6 +53,15 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @returns the secret value
      */
     protected resolveSecretFromAWS(secretName: string, secretKey: string): any;
+    /**
+     * @summary Resolve secrets from Azure Key Vault
+     *
+     * @param resourceGroupName the resource group name where the key vault is located
+     * @param keyVaultName the key vault name
+     * @param secretKey the secret key
+     * @returns the secret value
+     */
+    protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string): string;
     /**
      * @summary Create the rules
      */

package/dist/src/lib/cloudflare/construct/worker-site/main.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflareWorkerSite = void 0;
 const data_aws_secretsmanager_secret_1 = require("@cdktf/provider-aws/lib/data-aws-secretsmanager-secret");
 const data_aws_secretsmanager_secret_version_1 = require("@cdktf/provider-aws/lib/data-aws-secretsmanager-secret-version");
+const data_azurerm_key_vault_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-key-vault");
+const data_azurerm_key_vault_secret_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-key-vault-secret");
 const cdktf_1 = require("cdktf");
 const common_1 = require("../../common");
 /**
@@ -93,8 +95,9 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
      * @returns the secret value
      */
     resolveSecretFromAWS(secretName, secretKey) {
-        if (!this.awsProvider)
-            return;
+        if (!this.awsProvider) {
+            throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`);
+        }
         const secret = new data_aws_secretsmanager_secret_1.DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, { name: secretName });
         const secretVersion = new data_aws_secretsmanager_secret_version_1.DataAwsSecretsmanagerSecretVersion(this, `${this.id}-${secretName}-${secretKey}-ver`, {
             provider: this.awsProvider,
@@ -104,6 +107,32 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
             throw new Error(`Unable to resolve secret:${secretName}`);
         return cdktf_1.Fn.lookup(cdktf_1.Fn.jsondecode(secretVersion.secretString), secretKey);
     }
+    /**
+     * @summary Resolve secrets from Azure Key Vault
+     *
+     * @param resourceGroupName the resource group name where the key vault is located
+     * @param keyVaultName the key vault name
+     * @param secretKey the secret key
+     * @returns the secret value
+     */
+    resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey) {
+        if (!this.azurermProvider) {
+            throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`);
+        }
+        const keyVaultData = new data_azurerm_key_vault_1.DataAzurermKeyVault(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`, {
+            resourceGroupName: resourceGroupName,
+            name: keyVaultName,
+            provider: this.azurermProvider,
+        });
+        const secretValueData = new data_azurerm_key_vault_secret_1.DataAzurermKeyVaultSecret(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`, {
+            name: secretKey,
+            keyVaultId: keyVaultData.id,
+            provider: this.azurermProvider,
+        });
+        if (!secretValueData)
+            throw new Error(`Unable to resolve secret:${secretKey}`);
+        return secretValueData.value;
+    }
     /**
      * @summary Create the rules
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.46.0",
+  "version": "9.47.1",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -54,13 +54,13 @@
     "@aws-sdk/credential-providers": "^3.738.0",
     "@aws-sdk/types": "^3.734.0",
     "@cdktf/provider-aws": "^19.50.0",
-    "@cdktf/provider-azurerm": "^13.17.0",
+    "@cdktf/provider-azurerm": "13.22.0",
     "@cdktf/provider-cloudflare": "^11.29.0",
     "@types/lodash": "^4.17.15",
     "@types/node": "^22.13.0",
     "@types/uuid": "^10.0.0",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.177.0",
+    "aws-cdk-lib": "2.178.1",
     "cdktf": "^0.20.11",
     "cdktf-local-exec": "^0.5.54",
     "constructs": "^10.4.2",

package/src/lib/azure/services/app-service/main.ts

@@ -79,15 +79,15 @@ export class AzureAppServiceManager {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.linuxWebApp),
       resourceGroupName: resourceGroup.name,
-      httpsOnly: props.httpsOnly || true,
+      httpsOnly: props.httpsOnly ?? true,
 
       identity: props.identity || {
         type: 'SystemAssigned',
       },
       siteConfig: {
         ...props.siteConfig,
-        alwaysOn: props.siteConfig.alwaysOn || true,
-        applicationStack: props.siteConfig.applicationStack || { nodeVersion: '22-lts' },
+        alwaysOn: props.siteConfig.alwaysOn ?? true,
+        applicationStack: props.siteConfig.applicationStack ?? { nodeVersion: '22-lts' },
       },
       tags: props.tags ?? {
         environment: scope.props.stage,

package/src/lib/cloudflare/common/construct.ts

@@ -1,5 +1,6 @@
 import { AwsProvider } from '@cdktf/provider-aws/lib/provider'
 import { CloudflareProvider } from '@cdktf/provider-cloudflare/lib/provider'
+import { AzurermProvider } from '@cdktf/provider-azurerm/lib/provider'
 import { AzurermBackend, S3Backend, TerraformStack, TerraformVariable } from 'cdktf'
 import { Construct } from 'constructs'
 import { isDevStage, isPrdStage, isTestStage, isUatStage } from '../../common'
@@ -34,6 +35,8 @@ export class CommonCloudflareConstruct extends TerraformStack {
   zoneManager: CloudflareZoneManager
   awsProvider: AwsProvider
   s3Backend: S3Backend
+  azurermProvider: AzurermProvider
+  azurermBackend: AzurermBackend
 
   constructor(scope: Construct, id: string, props: CommonCloudflareStackProps) {
     super(scope, id)
@@ -83,6 +86,7 @@ export class CommonCloudflareConstruct extends TerraformStack {
 
   protected determineRemoteBackend() {
     const debug = this.node.tryGetContext('debug')
+
     switch (this.props.remoteBackend?.type) {
       case RemoteBackend.s3:
         this.awsProvider = new AwsProvider(this, `${this.id}-aws-provider`, {
@@ -98,7 +102,11 @@ export class CommonCloudflareConstruct extends TerraformStack {
         })
         break
       case RemoteBackend.azurerm:
-        new AzurermBackend(this, {
+        this.azurermProvider = new AzurermProvider(this, `${this.id}-azurerm-provider`, {
+          features: [{}],
+          subscriptionId: this.props.remoteBackend.subscriptionId,
+        })
+        this.azurermBackend = new AzurermBackend(this, {
           storageAccountName: this.props.remoteBackend.storageAccountName,
           containerName: this.props.remoteBackend.containerName,
           key: `${this.id}`,

package/src/lib/cloudflare/construct/worker-site/main.ts

@@ -1,5 +1,7 @@
 import { DataAwsSecretsmanagerSecret } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret'
 import { DataAwsSecretsmanagerSecretVersion } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret-version'
+import { DataAzurermKeyVault } from '@cdktf/provider-azurerm/lib/data-azurerm-key-vault'
+import { DataAzurermKeyVaultSecret } from '@cdktf/provider-azurerm/lib/data-azurerm-key-vault-secret'
 import { DataCloudflareZone } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone'
 import {
   WorkerScript,
@@ -109,7 +111,9 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
    * @returns the secret value
    */
   protected resolveSecretFromAWS(secretName: string, secretKey: string) {
-    if (!this.awsProvider) return
+    if (!this.awsProvider) {
+      throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`)
+    }
     const secret = new DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, { name: secretName })
     const secretVersion = new DataAwsSecretsmanagerSecretVersion(this, `${this.id}-${secretName}-${secretKey}-ver`, {
       provider: this.awsProvider,
@@ -119,6 +123,40 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     return Fn.lookup(Fn.jsondecode(secretVersion.secretString), secretKey)
   }
 
+  /**
+   * @summary Resolve secrets from Azure Key Vault
+   *
+   * @param resourceGroupName the resource group name where the key vault is located
+   * @param keyVaultName the key vault name
+   * @param secretKey the secret key
+   * @returns the secret value
+   */
+  protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string) {
+    if (!this.azurermProvider) {
+      throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`)
+    }
+    const keyVaultData = new DataAzurermKeyVault(
+      this,
+      `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`,
+      {
+        resourceGroupName: resourceGroupName,
+        name: keyVaultName,
+        provider: this.azurermProvider,
+      }
+    )
+    const secretValueData = new DataAzurermKeyVaultSecret(
+      this,
+      `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`,
+      {
+        name: secretKey,
+        keyVaultId: keyVaultData.id,
+        provider: this.azurermProvider,
+      }
+    )
+    if (!secretValueData) throw new Error(`Unable to resolve secret:${secretKey}`)
+    return secretValueData.value
+  }
+
   /**
    * @summary Create the rules
    */