@gradientedge/cdk-utils 9.50.0 → 9.52.0

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

@@ -43,6 +43,9 @@ class AzureAppConfigurationManager {
             ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.appConfiguration),
             resourceGroupName: resourceGroup.name,
+            identity: {
+                type: 'SystemAssigned',
+            },
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

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

@@ -1,6 +1,6 @@
 import { LinuxFunctionApp } from '@cdktf/provider-azurerm/lib/linux-function-app';
 import { FunctionAppFunction } from '@cdktf/provider-azurerm/lib/function-app-function';
-import { Resource } from '../../.gen/providers/azapi/resource';
+import { FunctionAppFlexConsumption } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption';
 import { CommonAzureConstruct } from '../../common';
 import { FunctionAppProps, FunctionProps, FunctionAppFlexConsumptionProps } from './types';
 /**
@@ -43,5 +43,5 @@ export declare class AzureFunctionManager {
      * @param scope scope in which this resource is defined
      * @param props flex consumption function app properties
      */
-    createFunctionAppFlexConsumption(id: string, scope: CommonAzureConstruct, props: FunctionAppFlexConsumptionProps): Resource;
+    createFunctionAppFlexConsumption(id: string, scope: CommonAzureConstruct, props: FunctionAppFlexConsumptionProps): FunctionAppFlexConsumption;
 }

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

@@ -4,7 +4,7 @@ exports.AzureFunctionManager = void 0;
 const data_azurerm_resource_group_1 = require("@cdktf/provider-azurerm/lib/data-azurerm-resource-group");
 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 resource_1 = require("../../.gen/providers/azapi/resource");
