@gradientedge/cdk-utils 9.52.3 → 9.53.1

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
 }

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

@@ -1,29 +1,29 @@
-import { AccessApplication } from '@cdktf/provider-cloudflare/lib/access-application'
-import { AccessCaCertificate } from '@cdktf/provider-cloudflare/lib/access-ca-certificate'
-import { AccessCustomPage } from '@cdktf/provider-cloudflare/lib/access-custom-page'
-import { AccessGroup } from '@cdktf/provider-cloudflare/lib/access-group'
-import { AccessIdentityProvider } from '@cdktf/provider-cloudflare/lib/access-identity-provider'
-import { AccessMutualTlsCertificate } from '@cdktf/provider-cloudflare/lib/access-mutual-tls-certificate'
+import { ZeroTrustAccessApplication } from '@cdktf/provider-cloudflare/lib/zero-trust-access-application'
+import { ZeroTrustAccessShortLivedCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-short-lived-certificate'
+import { ZeroTrustAccessCustomPage } from '@cdktf/provider-cloudflare/lib/zero-trust-access-custom-page'
+import { ZeroTrustAccessGroup } from '@cdktf/provider-cloudflare/lib/zero-trust-access-group'
+import { ZeroTrustAccessIdentityProvider } from '@cdktf/provider-cloudflare/lib/zero-trust-access-identity-provider'
+import { ZeroTrustAccessMtlsCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-mtls-certificate'
+import { ZeroTrustOrganization } from '@cdktf/provider-cloudflare/lib/zero-trust-organization'
+import { ZeroTrustAccessPolicy } from '@cdktf/provider-cloudflare/lib/zero-trust-access-policy'
+import { AccessRule } from '@cdktf/provider-cloudflare/lib/access-rule'
+import { ZeroTrustAccessServiceToken } from '@cdktf/provider-cloudflare/lib/zero-trust-access-service-token'
+import { ZeroTrustAccessTag } from '@cdktf/provider-cloudflare/lib/zero-trust-access-tag'
 import { CommonCloudflareConstruct } from '../../common'
 import { createCloudflareTfOutput } from '../../utils'
 import {
-  AccessApplicationProps,
-  AccessCaCertificateProps,
-  AccessCustomPageProps,
-  AccessGroupProps,
-  AccessIdentityProviderProps,
-  AccessMutualTlsCertificateProps,
-  AccessOrganizationProps,
-  AccessPolicyProps,
+  ZeroTrustAccessApplicationProps,
+  ZeroTrustAccessShortLivedCertificateProps,
+  ZeroTrustAccessCustomPageProps,
+  ZeroTrustAccessGroupProps,
+  ZeroTrustAccessIdentityProviderProps,
+  ZeroTrustAccessMtlsCertificateProps,
+  ZeroTrustOrganizationProps,
+  ZeroTrustAccessPolicyProps,
   AccessRuleProps,
-  AccessServiceTokenProps,
-  AccessTagProps,
+  ZeroTrustAccessServiceTokenProps,
+  ZeroTrustAccessTagProps,
 } from './types'
-import { AccessOrganization } from '@cdktf/provider-cloudflare/lib/access-organization'
-import { AccessPolicy } from '@cdktf/provider-cloudflare/lib/access-policy'
-import { AccessRule } from '@cdktf/provider-cloudflare/lib/access-rule'
-import { AccessServiceToken } from '@cdktf/provider-cloudflare/lib/access-service-token'
-import { AccessTag } from '@cdktf/provider-cloudflare/lib/access-tag'
 
 /**
  * @classdesc Provides operations on Cloudflare Access
@@ -48,16 +48,16 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access application properties
-   * @see [CDKTF Access Application Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessApplication.typescript.md}
+   * @see [CDKTF Access Application Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessApplication.typescript.md}
    */
-  public createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: AccessApplicationProps) {
+  public createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessApplicationProps) {
     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 accessApplication = new AccessApplication(scope, `${id}`, {
+    const accessApplication = new ZeroTrustAccessApplication(scope, `${id}`, {
       ...props,
       domain: `${props.domain}-${scope.props.domainName}`,
       name: `${props.name}-${scope.props.stage}`,
@@ -71,28 +71,36 @@ export class CloudflareAccessManager {
   }
 
   /**
-   * @summary Method to create a new Cloudflare Application Access CA Certificate
+   * @summary Method to create a new Cloudflare Application Access Short Lived Certificate
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
-   * @param props access ca certificate properties
-   * @see [CDKTF Access Ca Certificate Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessCaCertificate.typescript.md}
+   * @param props access short lived  certificate properties
+   * @see [CDKTF Access Short Lived Certificate Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessShortLivedCertificate.typescript.md}
    */
-  public createAccessCaCertificate(id: string, scope: CommonCloudflareConstruct, props: AccessCaCertificateProps) {
+  public createAccessShortLivedCertificate(
+    id: string,
+    scope: CommonCloudflareConstruct,
+    props: ZeroTrustAccessShortLivedCertificateProps
+  ) {
     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 accessCaCertificate = new AccessCaCertificate(scope, `${id}`, {
+    const accessShortLivedCertificate = new ZeroTrustAccessShortLivedCertificate(scope, `${id}`, {
       ...props,
       zoneId,
     })
 
-    createCloudflareTfOutput(`${id}-accessCaCertificateFriendlyUniqueId`, scope, accessCaCertificate.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-accessCaCertificateId`, scope, accessCaCertificate.id)
+    createCloudflareTfOutput(
+      `${id}-accessShortLivedCertificateFriendlyUniqueId`,
+      scope,
+      accessShortLivedCertificate.friendlyUniqueId
+    )
+    createCloudflareTfOutput(`${id}-accessShortLivedCertificateId`, scope, accessShortLivedCertificate.id)
 
-    return accessCaCertificate
+    return accessShortLivedCertificate
   }
 
   /**
@@ -100,19 +108,15 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access custom page properties
-   * @see [CDKTF Access Custom Page Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessCustomPage.typescript.md}
+   * @see [CDKTF Access Custom Page Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessCustomPage.typescript.md}
    */
-  public createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: AccessCustomPageProps) {
+  public createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps) {
     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 accessCustomPage = new AccessCustomPage(scope, `${id}`, {
+    const accessCustomPage = new ZeroTrustAccessCustomPage(scope, `${id}`, {
       ...props,
+      accountId: props.accountId ?? scope.props.accountId,
       name: `${props.name}-${scope.props.stage}`,
-      zoneId,
     })
 
     createCloudflareTfOutput(`${id}-accessCustomPageFriendlyUniqueId`, scope, accessCustomPage.friendlyUniqueId)
@@ -126,16 +130,16 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access group properties
-   * @see [CDKTF Access Group Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessGroup.typescript.md}
+   * @see [CDKTF Access Group Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessGroup.typescript.md}
    */
-  public createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: AccessGroupProps) {
+  public createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessGroupProps) {
     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 accessGroup = new AccessGroup(scope, `${id}`, {
+    const accessGroup = new ZeroTrustAccessGroup(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
       zoneId,
@@ -152,12 +156,12 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access identity provider properties
-   * @see [CDKTF Access Identity Provider Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessIdentityProvider.typescript.md}
+   * @see [CDKTF Access Identity Provider Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessIdentityProvider.typescript.md}
    */
   public createAccessIdentityProvider(
     id: string,
     scope: CommonCloudflareConstruct,
-    props: AccessIdentityProviderProps
+    props: ZeroTrustAccessIdentityProviderProps
   ) {
     if (!props) throw `Props undefined for ${id}`
 
@@ -165,7 +169,7 @@ export class CloudflareAccessManager {
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
 
-    const accessIdentityProvider = new AccessIdentityProvider(scope, `${id}`, {
+    const accessIdentityProvider = new ZeroTrustAccessIdentityProvider(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
       zoneId,
@@ -186,12 +190,12 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access mutual tls certificate properties
-   * @see [CDKTF Access Mutual Tls Certificate Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessMutualTlsCertificate.typescript.md}
+   * @see [CDKTF Access Mutual Tls Certificate Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessMtlsCertificate.typescript.md}
    */
   public createAccessMutualTlsCertificate(
     id: string,
     scope: CommonCloudflareConstruct,
-    props: AccessMutualTlsCertificateProps
+    props: ZeroTrustAccessMtlsCertificateProps
   ) {
     if (!props) throw `Props undefined for ${id}`
 
@@ -199,7 +203,7 @@ export class CloudflareAccessManager {
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
 
-    const accessMutualTlsCertificate = new AccessMutualTlsCertificate(scope, `${id}`, {
+    const accessMutualTlsCertificate = new ZeroTrustAccessMtlsCertificate(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
       zoneId,
@@ -220,23 +224,22 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access organisation properties
-   * @see [CDKTF Access Organisation Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessOrganization.typescript.md}
+   * @see [CDKTF Access Organisation Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessOrganization.typescript.md}
    */
-  public createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: AccessOrganizationProps) {
+  public createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustOrganizationProps) {
     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 accessOrganization = new AccessOrganization(scope, `${id}`, {
+    const accessOrganization = new ZeroTrustOrganization(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
       zoneId,
     })
 
     createCloudflareTfOutput(`${id}-accessOrganizationFriendlyUniqueId`, scope, accessOrganization.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-accessOrganizationId`, scope, accessOrganization.id)
 
     return accessOrganization
   }
@@ -246,19 +249,15 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access policy properties
-   * @see [CDKTF Access Policy Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessPolicy.typescript.md}
+   * @see [CDKTF Access Policy Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessPolicy.typescript.md}
    */
-  public createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: AccessPolicyProps) {
+  public createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps) {
     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 accessPolicy = new AccessPolicy(scope, `${id}`, {
+    const accessPolicy = new ZeroTrustAccessPolicy(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
-      zoneId,
+      accountId: props.accountId ?? scope.props.accountId,
     })
 
     createCloudflareTfOutput(`${id}-accessPolicyFriendlyUniqueId`, scope, accessPolicy.friendlyUniqueId)
@@ -284,6 +283,7 @@ export class CloudflareAccessManager {
     const accessRule = new AccessRule(scope, `${id}`, {
       ...props,
       zoneId,
+      accountId: props.accountId ?? scope.props.accountId,
     })
 
     createCloudflareTfOutput(`${id}-accessRuleFriendlyUniqueId`, scope, accessRule.friendlyUniqueId)
@@ -297,18 +297,23 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access service token properties
-   * @see [CDKTF Access Service Token Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessServiceToken.typescript.md}
+   * @see [CDKTF Access Service Token Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessServiceToken.typescript.md}
    */
-  public createAccessServiceToken(id: string, scope: CommonCloudflareConstruct, props: AccessServiceTokenProps) {
+  public createAccessServiceToken(
+    id: string,
+    scope: CommonCloudflareConstruct,
+    props: ZeroTrustAccessServiceTokenProps
+  ) {
     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 accessServiceToken = new AccessServiceToken(scope, `${id}`, {
+    const accessServiceToken = new ZeroTrustAccessServiceToken(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
+      accountId: props.accountId ?? scope.props.accountId,
       zoneId,
     })
 
@@ -323,19 +328,15 @@ export class CloudflareAccessManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props access tag properties
-   * @see [CDKTF Access Tag Token Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessTag.typescript.md}
+   * @see [CDKTF Access Tag Token Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zeroTrustAccessTag.typescript.md}
    */
-  public createAccessTag(id: string, scope: CommonCloudflareConstruct, props: AccessTagProps) {
+  public createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps) {
     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 accessTag = new AccessTag(scope, `${id}`, {
+    const accessTag = new ZeroTrustAccessTag(scope, `${id}`, {
       ...props,
       name: `${props.name}-${scope.props.stage}`,
-      zoneId,
+      accountId: props.accountId ?? scope.props.accountId,
     })
 
     createCloudflareTfOutput(`${id}-accessTagFriendlyUniqueId`, scope, accessTag.friendlyUniqueId)

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

@@ -1,23 +1,23 @@
-import { AccessApplicationConfig } from '@cdktf/provider-cloudflare/lib/access-application'
-import { AccessCaCertificateConfig } from '@cdktf/provider-cloudflare/lib/access-ca-certificate'
-import { AccessCustomPageConfig } from '@cdktf/provider-cloudflare/lib/access-custom-page'
-import { AccessGroupConfig } from '@cdktf/provider-cloudflare/lib/access-group'
-import { AccessIdentityProviderConfig } from '@cdktf/provider-cloudflare/lib/access-identity-provider'
-import { AccessMutualTlsCertificateConfig } from '@cdktf/provider-cloudflare/lib/access-mutual-tls-certificate'
-import { AccessOrganizationConfig } from '@cdktf/provider-cloudflare/lib/access-organization'
-import { AccessPolicyConfig } from '@cdktf/provider-cloudflare/lib/access-policy'
+import { ZeroTrustAccessApplicationConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-application'
+import { ZeroTrustAccessShortLivedCertificateConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-short-lived-certificate'
+import { ZeroTrustAccessCustomPageConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-custom-page'
+import { ZeroTrustAccessGroupConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-group'
+import { ZeroTrustAccessIdentityProviderConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-identity-provider'
+import { ZeroTrustAccessMtlsCertificateConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-mtls-certificate'
+import { ZeroTrustOrganizationConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-organization'
+import { ZeroTrustAccessPolicyConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-policy'
 import { AccessRuleConfig } from '@cdktf/provider-cloudflare/lib/access-rule'
-import { AccessServiceTokenConfig } from '@cdktf/provider-cloudflare/lib/access-service-token'
-import { AccessTagConfig } from '@cdktf/provider-cloudflare/lib/access-tag'
+import { ZeroTrustAccessServiceTokenConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-service-token'
+import { ZeroTrustAccessTagConfig } from '@cdktf/provider-cloudflare/lib/zero-trust-access-tag'
 
-export interface AccessApplicationProps extends AccessApplicationConfig {}
-export interface AccessCaCertificateProps extends AccessCaCertificateConfig {}
-export interface AccessCustomPageProps extends AccessCustomPageConfig {}
-export interface AccessGroupProps extends AccessGroupConfig {}
-export interface AccessIdentityProviderProps extends AccessIdentityProviderConfig {}
-export interface AccessMutualTlsCertificateProps extends AccessMutualTlsCertificateConfig {}
-export interface AccessOrganizationProps extends AccessOrganizationConfig {}
-export interface AccessPolicyProps extends AccessPolicyConfig {}
+export interface ZeroTrustAccessApplicationProps extends ZeroTrustAccessApplicationConfig {}
+export interface ZeroTrustAccessShortLivedCertificateProps extends ZeroTrustAccessShortLivedCertificateConfig {}
+export interface ZeroTrustAccessCustomPageProps extends ZeroTrustAccessCustomPageConfig {}
+export interface ZeroTrustAccessGroupProps extends ZeroTrustAccessGroupConfig {}
+export interface ZeroTrustAccessIdentityProviderProps extends ZeroTrustAccessIdentityProviderConfig {}
+export interface ZeroTrustAccessMtlsCertificateProps extends ZeroTrustAccessMtlsCertificateConfig {}
+export interface ZeroTrustOrganizationProps extends ZeroTrustOrganizationConfig {}
+export interface ZeroTrustAccessPolicyProps extends ZeroTrustAccessPolicyConfig {}
 export interface AccessRuleProps extends AccessRuleConfig {}
-export interface AccessServiceTokenProps extends AccessServiceTokenConfig {}
-export interface AccessTagProps extends AccessTagConfig {}
+export interface ZeroTrustAccessServiceTokenProps extends ZeroTrustAccessServiceTokenConfig {}
+export interface ZeroTrustAccessTagProps extends ZeroTrustAccessTagConfig {}

package/src/lib/cloudflare/services/api-shield/main.ts

@@ -77,7 +77,7 @@ export class CloudflareApiShieldManager {
     })
 
     createCloudflareTfOutput(`${id}-apiShieldSchemaFriendlyUniqueId`, scope, apiShieldSchema.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-apiShieldSchemaId`, scope, apiShieldSchema.id)
+    createCloudflareTfOutput(`${id}-apiShieldSchemaId`, scope, apiShieldSchema.schemaId)
 
     return apiShieldSchema
   }

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

@@ -1,7 +1,9 @@
-import { Argo } from '@cdktf/provider-cloudflare/lib/argo'
+import { ArgoSmartRouting } from '@cdktf/provider-cloudflare/lib/argo-smart-routing'
+import { ArgoTieredCaching } from '@cdktf/provider-cloudflare/lib/argo-tiered-caching'
 import { CommonCloudflareConstruct } from '../../common'
 import { createCloudflareTfOutput } from '../../utils'
-import { ArgoProps } from './types'
+import { ArgoSmartRoutingProps, ArgoTieredCachingProps } from './types'
+import { argoTieredCaching } from '@cdktf/provider-cloudflare'
 
 /**
  * @classdesc Provides operations on Cloudflare Argo
@@ -26,23 +28,48 @@ export class CloudflareArgoManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props argo properties
-   * @see [CDKTF Argo Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/argo.typescript.md}
+   * @see [CDKTF Argo Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/argoSmartRouting.typescript.md}
    */
-  public createArgo(id: string, scope: CommonCloudflareConstruct, props: ArgoProps) {
+  public createArgoSmartRouting(id: string, scope: CommonCloudflareConstruct, props: ArgoSmartRoutingProps) {
     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 argo = new Argo(scope, `${id}`, {
+    const argoSmartRouting = new ArgoSmartRouting(scope, `${id}`, {
       ...props,
       zoneId,
     })
 
-    createCloudflareTfOutput(`${id}-argoFriendlyUniqueId`, scope, argo.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-argoId`, scope, argo.id)
+    createCloudflareTfOutput(`${id}-argoSmartRoutingFriendlyUniqueId`, scope, argoSmartRouting.friendlyUniqueId)
+    createCloudflareTfOutput(`${id}-argoSmartRoutingId`, scope, argoSmartRouting.id)
 
-    return argo
+    return argoSmartRouting
+  }
+
+  /**
+   * @summary Method to create a new Cloudflare Argo
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props argo properties
+   * @see [CDKTF Argo Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/argoTieredCaching.typescript.md}
+   */
+  public createArgoTieredCaching(id: string, scope: CommonCloudflareConstruct, props: ArgoTieredCachingProps) {
+    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 argoTieredCaching = new ArgoTieredCaching(scope, `${id}`, {
+      ...props,
+      zoneId,
+    })
+
+    createCloudflareTfOutput(`${id}-argoTieredCachingFriendlyUniqueId`, scope, argoTieredCaching.friendlyUniqueId)
+    createCloudflareTfOutput(`${id}-argoTieredCachingId`, scope, argoTieredCaching.id)
+
+    return argoTieredCaching
   }
 }

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

@@ -1,3 +1,5 @@
-import { ArgoConfig } from '@cdktf/provider-cloudflare/lib/argo'
+import { ArgoSmartRoutingConfig } from '@cdktf/provider-cloudflare/lib/argo-smart-routing'
+import { ArgoTieredCachingConfig } from '@cdktf/provider-cloudflare/lib/argo-tiered-caching'
 
-export interface ArgoProps extends ArgoConfig {}
+export interface ArgoSmartRoutingProps extends ArgoSmartRoutingConfig {}
+export interface ArgoTieredCachingProps extends ArgoTieredCachingConfig {}

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

@@ -59,7 +59,7 @@ export class CloudflarePageManager {
     const pagesDomain = new PagesDomain(scope, `${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
-      domain: props.domain ?? scope.props.domainName,
+      name: props.name ?? scope.props.domainName,
     })
 
     createCloudflareTfOutput(`${id}-pagesDomainFriendlyUniqueId`, scope, pagesDomain.friendlyUniqueId)