@gradientedge/cdk-utils 9.52.2 → 9.53.0

package/dist/src/lib/cloudflare/services/worker/main.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflareWorkerManager = void 0;
-const worker_domain_1 = require("@cdktf/provider-cloudflare/lib/worker-domain");
-const worker_route_1 = require("@cdktf/provider-cloudflare/lib/worker-route");
-const worker_script_1 = require("@cdktf/provider-cloudflare/lib/worker-script");
+const workers_custom_domain_1 = require("@cdktf/provider-cloudflare/lib/workers-custom-domain");
+const workers_route_1 = require("@cdktf/provider-cloudflare/lib/workers-route");
+const workers_script_1 = require("@cdktf/provider-cloudflare/lib/workers-script");
 const utils_1 = require("../../utils");
 const workers_kv_namespace_1 = require("@cdktf/provider-cloudflare/lib/workers-kv-namespace");
 const workers_kv_1 = require("@cdktf/provider-cloudflare/lib/workers-kv");
-const worker_cron_trigger_1 = require("@cdktf/provider-cloudflare/lib/worker-cron-trigger");
+const workers_cron_trigger_1 = require("@cdktf/provider-cloudflare/lib/workers-cron-trigger");
 /**
  * @classdesc Provides operations on Cloudflare Worker
  * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
@@ -31,15 +31,17 @@ class CloudflareWorkerManager {
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props worker domain properties
-     * @see [CDKTF Worker Domain Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workerDomain.typescript.md}
+     * @see [CDKTF Worker Domain Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersCustomDomain.typescript.md}
      */
     createWorkerDomain(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
         const zoneId = props.zoneId
             ? props.zoneId
-            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const workerDomain = new worker_domain_1.WorkerDomain(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { account: { name: scope.props.domainName } },
+            })?.id;
+        const workerDomain = new workers_custom_domain_1.WorkersCustomDomain(scope, `${id}`, {
             ...props,
             accountId: props.accountId ?? scope.props.accountId,
             zoneId,
@@ -53,17 +55,19 @@ class CloudflareWorkerManager {
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props worker route properties
-     * @see [CDKTF Worker Route Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workerRoute.typescript.md}
+     * @see [CDKTF Worker Route Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersRoute.typescript.md}
      */
     createWorkerRoute(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
         const zoneId = props.zoneId
             ? props.zoneId
-            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const workerRoute = new worker_route_1.WorkerRoute(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { account: { name: scope.props.domainName } },
+            })?.id;
+        const workerRoute = new workers_route_1.WorkersRoute(scope, `${id}`, {
             ...props,
-            scriptName: `${props.scriptName}-${scope.props.stage}`,
+            script: `${props.script}-${scope.props.stage}`,
             zoneId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-workerRouteFriendlyUniqueId`, scope, workerRoute.friendlyUniqueId);
@@ -75,15 +79,15 @@ class CloudflareWorkerManager {
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props worker script properties
-     * @see [CDKTF Worker Script Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workerScript.typescript.md}
+     * @see [CDKTF Worker Script Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersScript.typescript.md}
      */
     createWorkerScript(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const workerScript = new worker_script_1.WorkerScript(scope, `${id}`, {
+        const workerScript = new workers_script_1.WorkersScript(scope, `${id}`, {
             ...props,
             accountId: props.accountId ?? scope.props.accountId,
-            name: `${props.name}-${scope.props.stage}`,
+            scriptName: `${props.scriptName}-${scope.props.stage}`,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-workerScriptFriendlyUniqueId`, scope, workerScript.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-workerScriptId`, scope, workerScript.id);
@@ -131,12 +135,12 @@ class CloudflareWorkerManager {
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props workers cron trigger properties
-     * @see [CDKTF Workers Cron Trigger Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workerCronTrigger.typescript.md}
+     * @see [CDKTF Workers Cron Trigger Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersCronTrigger.typescript.md}
      */
     createWorkerCronTrigger(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const workerCronTrigger = new worker_cron_trigger_1.WorkerCronTrigger(scope, `${id}`, {
+        const workerCronTrigger = new workers_cron_trigger_1.WorkersCronTrigger(scope, `${id}`, {
             ...props,
             accountId: props.accountId ?? scope.props.accountId,
         });

package/dist/src/lib/cloudflare/services/worker/types.d.ts

@@ -1,18 +1,18 @@
-import { WorkerCronTriggerConfig } from '@cdktf/provider-cloudflare/lib/worker-cron-trigger';
-import { WorkerDomainConfig } from '@cdktf/provider-cloudflare/lib/worker-domain';
-import { WorkerRouteConfig } from '@cdktf/provider-cloudflare/lib/worker-route';
-import { WorkerScriptConfig } from '@cdktf/provider-cloudflare/lib/worker-script';
+import { WorkersCronTriggerConfig } from '@cdktf/provider-cloudflare/lib/workers-cron-trigger';
+import { WorkersCustomDomainConfig } from '@cdktf/provider-cloudflare/lib/workers-custom-domain';
+import { WorkersRouteConfig } from '@cdktf/provider-cloudflare/lib/workers-route';
+import { WorkersScriptConfig } from '@cdktf/provider-cloudflare/lib/workers-script';
 import { WorkersKvConfig } from '@cdktf/provider-cloudflare/lib/workers-kv';
 import { WorkersKvNamespaceConfig } from '@cdktf/provider-cloudflare/lib/workers-kv-namespace';
-export interface WorkerDomainProps extends WorkerDomainConfig {
+export interface WorkerDomainProps extends WorkersCustomDomainConfig {
 }
-export interface WorkerRouteProps extends WorkerRouteConfig {
+export interface WorkerRouteProps extends WorkersRouteConfig {
 }
-export interface WorkerScriptProps extends WorkerScriptConfig {
+export interface WorkerScriptProps extends WorkersScriptConfig {
 }
 export interface WorkersKvNamespaceProps extends WorkersKvNamespaceConfig {
 }
 export interface WorkersKvProps extends WorkersKvConfig {
 }
-export interface WorkerCronTriggerProps extends WorkerCronTriggerConfig {
+export interface WorkerCronTriggerProps extends WorkersCronTriggerConfig {
 }

package/dist/src/lib/cloudflare/services/zone/main.d.ts

@@ -5,9 +5,10 @@ import { ZoneCacheVariants } from '@cdktf/provider-cloudflare/lib/zone-cache-var
 import { ZoneDnssec } from '@cdktf/provider-cloudflare/lib/zone-dnssec';
 import { ZoneHold } from '@cdktf/provider-cloudflare/lib/zone-hold';
 import { ZoneLockdown } from '@cdktf/provider-cloudflare/lib/zone-lockdown';
-import { ZoneSettingsOverride } from '@cdktf/provider-cloudflare/lib/zone-settings-override';
+import { ZoneSetting } from '@cdktf/provider-cloudflare/lib/zone-setting';
+import { ZoneDnsSettings } from '@cdktf/provider-cloudflare/lib/zone-dns-settings';
 import { CommonCloudflareConstruct } from '../../common';
-import { ZoneCacheReserveProps, ZoneCacheVariantsProps, ZoneDnssecProps, ZoneHoldProps, ZoneLockdownProps, ZoneOptions, ZoneProps, ZoneSettingsOverrideProps } from './types';
+import { ZoneCacheReserveProps, ZoneCacheVariantsProps, ZoneDnssecProps, ZoneHoldProps, ZoneLockdownProps, ZoneOptions, ZoneProps, ZoneSettingProps } from './types';
 /**
  * @classdesc Provides operations on Cloudflare Zone
  * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
@@ -76,11 +77,19 @@ export declare class CloudflareZoneManager {
      */
     createZoneLockdown(id: string, scope: CommonCloudflareConstruct, props: ZoneLockdownProps): ZoneLockdown;
     /**
-     * @summary Method to create a new zone settings override
+     * @summary Method to create new zone dns settings
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
-     * @param props zone settings override properties
-     * @see [CDKTF Zone Settings Override Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneSettingsOverride.typescript.md}
+     * @param props zone dns settings properties
+     * @see [CDKTF Zone Dns Settings Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/dnsZoneSettings.typescript.md}
      */
-    createZoneSettingsOverride(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingsOverrideProps): ZoneSettingsOverride;
+    createZoneDnsSettings(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps): ZoneDnsSettings;
+    /**
+     * @summary Method to create a new zone setting
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param props zone setting properties
+     * @see [CDKTF Zone Setting Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneSetting.typescript.md}
+     */
+    createZoneSetting(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps): ZoneSetting;
 }

package/dist/src/lib/cloudflare/services/zone/main.js

@@ -8,7 +8,8 @@ const zone_cache_variants_1 = require("@cdktf/provider-cloudflare/lib/zone-cache
 const zone_dnssec_1 = require("@cdktf/provider-cloudflare/lib/zone-dnssec");
 const zone_hold_1 = require("@cdktf/provider-cloudflare/lib/zone-hold");
 const zone_lockdown_1 = require("@cdktf/provider-cloudflare/lib/zone-lockdown");
-const zone_settings_override_1 = require("@cdktf/provider-cloudflare/lib/zone-settings-override");
+const zone_setting_1 = require("@cdktf/provider-cloudflare/lib/zone-setting");
+const zone_dns_settings_1 = require("@cdktf/provider-cloudflare/lib/zone-dns-settings");
 const utils_1 = require("../../utils");
 /**
  * @classdesc Provides operations on Cloudflare Zone
@@ -40,19 +41,24 @@ class CloudflareZoneManager {
             throw `Props undefined for ${id}`;
         const zone = new zone_1.Zone(scope, `${id}`, {
             ...props,
-            accountId: props.accountId ?? scope.props.accountId,
-            zone: props.zone ?? scope.props.domainName,
+            account: {
+                id: props.account.id ?? scope.props.accountId,
+            },
+            name: props.name ?? scope.props.domainName,
         });
-        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneName`, scope, zone.zone);
+        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneName`, scope, zone.name);
         (0, utils_1.createCloudflareTfOutput)(`${id}-zoneFriendlyUniqueId`, scope, zone.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-zoneId`, scope, zone.id);
         return zone;
     }
     resolveZone(id, scope, options) {
         const zone = new data_cloudflare_zone_1.DataCloudflareZone(scope, `${id}-data-zone`, {
-            accountId: scope.props.accountId,
-            name: options?.name ?? scope.props.domainName,
-            zoneId: options?.id,
+            filter: {
+                account: {
+                    name: options?.name ?? scope.props.domainName,
+                },
+            },
+            zoneId: options?.zoneId,
         });
         return zone;
     }
@@ -162,25 +168,45 @@ class CloudflareZoneManager {
         return zoneLockdown;
     }
     /**
-     * @summary Method to create a new zone settings override
+     * @summary Method to create new zone dns settings
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
-     * @param props zone settings override properties
-     * @see [CDKTF Zone Settings Override Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneSettingsOverride.typescript.md}
+     * @param props zone dns settings properties
+     * @see [CDKTF Zone Dns Settings Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/dnsZoneSettings.typescript.md}
      */
-    createZoneSettingsOverride(id, scope, props) {
+    createZoneDnsSettings(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
         const zoneId = props.zoneId
             ? props.zoneId
             : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const zoneSettingsOverride = new zone_settings_override_1.ZoneSettingsOverride(scope, `${id}`, {
+        const zoneDnsSettings = new zone_dns_settings_1.ZoneDnsSettings(scope, `${id}`, {
             ...props,
             zoneId,
         });
-        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneSettingsOverrideFriendlyUniqueId`, scope, zoneSettingsOverride.friendlyUniqueId);
-        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneSettingsOverrideId`, scope, zoneSettingsOverride.id);
-        return zoneSettingsOverride;
+        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneDnsSettingsFriendlyUniqueId`, scope, zoneDnsSettings.friendlyUniqueId);
+        return zoneDnsSettings;
+    }
+    /**
+     * @summary Method to create a new zone setting
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param props zone setting properties
+     * @see [CDKTF Zone Setting Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneSetting.typescript.md}
+     */
+    createZoneSetting(id, scope, props) {
+        if (!props)
+            throw `Props undefined for ${id}`;
+        const zoneId = props.zoneId
+            ? props.zoneId
+            : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
+        const zoneSetting = new zone_setting_1.ZoneSetting(scope, `${id}`, {
+            ...props,
+            zoneId,
+        });
+        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneSettingFriendlyUniqueId`, scope, zoneSetting.friendlyUniqueId);
+        (0, utils_1.createCloudflareTfOutput)(`${id}-zoneSettingId`, scope, zoneSetting.id);
+        return zoneSetting;
     }
 }
 exports.CloudflareZoneManager = CloudflareZoneManager;

package/dist/src/lib/cloudflare/services/zone/types.d.ts

@@ -4,10 +4,12 @@ import { ZoneCacheVariantsConfig } from '@cdktf/provider-cloudflare/lib/zone-cac
 import { ZoneDnssecConfig } from '@cdktf/provider-cloudflare/lib/zone-dnssec';
 import { ZoneHoldConfig } from '@cdktf/provider-cloudflare/lib/zone-hold';
 import { ZoneLockdownConfig } from '@cdktf/provider-cloudflare/lib/zone-lockdown';
-import { ZoneSettingsOverrideConfig } from '@cdktf/provider-cloudflare/lib/zone-settings-override';
+import { ZoneSettingConfig } from '@cdktf/provider-cloudflare/lib/zone-setting';
+import { ZoneDnsSettingsConfig } from '@cdktf/provider-cloudflare/lib/zone-dns-settings';
+import { DataCloudflareZoneConfig } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone';
 export interface ZoneProps extends ZoneConfig {
 }
-export interface ZoneOptions {
+export interface ZoneOptions extends DataCloudflareZoneConfig {
     id?: string;
     name?: string;
 }
@@ -21,5 +23,7 @@ export interface ZoneHoldProps extends ZoneHoldConfig {
 }
 export interface ZoneLockdownProps extends ZoneLockdownConfig {
 }
-export interface ZoneSettingsOverrideProps extends ZoneSettingsOverrideConfig {
+export interface ZoneSettingProps extends ZoneSettingConfig {
+}
+export interface ZoneDnsSettingsProps extends ZoneDnsSettingsConfig {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.52.2",
+  "version": "9.53.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -55,7 +55,7 @@
     "@aws-sdk/types": "^3.775.0",
     "@cdktf/provider-aws": "^19.58.0",
     "@cdktf/provider-azurerm": "^13.23.0",
-    "@cdktf/provider-cloudflare": "^11.29.0",
+    "@cdktf/provider-cloudflare": "^12.3.0",
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.13.13",
     "@types/uuid": "^10.0.0",

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

@@ -7,6 +7,7 @@ import { StorageContainer } from '@cdktf/provider-azurerm/lib/storage-container'
 import { CommonAzureConstruct } from '../../common'
 import { createAzureTfOutput } from '../../utils'
 import { StorageAccountProps, StorageBlobProps, StorageContainerProps } from './types'
+import { DataAzurermStorageAccountBlobContainerSas } from '@cdktf/provider-azurerm/lib/data-azurerm-storage-account-blob-container-sas'
 
 /**
  * @classdesc Provides operations on Azure Storage
@@ -129,4 +130,59 @@ export class AzureStorageManager {
 
     return storageBlob
   }
+
+  /**
+   * @summary Generates a container-level SAS token for an existing Azure Storage container.
+   *
+   * @description
+   * This method creates a `DataAzurermStorageAccountBlobContainerSas` resource, allowing secure access
+   * to a container via a generated Shared Access Signature (SAS) token.
+   *
+   * @param id - Unique scoped identifier for the SAS token resource
+   * @param scope - CDKTF construct scope in which the resource will be created
+   * @param props - Container details and SAS options:
+   *   - storageAccountName: The name of the existing Azure Storage Account
+   *   - storageContainerName: The name of the container within the storage account
+   *   - resourceGroupName: The name of the resource group containing the storage account
+   *   - sasExpiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date if not provided.
+   *
+   * @returns A `DataAzurermStorageAccountBlobContainerSas` instance with the generated SAS token
+   *
+   * @see https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/storage_account_blob_container_sas
+   */
+  public generateContainerSasToken(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: {
+      storageAccountName: string
+      storageContainerName: string
+      resourceGroupName: string
+      sasExpiry?: string
+    }
+  ): DataAzurermStorageAccountBlobContainerSas {
+    const storageAccountLookup = new DataAzurermStorageAccount(scope, `${id}-lookup-sa`, {
+      name: props.storageAccountName,
+      resourceGroupName: props.resourceGroupName,
+    })
+
+    const containerSas = new DataAzurermStorageAccountBlobContainerSas(scope, `${id}-sas`, {
+      connectionString: storageAccountLookup.primaryConnectionString,
+      containerName: props.storageContainerName,
+      httpsOnly: true,
+      start: new Date().toISOString().split('T')[0],
+      expiry: props.sasExpiry ?? new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+      permissions: {
+        read: true,
+        add: false,
+        create: false,
+        delete: false,
+        list: false,
+        write: false,
+      },
+    })
+
+    createAzureTfOutput(`${id}-sas-token`, scope, containerSas.sas, 'output', true)
+
+    return containerSas
+  }
 }

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

@@ -7,4 +7,10 @@ export interface StorageAccountProps extends StorageAccountConfig {}
 
 export interface StorageContainerProps extends BaseAzureConfigProps, StorageContainerConfig {}
 
-export interface StorageBlobProps extends BaseAzureConfigProps, StorageBlobConfig {}
+export interface StorageBlobProps extends BaseAzureConfigProps, StorageBlobConfig {
+  /**
+   * Optional ISO date string representing the expiry date for the SAS token.
+   * Format: 'YYYY-MM-DD' (e.g., '2025-05-01')
+   */
+  sasExpiry?: string
+}

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

@@ -4,8 +4,12 @@ import { DataAzurermKeyVault } from '@cdktf/provider-azurerm/lib/data-azurerm-ke
 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'
-import { Record } from '@cdktf/provider-cloudflare/lib/record'
+import {
+  PagesProject,
+  PagesProjectDeploymentConfigsPreviewEnvVars,
+  PagesProjectDeploymentConfigsProductionEnvVars,
+} from '@cdktf/provider-cloudflare/lib/pages-project'
+import { DnsRecord } from '@cdktf/provider-cloudflare/lib/dns-record'
 import { Zone } from '@cdktf/provider-cloudflare/lib/zone'
 import { Fn } from 'cdktf'
 import { Construct } from 'constructs'
@@ -31,14 +35,14 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
   declare props: CloudflarePagesStaticSiteProps
 
   /* static site resources */
-  sitePagesCnameRecord: Record
+  sitePagesCnameRecord: DnsRecord
   sitePagesDomain: PagesDomain
   sitePagesProject: PagesProject
   siteZone: DataCloudflareZone | Zone
-  sitePagesEnvironmentVariables: { [key: string]: string }
-  sitePagesPreviewEnvironmentVariables: { [key: string]: string }
-  sitePagesSecrets: { [key: string]: string }
-  sitePagesPreviewSecrets: { [key: string]: string }
+  sitePagesEnvironmentVariables: { [key: string]: PagesProjectDeploymentConfigsProductionEnvVars }
+  sitePagesPreviewEnvironmentVariables: { [key: string]: PagesProjectDeploymentConfigsPreviewEnvVars }
+  sitePagesSecrets: { [key: string]: PagesProjectDeploymentConfigsProductionEnvVars }
+  sitePagesPreviewSecrets: { [key: string]: PagesProjectDeploymentConfigsPreviewEnvVars }
   siteDeploymentDependsOn: any
 
   constructor(parent: Construct, id: string, props: CloudflarePagesStaticSiteProps) {
@@ -79,10 +83,10 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
       ...this.props.sitePagesProject,
       deploymentConfigs: {
         preview: {
-          secrets: this.sitePagesPreviewSecrets,
+          envVars: this.sitePagesPreviewSecrets,
         },
         production: {
-          secrets: this.sitePagesSecrets,
+          envVars: this.sitePagesSecrets,
         },
       },
     }
@@ -96,10 +100,10 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
       ...this.props.sitePagesProject,
       deploymentConfigs: {
         preview: {
-          environmentVariables: this.sitePagesPreviewEnvironmentVariables,
+          envVars: this.sitePagesPreviewEnvironmentVariables,
         },
         production: {
-          environmentVariables: this.sitePagesEnvironmentVariables,
+          envVars: this.sitePagesEnvironmentVariables,
         },
       },
     }
@@ -170,7 +174,7 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
   protected createDomain() {
     this.sitePagesDomain = this.pageManager.createPagesDomain(`${this.id}-site-domain`, this, {
       accountId: this.props.accountId,
-      domain: `${this.props.siteSubDomain}.${this.props.domainName}`,
+      name: `${this.props.siteSubDomain}.${this.props.domainName}`,
       projectName: this.sitePagesProject.name,
     })
   }
@@ -182,7 +186,10 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
     this.sitePagesCnameRecord = this.recordManager.createRecord(`${this.id}-site-record`, this, {
       ...this.props.siteCnameRecord,
       name: this.props.siteSubDomain,
-      value: `${this.sitePagesProject.name}.pages.dev`,
+      data: {
+        ...this.props.siteCnameRecord.data,
+        value: `${this.sitePagesProject.name}.pages.dev`,
+      },
     })
   }
 

package/src/lib/cloudflare/construct/pages-static-site/types.ts

@@ -1,10 +1,10 @@
 import { CommonCloudflareStackProps } from '../../common'
-import { PagesProjectProps, RecordProps, ZoneProps } from '../../services'
+import { PagesProjectProps, DnsRecordProps, ZoneProps } from '../../services'
 
 export interface CloudflarePagesStaticSiteProps extends CommonCloudflareStackProps {
   siteAssetDir: string
   siteBranch?: string
-  siteCnameRecord: RecordProps
+  siteCnameRecord: DnsRecordProps
   siteDeployMessage: string
   sitePagesProject: PagesProjectProps
   siteSubDomain: string

package/src/lib/cloudflare/construct/worker-site/main.ts

@@ -3,11 +3,7 @@ import { DataAwsSecretsmanagerSecretVersion } from '@cdktf/provider-aws/lib/data
 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 {
-  WorkerScript,
-  WorkerScriptPlainTextBinding,
-  WorkerScriptSecretTextBinding,
-} from '@cdktf/provider-cloudflare/lib/worker-script'
+import { WorkersScript, WorkersScriptBindings } from '@cdktf/provider-cloudflare/lib/workers-script'
 import { Zone } from '@cdktf/provider-cloudflare/lib/zone'
 import { Fn, TerraformAsset, AssetType } from 'cdktf'
 import { Construct } from 'constructs'
@@ -34,9 +30,9 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
 
   /* worker site resources */
   siteZone: DataCloudflareZone | Zone
-  siteWorkerScript: WorkerScript
-  workerPlainTextBindingEnvironmentVariables: WorkerScriptPlainTextBinding[]
-  workerSecretTextBindingEnvironmentVariables: WorkerScriptSecretTextBinding[]
+  siteWorkerScript: WorkersScript
+  workerPlainTextBindingEnvironmentVariables: WorkersScriptBindings[] = []
+  workerSecretTextBindingEnvironmentVariables: WorkersScriptBindings[] = []
 
   constructor(parent: Construct, id: string, props: CloudflareWorkerSiteProps) {
     super(parent, id, props)
@@ -53,7 +49,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     this.createWorker()
     this.createWorkerDomain()
     this.createRuleset()
-    this.createZoneSettingsOverride()
+    this.createZoneSetting()
   }
 
   /**
@@ -73,8 +69,9 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
   protected resolveEnvironmentVariables() {
     this.props.siteWorkerScript = {
       ...this.props.siteWorkerScript,
-      plainTextBinding: this.workerPlainTextBindingEnvironmentVariables,
-      secretTextBinding: this.workerSecretTextBindingEnvironmentVariables,
+      bindings: this.workerPlainTextBindingEnvironmentVariables.concat(
+        this.workerSecretTextBindingEnvironmentVariables
+      ),
     }
   }
 
@@ -100,7 +97,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
       ...this.props.siteWorkerDomain,
       hostname: `${this.props.siteSubDomain}.${this.props.domainName}`,
-      service: this.siteWorkerScript.name,
+      service: this.siteWorkerScript.scriptName,
     })
   }
 
@@ -168,12 +165,8 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
   /**
    * @summary Create zone settings override
    */
-  protected createZoneSettingsOverride() {
-    if (!this.props.siteZoneSettingsOverride) return
-    this.zoneManager.createZoneSettingsOverride(
-      `${this.id}-zone-settings-override`,
-      this,
-      this.props.siteZoneSettingsOverride
-    )
+  protected createZoneSetting() {
+    if (!this.props.siteZoneSetting) return
+    this.zoneManager.createZoneSetting(`${this.id}-zone-setting`, this, this.props.siteZoneSetting)
   }
 }

package/src/lib/cloudflare/construct/worker-site/types.ts

@@ -1,11 +1,5 @@
 import { CommonCloudflareStackProps } from '../../common'
-import {
-  WorkerDomainProps,
-  WorkerScriptProps,
-  RulesetProps,
-  ZoneProps,
-  ZoneSettingsOverrideProps,
-} from '../../services'
+import { WorkerDomainProps, WorkerScriptProps, RulesetProps, ZoneProps, ZoneSettingProps } from '../../services'
 
 export interface CloudflareWorkerSiteProps extends CommonCloudflareStackProps {
   siteSubDomain: string
@@ -14,5 +8,5 @@ export interface CloudflareWorkerSiteProps extends CommonCloudflareStackProps {
   siteWorkerDomain: WorkerDomainProps
   siteWorkerAsset: string
   siteRuleSet: RulesetProps
-  siteZoneSettingsOverride: ZoneSettingsOverrideProps
+  siteZoneSetting: ZoneSettingProps
 }