@gradientedge/cdk-utils 9.53.2 → 9.55.0

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

@@ -95,7 +95,7 @@ class CommonAzureStack extends cdktf_1.TerraformStack {
      * - Primary use is to have layered config for each environment which is injected into the context
      */
     determineStageContexts() {
-        const stage = this.node.tryGetContext('stage');
+        const stage = process.env.STAGE ?? this.node.tryGetContext('stage');
         const stageContextPath = this.node.tryGetContext('stageContextPath') || 'cdkEnv';
         const stageContextFilePath = path_1.default.join(app_root_path_1.default.path, stageContextPath, `${stage}.json`);
         const debug = this.node.tryGetContext('debug');

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

@@ -114,6 +114,17 @@ class AzureFunctionManager {
             },
         });
         new cdktf_local_exec_1.Provider(scope, `${id}-local-exec-provider`);
+        // Temporary workaround until https://github.com/hashicorp/terraform-provider-azurerm/pull/29023 is made available
+        new cdktf_local_exec_1.LocalExec(scope, `${id}-function-app-always-ready`, {
+            triggers: {
+                hash: props.sourceCodeHash,
+                alwaysReadyConfigName: props.alwaysReadyConfig[0].name,
+                alwaysReadyConfigInstanceCount: props.alwaysReadyConfig[0].instanceCount.toString(),
+            },
+            command: `
+        az functionapp scale config always-ready set --name "${functionApp.name}" --resource-group "${resourceGroup.name}" --settings "${props.alwaysReadyConfig[0].name}"="${props.alwaysReadyConfig[0].instanceCount}"
+      `,
+        });
         // 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`, {
@@ -121,20 +132,20 @@ class AzureFunctionManager {
                 hash: props.sourceCodeHash,
             },
             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."
-  `,
+        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/azure/services/function/types.d.ts

@@ -8,4 +8,9 @@ export interface FunctionProps extends FunctionAppFunctionConfig {
 export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
     sourceCodeHash: string;
     deploySource: string;
+    alwaysReadyConfig: AlwaysReadyConfigProps[];
+}
+export interface AlwaysReadyConfigProps {
+    name: string;
+    instanceCount: number;
 }

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

@@ -88,7 +88,7 @@ class CommonCloudflareStack extends cdktf_1.TerraformStack {
      * - Primary use is to have layered config for each environment which is injected into the context
      */
     determineStageContexts() {
-        const stage = this.node.tryGetContext('stage');
+        const stage = process.env.STAGE ?? this.node.tryGetContext('stage');
         const stageContextPath = this.node.tryGetContext('stageContextPath') || 'cdkEnv';
         const stageContextFilePath = path_1.default.join(app_root_path_1.default.path, stageContextPath, `${stage}.json`);
         const debug = this.node.tryGetContext('debug');

package/package.json

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

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

@@ -104,7 +104,7 @@ export class CommonAzureStack extends TerraformStack {
    * - Primary use is to have layered config for each environment which is injected into the context
    */
   protected determineStageContexts() {
-    const stage = this.node.tryGetContext('stage')
+    const stage = process.env.STAGE ?? this.node.tryGetContext('stage')
     const stageContextPath = this.node.tryGetContext('stageContextPath') || 'cdkEnv'
     const stageContextFilePath = path.join(appRoot.path, stageContextPath, `${stage}.json`)
     const debug = this.node.tryGetContext('debug')

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

@@ -127,6 +127,19 @@ export class AzureFunctionManager {
     })
 
     new Provider(scope, `${id}-local-exec-provider`)
+
+    // Temporary workaround until https://github.com/hashicorp/terraform-provider-azurerm/pull/29023 is made available
+    new LocalExec(scope, `${id}-function-app-always-ready`, {
+      triggers: {
+        hash: props.sourceCodeHash,
+        alwaysReadyConfigName: props.alwaysReadyConfig[0].name,
+        alwaysReadyConfigInstanceCount: props.alwaysReadyConfig[0].instanceCount.toString(),
+      },
+      command: `
+        az functionapp scale config always-ready set --name "${functionApp.name}" --resource-group "${resourceGroup.name}" --settings "${props.alwaysReadyConfig[0].name}"="${props.alwaysReadyConfig[0].instanceCount}"
+      `,
+    })
+
     // 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`, {
@@ -134,20 +147,20 @@ export class AzureFunctionManager {
         hash: props.sourceCodeHash,
       },
       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."
-  `,
+        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/azure/services/function/types.ts

@@ -9,4 +9,10 @@ export interface FunctionProps extends FunctionAppFunctionConfig {}
 export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
   sourceCodeHash: string
   deploySource: string
+  alwaysReadyConfig: AlwaysReadyConfigProps[]
+}
+
+export interface AlwaysReadyConfigProps {
+  name: string
+  instanceCount: number
 }

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

@@ -97,7 +97,7 @@ export class CommonCloudflareStack extends TerraformStack {
    * - Primary use is to have layered config for each environment which is injected into the context
    */
   protected determineStageContexts() {
-    const stage = this.node.tryGetContext('stage')
+    const stage = process.env.STAGE ?? this.node.tryGetContext('stage')
     const stageContextPath = this.node.tryGetContext('stageContextPath') || 'cdkEnv'
     const stageContextFilePath = path.join(appRoot.path, stageContextPath, `${stage}.json`)
     const debug = this.node.tryGetContext('debug')