@gradientedge/cdk-utils 9.52.3 → 9.53.0

package/src/lib/cloudflare/services/record/main.ts

@@ -1,7 +1,7 @@
-import { Record } from '@cdktf/provider-cloudflare/lib/record'
+import { DnsRecord } from '@cdktf/provider-cloudflare/lib/dns-record'
 import { CommonCloudflareConstruct } from '../../common'
 import { createCloudflareTfOutput } from '../../utils'
-import { RecordProps } from './types'
+import { DnsRecordProps } from './types'
 
 /**
  * @classdesc Provides operations on Cloudflare Records
@@ -26,16 +26,16 @@ export class CloudflareRecordManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props record properties
-   * @see [CDKTF Record Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/record.typescript.md}
+   * @see [CDKTF Record Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/dnsRecord.typescript.md}
    */
-  public createRecord(id: string, scope: CommonCloudflareConstruct, props: RecordProps) {
+  public createRecord(id: string, scope: CommonCloudflareConstruct, props: DnsRecordProps) {
     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 record = new Record(scope, `${id}`, {
+    const record = new DnsRecord(scope, `${id}`, {
       ...props,
       zoneId,
     })

package/src/lib/cloudflare/services/record/types.ts

@@ -1,3 +1,3 @@
-import { RecordConfig } from '@cdktf/provider-cloudflare/lib/record'
+import { DnsRecordConfig } from '@cdktf/provider-cloudflare/lib/dns-record'
 
-export interface RecordProps extends RecordConfig {}
+export interface DnsRecordProps extends DnsRecordConfig {}

package/src/lib/cloudflare/services/rule-set/main.ts

@@ -34,7 +34,9 @@ export class CloudflareRuleSetManager {
 
     const zoneId = props.zoneId
       ? props.zoneId
-      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+          filter: { account: { name: scope.props.domainName } },
+        })?.id
 
     const ruleSet = new Ruleset(scope, `${id}`, {
       ...props,

package/src/lib/cloudflare/services/worker/main.ts

@@ -1,6 +1,6 @@
-import { WorkerDomain } from '@cdktf/provider-cloudflare/lib/worker-domain'
-import { WorkerRoute } from '@cdktf/provider-cloudflare/lib/worker-route'
-import { WorkerScript } from '@cdktf/provider-cloudflare/lib/worker-script'
+import { WorkersCustomDomain } from '@cdktf/provider-cloudflare/lib/workers-custom-domain'
+import { WorkersRoute } from '@cdktf/provider-cloudflare/lib/workers-route'
+import { WorkersScript } from '@cdktf/provider-cloudflare/lib/workers-script'
 import { CommonCloudflareConstruct } from '../../common'
 import { createCloudflareTfOutput } from '../../utils'
 import {
@@ -13,7 +13,7 @@ import {
 } from './types'
 import { WorkersKvNamespace } from '@cdktf/provider-cloudflare/lib/workers-kv-namespace'
 import { WorkersKv } from '@cdktf/provider-cloudflare/lib/workers-kv'
-import { WorkerCronTrigger } from '@cdktf/provider-cloudflare/lib/worker-cron-trigger'
+import { WorkersCronTrigger } from '@cdktf/provider-cloudflare/lib/workers-cron-trigger'
 
 /**
  * @classdesc Provides operations on Cloudflare Worker
@@ -38,16 +38,18 @@ export 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}
    */
   public createWorkerDomain(id: string, scope: CommonCloudflareConstruct, props: WorkerDomainProps) {
     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
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+          filter: { account: { name: scope.props.domainName } },
+        })?.id
 
-    const workerDomain = new WorkerDomain(scope, `${id}`, {
+    const workerDomain = new WorkersCustomDomain(scope, `${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       zoneId,
@@ -64,18 +66,20 @@ export 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}
    */
   public createWorkerRoute(id: string, scope: CommonCloudflareConstruct, props: WorkerRouteProps) {
     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
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+          filter: { account: { name: scope.props.domainName } },
+        })?.id
 
-    const workerRoute = new WorkerRoute(scope, `${id}`, {
+    const workerRoute = new WorkersRoute(scope, `${id}`, {
       ...props,
-      scriptName: `${props.scriptName}-${scope.props.stage}`,
+      script: `${props.script}-${scope.props.stage}`,
       zoneId,
     })
 
@@ -90,15 +94,15 @@ export 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}
    */
   public createWorkerScript(id: string, scope: CommonCloudflareConstruct, props: WorkerScriptProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workerScript = new WorkerScript(scope, `${id}`, {
+    const workerScript = new WorkersScript(scope, `${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
-      name: `${props.name}-${scope.props.stage}`,
+      scriptName: `${props.scriptName}-${scope.props.stage}`,
     })
 
     createCloudflareTfOutput(`${id}-workerScriptFriendlyUniqueId`, scope, workerScript.friendlyUniqueId)
@@ -155,12 +159,12 @@ export 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}
    */
   public createWorkerCronTrigger(id: string, scope: CommonCloudflareConstruct, props: WorkerCronTriggerProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workerCronTrigger = new WorkerCronTrigger(scope, `${id}`, {
+    const workerCronTrigger = new WorkersCronTrigger(scope, `${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
     })

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

@@ -1,13 +1,13 @@
-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 WorkerRouteProps extends WorkerRouteConfig {}
-export interface WorkerScriptProps extends WorkerScriptConfig {}
+export interface WorkerDomainProps extends WorkersCustomDomainConfig {}
+export interface WorkerRouteProps extends WorkersRouteConfig {}
+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/src/lib/cloudflare/services/zone/main.ts

@@ -5,7 +5,8 @@ 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 { createCloudflareTfOutput } from '../../utils'
 import {
@@ -16,7 +17,7 @@ import {
   ZoneLockdownProps,
   ZoneOptions,
   ZoneProps,
-  ZoneSettingsOverrideProps,
+  ZoneSettingProps,
 } from './types'
 
 /**
@@ -49,11 +50,13 @@ export class CloudflareZoneManager {
 
     const zone = new 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,
     })
 
-    createCloudflareTfOutput(`${id}-zoneName`, scope, zone.zone)
+    createCloudflareTfOutput(`${id}-zoneName`, scope, zone.name)
     createCloudflareTfOutput(`${id}-zoneFriendlyUniqueId`, scope, zone.friendlyUniqueId)
     createCloudflareTfOutput(`${id}-zoneId`, scope, zone.id)
 
@@ -62,9 +65,12 @@ export class CloudflareZoneManager {
 
   public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: ZoneOptions) {
     const zone = new 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
@@ -191,26 +197,49 @@ export class CloudflareZoneManager {
   }
 
   /**
-   * @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}
    */
-  public createZoneSettingsOverride(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingsOverrideProps) {
+  public createZoneDnsSettings(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps) {
     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 ZoneSettingsOverride(scope, `${id}`, {
+    const zoneDnsSettings = new ZoneDnsSettings(scope, `${id}`, {
       ...props,
       zoneId,
     })
 
-    createCloudflareTfOutput(`${id}-zoneSettingsOverrideFriendlyUniqueId`, scope, zoneSettingsOverride.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneSettingsOverrideId`, scope, zoneSettingsOverride.id)
+    createCloudflareTfOutput(`${id}-zoneDnsSettingsFriendlyUniqueId`, scope, zoneDnsSettings.friendlyUniqueId)
 
-    return zoneSettingsOverride
+    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}
+   */
+  public createZoneSetting(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps) {
+    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 ZoneSetting(scope, `${id}`, {
+      ...props,
+      zoneId,
+    })
+
+    createCloudflareTfOutput(`${id}-zoneSettingFriendlyUniqueId`, scope, zoneSetting.friendlyUniqueId)
+    createCloudflareTfOutput(`${id}-zoneSettingId`, scope, zoneSetting.id)
+
+    return zoneSetting
   }
 }

package/src/lib/cloudflare/services/zone/types.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
 }
@@ -16,4 +18,5 @@ export interface ZoneCacheVariantsProps extends ZoneCacheVariantsConfig {}
 export interface ZoneDnssecProps extends ZoneDnssecConfig {}
 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 {}