+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");
 /**
@@ -91,62 +91,27 @@ class AzureFunctionManager {
         });
         if (!resourceGroup)
             throw `Resource group undefined for ${id}`;
-        const functionApp = new resource_1.Resource(scope, `${id}-fa`, {
-            type: 'Microsoft.Web/sites@2024-04-01',
+        const functionApp = new function_app_flex_consumption_1.FunctionAppFlexConsumption(scope, `${id}-fc`, {
+            ...props,
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
             location: resourceGroup.location,
-            parentId: resourceGroup.id,
-            body: {
-                kind: props.kind ?? 'functionapp,linux',
-                properties: {
-                    serverFarmId: props.appServicePlanId,
-                    httpsOnly: props.httpsOnly ?? true,
-                    functionAppConfig: {
-                        deployment: {
-                            storage: {
-                                type: props.deploymentStorageType ?? 'blobContainer',
-                                value: `${props.blobEndpoint}${props.containerName}`,
-                                authentication: {
-                                    type: props.deploymentAuthenticationType ?? 'StorageAccountConnectionString',
-                                    storageAccountConnectionStringName: props.storageAccountConnectionStringName ?? 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                                },
-                            },
-                        },
-                        runtime: {
-                            name: props.runtime ?? 'node',
-                            version: props.runtimeVersion ?? '20',
-                        },
-                        scaleAndConcurrency: {
-                            alwaysReady: props.alwaysReady,
-                            instanceMemoryMB: props.instanceMemory ?? 2048,
-                            maximumInstanceCount: props.maximumInstanceCount ?? 40,
-                            triggers: {},
-                        },
-                    },
-                    siteConfig: {
-                        appSettings: props.appSettings.concat([
-                            {
-                                name: 'FUNCTIONS_EXTENSION_VERSION',
-                                value: '~4',
-                            },
-                            {
-                                name: 'AzureWebJobsStorage',
-                                value: props.storageConnectionString,
-                            },
-                            {
-                                name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                                value: props.storageConnectionString,
-                            },
-                        ]),
-                        connectionStrings: props.connectionStrings,
-                        minTlsVersion: props.minTlsVersion ?? '1.3',
-                    },
-                },
+            resourceGroupName: resourceGroup.name,
+            runtimeName: props.runtimeName ?? 'node',
+            runtimeVersion: props.runtimeVersion ?? '20',
+            storageAuthenticationType: props.storageAuthenticationType ?? 'StorageAccountConnectionString',
+            storageContainerType: props.storageContainerType ?? 'blobContainer',
+            maximumInstanceCount: props.maximumInstanceCount ?? 40,
+            instanceMemoryInMb: props.instanceMemoryInMb ?? 2048,
+            siteConfig: {
+                http2Enabled: props.siteConfig.http2Enabled ?? true,
+                ...props.siteConfig,
+            },
+            identity: props.identity ?? {
+                type: 'SystemAssigned',
+            },
+            tags: props.tags ?? {
+                environment: scope.props.stage,
             },
-            identity: [{ type: 'SystemAssigned' }],
-            ignoreMissingProperty: true,
-            ignoreCasing: true,
-            schemaValidationEnabled: false,
         });
         new cdktf_local_exec_1.Provider(scope, `${id}-local-exec-provider`);
         new cdktf_local_exec_1.LocalExec(scope, `${id}-function-app-deploy`, {

package/dist/src/lib/azure/services/function/types.d.ts

@@ -1,29 +1,11 @@
 import { LinuxFunctionAppConfig } from '@cdktf/provider-azurerm/lib/linux-function-app';
 import { FunctionAppFunctionConfig } from '@cdktf/provider-azurerm/lib/function-app-function';
+import { FunctionAppFlexConsumptionConfig } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption';
 export interface FunctionAppProps extends LinuxFunctionAppConfig {
 }
 export interface FunctionProps extends FunctionAppFunctionConfig {
 }
-export interface FunctionAppFlexConsumptionProps {
-    alwaysReady?: any;
-    appServicePlanId: string;
-    appSettings: any;
-    blobEndpoint: string;
-    connectionStrings: any;
-    containerName: string;
-    deploymentAuthenticationType?: string;
-    deploymentStorageType?: string;
-    deploySource: string;
-    httpsOnly?: string;
-    instanceMemory?: number;
-    kind?: string;
-    maximumInstanceCount?: number;
-    name: string;
-    resourceGroupName: string;
-    runtime?: string;
-    runtimeVersion?: string;
-    storageAccountConnectionStringName?: string;
-    storageConnectionString: string;
+export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
     sourceCodeHash: string;
-    minTlsVersion?: string;
+    deploySource: string;
 }

package/dist/src/lib/azure/services/log-analytics-workspace/main.js

@@ -44,6 +44,8 @@ class AzureLogAnalyticsWorkspaceManager {
             name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.logAnalyticsWorkspace),
             location: resourceGroup.location,
             resourceGroupName: resourceGroup.name,
+            sku: props.sku ?? 'PerGB2018',
+            retentionInDays: props.retentionInDays ?? 30,
             tags: props.tags ?? {
                 environment: scope.props.stage,
             },

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.50.0",
+  "version": "9.52.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

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

@@ -44,6 +44,9 @@ export class AzureAppConfigurationManager {
       ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.appConfiguration),
       resourceGroupName: resourceGroup.name,
+      identity: {
+        type: 'SystemAssigned',
+      },
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

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

@@ -1,7 +1,7 @@
 import { DataAzurermResourceGroup } from '@cdktf/provider-azurerm/lib/data-azurerm-resource-group'
 import { LinuxFunctionApp } from '@cdktf/provider-azurerm/lib/linux-function-app'
 import { FunctionAppFunction } from '@cdktf/provider-azurerm/lib/function-app-function'
-import { Resource } from '../../.gen/providers/azapi/resource'
+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'
@@ -103,69 +103,27 @@ export class AzureFunctionManager {
 
     if (!resourceGroup) throw `Resource group undefined for ${id}`
 
-    const functionApp = new Resource(scope, `${id}-fa`, {
-      type: 'Microsoft.Web/sites@2024-04-01',
+    const functionApp = new FunctionAppFlexConsumption(scope, `${id}-fc`, {
+      ...props,
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.functionApp),
       location: resourceGroup.location,
-      parentId: resourceGroup.id,
-
-      body: {
-        kind: props.kind ?? 'functionapp,linux',
-
-        properties: {
-          serverFarmId: props.appServicePlanId,
-          httpsOnly: props.httpsOnly ?? true,
-
-          functionAppConfig: {
-            deployment: {
-              storage: {
-                type: props.deploymentStorageType ?? 'blobContainer',
-                value: `${props.blobEndpoint}${props.containerName}`,
-                authentication: {
-                  type: props.deploymentAuthenticationType ?? 'StorageAccountConnectionString',
-                  storageAccountConnectionStringName:
-                    props.storageAccountConnectionStringName ?? 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                },
-              },
-            },
-            runtime: {
-              name: props.runtime ?? 'node',
-              version: props.runtimeVersion ?? '20',
-            },
-            scaleAndConcurrency: {
-              alwaysReady: props.alwaysReady,
-              instanceMemoryMB: props.instanceMemory ?? 2048,
-              maximumInstanceCount: props.maximumInstanceCount ?? 40,
-              triggers: {},
-            },
-          },
-
-          siteConfig: {
-            appSettings: props.appSettings.concat([
-              {
-                name: 'FUNCTIONS_EXTENSION_VERSION',
-                value: '~4',
-              },
-              {
-                name: 'AzureWebJobsStorage',
-                value: props.storageConnectionString,
-              },
-              {
-                name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
-                value: props.storageConnectionString,
-              },
-            ]),
-            connectionStrings: props.connectionStrings,
-            minTlsVersion: props.minTlsVersion ?? '1.3',
-          },
-        },
+      resourceGroupName: resourceGroup.name,
+      runtimeName: props.runtimeName ?? 'node',
+      runtimeVersion: props.runtimeVersion ?? '20',
+      storageAuthenticationType: props.storageAuthenticationType ?? 'StorageAccountConnectionString',
+      storageContainerType: props.storageContainerType ?? 'blobContainer',
+      maximumInstanceCount: props.maximumInstanceCount ?? 40,
+      instanceMemoryInMb: props.instanceMemoryInMb ?? 2048,
+      siteConfig: {
+        http2Enabled: props.siteConfig.http2Enabled ?? true,
+        ...props.siteConfig,
+      },
+      identity: props.identity ?? {
+        type: 'SystemAssigned',
+      },
+      tags: props.tags ?? {
+        environment: scope.props.stage,
       },
-
-      identity: [{ type: 'SystemAssigned' }],
-
-      ignoreMissingProperty: true,
-      ignoreCasing: true,
-      schemaValidationEnabled: false,
     })
 
     new Provider(scope, `${id}-local-exec-provider`)

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

@@ -1,31 +1,12 @@
 import { LinuxFunctionAppConfig } from '@cdktf/provider-azurerm/lib/linux-function-app'
 import { FunctionAppFunctionConfig } from '@cdktf/provider-azurerm/lib/function-app-function'
-import { ResourceConfig } from '../../.gen/providers/azapi/resource'
+import { FunctionAppFlexConsumptionConfig } from '@cdktf/provider-azurerm/lib/function-app-flex-consumption'
 
 export interface FunctionAppProps extends LinuxFunctionAppConfig {}
 
 export interface FunctionProps extends FunctionAppFunctionConfig {}
 
-export interface FunctionAppFlexConsumptionProps {
-  alwaysReady?: any
-  appServicePlanId: string
-  appSettings: any
-  blobEndpoint: string
-  connectionStrings: any
-  containerName: string
-  deploymentAuthenticationType?: string
-  deploymentStorageType?: string
-  deploySource: string
-  httpsOnly?: string
-  instanceMemory?: number
-  kind?: string
-  maximumInstanceCount?: number
-  name: string
-  resourceGroupName: string
-  runtime?: string
-  runtimeVersion?: string
-  storageAccountConnectionStringName?: string
-  storageConnectionString: string
+export interface FunctionAppFlexConsumptionProps extends FunctionAppFlexConsumptionConfig {
   sourceCodeHash: string
-  minTlsVersion?: string
+  deploySource: string
 }

package/src/lib/azure/services/log-analytics-workspace/main.ts

@@ -45,6 +45,8 @@ export class AzureLogAnalyticsWorkspaceManager {
       name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.logAnalyticsWorkspace),
       location: resourceGroup.location,
       resourceGroupName: resourceGroup.name,
+      sku: props.sku ?? 'PerGB2018',
+      retentionInDays: props.retentionInDays ?? 30,
       tags: props.tags ?? {
         environment: scope.props.stage,
       },

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
    */