@gradientedge/cdk-utils 9.51.0 → 9.52.1

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

@@ -114,11 +114,27 @@ class AzureFunctionManager {
             },
         });
         new cdktf_local_exec_1.Provider(scope, `${id}-local-exec-provider`);
+        // Deploy function app zip package with up to 3 retry attempts.
+        // This handles transient issues like HTTP 503s returned from the Azure Kudu deployment endpoint.
         new cdktf_local_exec_1.LocalExec(scope, `${id}-function-app-deploy`, {
             triggers: {
                 hash: props.sourceCodeHash,
             },
-            command: `az functionapp deployment source config-zip --resource-group ${resourceGroup.name} --name ${functionApp.name} --src ${props.deploySource}`,
+            command: `
+    set -e
+    MAX_RETRIES=3
+    RETRY_COUNT=0
+    until az functionapp deployment source config-zip --resource-group "${resourceGroup.name}" --name "${functionApp.name}" --src "${props.deploySource}"; do
+      RETRY_COUNT=$((RETRY_COUNT+1))
+      echo "Deployment attempt $RETRY_COUNT failed. Retrying in 10 seconds..."
+      if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+        echo "Deployment failed after $MAX_RETRIES attempts."
+        exit 1
+      fi
+      sleep 10
+    done
+    echo "Deployment succeeded."
+  `,
         });
         return functionApp;
     }

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

@@ -64,6 +64,15 @@ export declare class CloudflarePagesStaticSite 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 pages project
      */

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflarePagesStaticSite = 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");
 /**
@@ -109,6 +111,29 @@ class CloudflarePagesStaticSite 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) {
+        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 pages project
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.51.0",
+  "version": "9.52.1",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

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

@@ -127,11 +127,27 @@ export class AzureFunctionManager {
     })
 
     new Provider(scope, `${id}-local-exec-provider`)
+    // Deploy function app zip package with up to 3 retry attempts.
+    // This handles transient issues like HTTP 503s returned from the Azure Kudu deployment endpoint.
     new LocalExec(scope, `${id}-function-app-deploy`, {
       triggers: {
         hash: props.sourceCodeHash,
       },
-      command: `az functionapp deployment source config-zip --resource-group ${resourceGroup.name} --name ${functionApp.name} --src ${props.deploySource}`,
+      command: `
+    set -e
+    MAX_RETRIES=3
+    RETRY_COUNT=0
+    until az functionapp deployment source config-zip --resource-group "${resourceGroup.name}" --name "${functionApp.name}" --src "${props.deploySource}"; do
+      RETRY_COUNT=$((RETRY_COUNT+1))
+      echo "Deployment attempt $RETRY_COUNT failed. Retrying in 10 seconds..."
+      if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+        echo "Deployment failed after $MAX_RETRIES attempts."
+        exit 1
+      fi
+      sleep 10
+    done
+    echo "Deployment succeeded."
+  `,
     })
 
     return functionApp

package/src/lib/cloudflare/construct/pages-static-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 { PagesDomain } from '@cdktf/provider-cloudflare/lib/pages-domain'
 import { PagesProject } from '@cdktf/provider-cloudflare/lib/pages-project'
@@ -120,6 +122,37 @@ export class CloudflarePagesStaticSite 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) {
+    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 pages project
    */