@gradientedge/cdk-utils 9.64.0 → 9.66.0

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAzureConstruct = void 0;
 const provider_1 = require("@cdktf/provider-azurerm/lib/provider");
 const provider_2 = require("../.gen/providers/azapi/provider");
+const cdktf_local_exec_1 = require("cdktf-local-exec");
 const data_azurerm_client_config_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-client-config");
 const cdktf_1 = require("cdktf");
 const common_1 = require("../../common");
@@ -52,6 +53,7 @@ class CommonAzureConstruct extends cdktf_1.TerraformStack {
         this.determineTenantId();
         new provider_2.AzapiProvider(this, `${this.id}-azapi-provider`, this.props);
         new provider_1.AzurermProvider(this, `${this.id}-provider`, this.props);
+        new cdktf_local_exec_1.Provider(this, `${this.id}-local-exec-provider`);
     }
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain

package/dist/src/lib/azure/services/api-management/main.d.ts

@@ -1,6 +1,5 @@
 import { DataAzurermApiManagement, DataAzurermApiManagementConfig } from '@cdktf/provider-azurerm/lib/data-azurerm-api-management';
 import { ApiManagementCustomDomain } from '@cdktf/provider-azurerm/lib/api-management-custom-domain';
-import { ApiManagementBackend } from '@cdktf/provider-azurerm/lib/api-management-backend';
 import { ApiManagement } from '@cdktf/provider-azurerm/lib/api-management';
 import { ApiManagementApi } from '@cdktf/provider-azurerm/lib/api-management-api';
 import { ApiManagementLoggerApplicationInsights } from '@cdktf/provider-azurerm/lib/api-management-logger';
