@gradientedge/cdk-utils 9.82.0 → 9.84.0

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

@@ -3,8 +3,8 @@ import { ApiManagementCustomDomain } from '@cdktf/provider-azurerm/lib/api-manag
 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';
+import { ApiManagementBackend } from '@cdktf/provider-azurerm/lib/api-management-backend';
 import { RedisCache } from '@cdktf/provider-azurerm/lib/redis-cache';
-import { Resource } from '../../.gen/providers/azapi/resource';
 import { CommonAzureConstruct } from '../../common';
 import { ApiManagementProps, ApiManagementBackendProps, ApiManagementApiProps, ApiManagementCustomDomainProps } from './types';
 /**
@@ -48,7 +48,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): Resource;
+    createApiManagementBackend(id: string, scope: CommonAzureConstruct, props: ApiManagementBackendProps): ApiManagementBackend;
     /**
      * @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

@@ -12,8 +12,8 @@ const api_management_api_1 = require("@cdktf/provider-azurerm/lib/api-management
 const api_management_api_operation_1 = require("@cdktf/provider-azurerm/lib/api-management-api-operation");
 const api_management_api_operation_policy_1 = require("@cdktf/provider-azurerm/lib/api-management-api-operation-policy");
 const api_management_logger_1 = require("@cdktf/provider-azurerm/lib/api-management-logger");
+const api_management_backend_1 = require("@cdktf/provider-azurerm/lib/api-management-backend");
 const api_management_redis_cache_1 = require("@cdktf/provider-azurerm/lib/api-management-redis-cache");
-const resource_1 = require("../../.gen/providers/azapi/resource");
 const utils_1 = require("../../utils");
 const lodash_1 = __importDefault(require("lodash"));
 /**
@@ -119,34 +119,11 @@ class AzureApiManagementManager {
     createApiManagementBackend(id, scope, props) {
         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,
-              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',
+        const apiManagementBackend = new api_management_backend_1.ApiManagementBackend(scope, `${id}-am-be`, {
+            ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-            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,
+            description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+            protocol: props.protocol ?? 'http',
         });
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name);
         (0, utils_1.createAzureTfOutput)(`${id}-apiManagementBackendFriendlyUniqueId`, scope, apiManagementBackend.friendlyUniqueId);
@@ -215,7 +192,7 @@ class AzureApiManagementManager {
                     cacheSetInboundPolicy = `<choose>
                   <when condition="@((string)context.Variables["bypassCache"] != "true")">
                       <!-- Attempt to retrieve cached response -->
-                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" />
+                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
 
                       <!-- If cache hit, return cached response -->
                       <choose>
@@ -237,13 +214,13 @@ class AzureApiManagementManager {
                       </choose>
                   </when>
                   <when condition="@((string)context.Variables["bypassCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                   </when>
               </choose>`;
                     cacheSetOutboundPolicy = `<!-- Store the response body in cache -->
               <choose>
                   <when condition="@(context.Response.StatusCode == 200)">
-                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" />
+                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <!-- Add cache status header -->
                       <set-header name="X-Apim-Cache-Status" exists-action="override">
                           <value>MISS</value>
@@ -263,7 +240,7 @@ class AzureApiManagementManager {
               <!-- Allow admin to clear specific cache entries -->
               <choose>
                   <when condition="@((string)context.Variables["clearCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <return-response>
                           <set-status code="200" reason="OK" />
                           <set-body>Cache entry removed successfully</set-body>

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

@@ -26,6 +26,7 @@ export interface ApiManagementApiCaching {
     enableCacheSet?: boolean;
     enableCacheInvalidation?: boolean;
     ttlInSecs?: number;
+    cachingType?: string;
 }
 export interface ApiManagementApiRateLimit {
     calls: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.82.0",
+  "version": "9.84.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -54,8 +54,8 @@
     "@aws-sdk/credential-providers": "^3.886.0",
     "@aws-sdk/types": "^3.804.0",
     "@cdktf/provider-aws": "^19.63.0",
-    "@cdktf/provider-azurerm": "^14.12.0",
-    "@cdktf/provider-cloudflare": "^13.4.0",
+    "@cdktf/provider-azurerm": "^14.22.0",
+    "@cdktf/provider-cloudflare": "^13.8.0",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.15.17",
     "@types/uuid": "^10.0.0",
@@ -63,7 +63,7 @@
     "aws-cdk-lib": "^2.195.0",
     "cdktf": "^0.21.0",
     "cdktf-local-exec": "^0.5.71",
-    "constructs": "^10.4.2",
+    "constructs": "^10.4.3",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "nconf": "^0.13.0",

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

@@ -12,9 +12,9 @@ import {
   ApiManagementLogger,
   ApiManagementLoggerApplicationInsights,
 } from '@cdktf/provider-azurerm/lib/api-management-logger'
+import { ApiManagementBackend } from '@cdktf/provider-azurerm/lib/api-management-backend'
 import { ApiManagementRedisCache } from '@cdktf/provider-azurerm/lib/api-management-redis-cache'
 import { RedisCache } from '@cdktf/provider-azurerm/lib/redis-cache'
-import { Resource } from '../../.gen/providers/azapi/resource'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
 import {
@@ -22,7 +22,6 @@ import {
   ApiManagementBackendProps,
   ApiManagementApiProps,
   ApiManagementCustomDomainProps,
-  ApiManagementRedisCacheProps,
 } from './types'
 import _ from 'lodash'
 
@@ -144,39 +143,11 @@ 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,
-          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',
+      ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.apiManagementBackend),
-      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,
+      description: props.description ?? `Backend for ${props.name}-${scope.props.stage}`,
+      protocol: props.protocol ?? 'http',
     })
 
     createAzureTfOutput(`${id}-apiManagementBackendName`, scope, apiManagementBackend.name)
@@ -266,7 +237,7 @@ export class AzureApiManagementManager {
           cacheSetInboundPolicy = `<choose>
                   <when condition="@((string)context.Variables["bypassCache"] != "true")">
                       <!-- Attempt to retrieve cached response -->
-                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" />
+                      <cache-lookup-value key="@((string)context.Variables["customCacheKey"])" variable-name="cachedResponse" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
 
                       <!-- If cache hit, return cached response -->
                       <choose>
@@ -288,13 +259,13 @@ export class AzureApiManagementManager {
                       </choose>
                   </when>
                   <when condition="@((string)context.Variables["bypassCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                   </when>
               </choose>`
           cacheSetOutboundPolicy = `<!-- Store the response body in cache -->
               <choose>
                   <when condition="@(context.Response.StatusCode == 200)">
-                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" />
+                      <cache-store-value key="@((string)context.Variables["customCacheKey"])" value="@(context.Response.Body.As<string>(preserveContent: true))" duration="${operation.caching.ttlInSecs ?? 900}" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <!-- Add cache status header -->
                       <set-header name="X-Apim-Cache-Status" exists-action="override">
                           <value>MISS</value>
@@ -315,7 +286,7 @@ export class AzureApiManagementManager {
               <!-- Allow admin to clear specific cache entries -->
               <choose>
                   <when condition="@((string)context.Variables["clearCache"] == "true")">
-                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" />
+                      <cache-remove-value key="@((string)context.Variables["customCacheKey"])" caching-type="${operation.caching.cachingType || 'prefer-external'}" />
                       <return-response>
                           <set-status code="200" reason="OK" />
                           <set-body>Cache entry removed successfully</set-body>

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

@@ -30,6 +30,7 @@ export interface ApiManagementApiCaching {
   enableCacheSet?: boolean
   enableCacheInvalidation?: boolean
   ttlInSecs?: number
+  cachingType?: string
 }
 
 export interface ApiManagementApiRateLimit {