@@ -56,7 +55,7 @@ export declare class AzureApiManagementManager {
      * @param props api management backend properties
      * @see [CDKTF Api management Backend Module]{@link https://github.com/cdktf/cdktf-provider-azurerm/blob/main/docs/ApiManagementBackend.typescript.md}
      */
-    createApiManagementBackend(id: string, scope: CommonAzureConstruct, props: ApiManagementBackendProps): ApiManagementBackend;
+    createApiManagementBackend(id: string, scope: CommonAzureConstruct, props: ApiManagementBackendProps): Resource;
     /**
      * @summary Method to create a new api management api
      * @param id scoped id of the resource

package/dist/src/lib/azure/services/api-management/main.js

@@ -7,7 +7,6 @@ exports.AzureApiManagementManager = void 0;
 const data_azurerm_resource_group_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-resource-group");
 const data_azurerm_api_management_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-api-management");
 const api_management_custom_domain_1 = require("@cdktf/provider-azurerm/lib/api-management-custom-domain");
-const api_management_backend_1 = require("@cdktf/provider-azurerm/lib/api-management-backend");
 const api_management_1 = require("@cdktf/provider-azurerm/lib/api-management");
 const api_management_api_1 = require("@cdktf/provider-azurerm/lib/api-management-api");
 const api_management_api_operation_1 = require("@cdktf/provider-azurerm/lib/api-management-api-operation");
@@ -171,11 +170,34 @@ class AzureApiManagementManager {
     createApiManagementBackend(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const apiManagementBackend = new api_management_backend_1.ApiManagementBackend(scope, `${id}-am-be`, {
-            ...props,
+        //    Commenting as circuit breaker config is currently not supported
+        /*
+        const apiManagementBackend = new ApiManagementBackend(scope, `${id}-am-be`, {
+              ...props,
+              name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
+              description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+              protocol: props.protocol ?? 'http',
+            })
+    */
+        const apiManagementBackend = new resource_1.Resource(scope, `${id}-am-be`, {
+            type: 'Microsoft.ApiManagement/service/backends@2024-06-01-preview',
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-            description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
-            protocol: props.protocol ?? 'http',
+            parentId: props.apiManagementId,
+            body: {
+                properties: {
+                    circuitBreaker: props.circuitBreaker,
+                    credentials: props.credentials,
+                    description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+                    url: props.url,
+                    resourceId: props.resourceId,
+                    protocol: props.protocol ?? 'http',
+                },
+            },
+            responseExportValues: ['*'],
+            ignoreMissingProperty: true,
+            ignoreCasing: true,
+            schemaValidationEnabled: false,
+            lifecycle: props.lifecycle,
         });
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name);
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendFriendlyUniqueId`, scope, apiManagementBackend.friendlyUniqueId);

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

@@ -7,6 +7,8 @@ export interface ApiManagementProps extends ApiManagementConfig {
 }
 export interface ApiManagementBackendProps extends ApiManagementBackendConfig {
     backendUrlPath?: string;
+    apiManagementId: string;
+    circuitBreaker: any;
 }
 export interface ApiManagementCustomDomainProps extends ApiManagementCustomDomainConfig {
 }

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

@@ -5,7 +5,6 @@ const data_azurerm_resource_group_1 = require("@cdktf/provider-azurerm/lib/data-
 const linux_function_app_1 = require("@cdktf/provider-azurerm/lib/linux-function-app");
 const function_app_function_1 = require("@cdktf/provider-azurerm/lib/function-app-function");
 const function_app_flex_consumption_1 = require("@cdktf/provider-azurerm/lib/function-app-flex-consumption");
-const cdktf_local_exec_1 = require("cdktf-local-exec");
 const utils_1 = require("../../utils");
 /**
  * @classdesc Provides operations on Azure Functions
@@ -113,29 +112,6 @@ class AzureFunctionManager {
                 environment: scope.props.stage,
             },
         });
-        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: `
-        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/package.json

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

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

@@ -1,5 +1,6 @@
 import { AzurermProvider } from '@cdktf/provider-azurerm/lib/provider'
 import { AzapiProvider } from '../.gen/providers/azapi/provider'
+import { Provider } from 'cdktf-local-exec'
 import { DataAzurermClientConfig } from '@cdktf/provider-azurerm/lib/data-azurerm-client-config'
 import { AzurermBackend, TerraformStack } from 'cdktf'
 import { Construct } from 'constructs'
@@ -72,6 +73,7 @@ export class CommonAzureConstruct extends TerraformStack {
 
     new AzapiProvider(this, `${this.id}-azapi-provider`, this.props)
     new AzurermProvider(this, `${this.id}-provider`, this.props)
+    new Provider(this, `${this.id}-local-exec-provider`)
   }
 
   /**

package/src/lib/azure/services/api-management/main.ts

@@ -208,11 +208,39 @@ export class AzureApiManagementManager {
   public createApiManagementBackend(id: string, scope: CommonAzureConstruct, props: ApiManagementBackendProps) {
     if (!props) throw `Props undefined for ${id}`
 
+    //    Commenting as circuit breaker config is currently not supported
+    /*
     const apiManagementBackend = new ApiManagementBackend(scope, `${id}-am-be`, {
-      ...props,
+          ...props,
+          name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
+          description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+          protocol: props.protocol ?? 'http',
+        })
+*/
+
+    const apiManagementBackend = new Resource(scope, `${id}-am-be`, {
+      type: 'Microsoft.ApiManagement/service/backends@2024-06-01-preview',
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-      description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
-      protocol: props.protocol ?? 'http',
+      parentId: props.apiManagementId,
+
+      body: {
+        properties: {
+          circuitBreaker: props.circuitBreaker,
+          credentials: props.credentials,
+          description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+          url: props.url,
+          resourceId: props.resourceId,
+          protocol: props.protocol ?? 'http',
+        },
+      },
+
+      responseExportValues: ['*'],
+
+      ignoreMissingProperty: true,
+      ignoreCasing: true,
+      schemaValidationEnabled: false,
+
+      lifecycle: props.lifecycle,
     })
 
     createAzureTfOutput(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name)

package/src/lib/azure/services/api-management/types.ts

@@ -8,6 +8,8 @@ export interface ApiManagementProps extends ApiManagementConfig {}
 
 export interface ApiManagementBackendProps extends ApiManagementBackendConfig {
   backendUrlPath?: string
+  apiManagementId: string
+  circuitBreaker: any
 }
 
 export interface ApiManagementCustomDomainProps extends ApiManagementCustomDomainConfig {}

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

@@ -2,7 +2,6 @@ import { DataAzurermResourceGroup } from '@cdktf/provider-azurerm/lib/data-azure
 import { LinuxFunctionApp } from '@cdktf/provider-azurerm/lib/linux-function-app'
 import { FunctionAppFunction } from '@cdktf/provider-azurerm/lib/function-app-function'
 import { FunctionAppFlexConsumption } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption'
-import { LocalExec, Provider } from 'cdktf-local-exec'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
 import { FunctionAppProps, FunctionProps, FunctionAppFlexConsumptionProps } from './types'
@@ -126,30 +125,6 @@ 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: `
-        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
   }
 }