@gradientedge/cdk-utils 9.52.3 → 9.53.0

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

@@ -1,7 +1,7 @@
 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 { Construct } from 'constructs';
 import { CommonCloudflareConstruct } from '../../common';
@@ -23,21 +23,21 @@ import { CloudflarePagesStaticSiteProps } from './types';
  */
 export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
     props: CloudflarePagesStaticSiteProps;
-    sitePagesCnameRecord: Record;
+    sitePagesCnameRecord: DnsRecord;
     sitePagesDomain: PagesDomain;
     sitePagesProject: PagesProject;
     siteZone: DataCloudflareZone | Zone;
     sitePagesEnvironmentVariables: {
-        [key: string]: string;
+        [key: string]: PagesProjectDeploymentConfigsProductionEnvVars;
     };
     sitePagesPreviewEnvironmentVariables: {
-        [key: string]: string;
+        [key: string]: PagesProjectDeploymentConfigsPreviewEnvVars;
     };
     sitePagesSecrets: {
-        [key: string]: string;
+        [key: string]: PagesProjectDeploymentConfigsProductionEnvVars;
     };
     sitePagesPreviewSecrets: {
-        [key: string]: string;
+        [key: string]: PagesProjectDeploymentConfigsPreviewEnvVars;
     };
     siteDeploymentDependsOn: any;
     constructor(parent: Construct, id: string, props: CloudflarePagesStaticSiteProps);

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

@@ -69,10 +69,10 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
             ...this.props.sitePagesProject,
             deploymentConfigs: {
                 preview: {
-                    secrets: this.sitePagesPreviewSecrets,
+                    envVars: this.sitePagesPreviewSecrets,
                 },
                 production: {
-                    secrets: this.sitePagesSecrets,
+                    envVars: this.sitePagesSecrets,
                 },
             },
         };
@@ -85,10 +85,10 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
             ...this.props.sitePagesProject,
             deploymentConfigs: {
                 preview: {
-                    environmentVariables: this.sitePagesPreviewEnvironmentVariables,
+                    envVars: this.sitePagesPreviewEnvironmentVariables,
                 },
                 production: {
-                    environmentVariables: this.sitePagesEnvironmentVariables,
+                    envVars: this.sitePagesEnvironmentVariables,
                 },
             },
         };
@@ -146,7 +146,7 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
     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,
         });
     }
@@ -157,7 +157,10 @@ class CloudflarePagesStaticSite extends common_1.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/dist/src/lib/cloudflare/construct/pages-static-site/types.d.ts

@@ -1,9 +1,9 @@
 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/dist/src/lib/cloudflare/construct/worker-site/main.d.ts

@@ -1,5 +1,5 @@
 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 { Construct } from 'constructs';
 import { CommonCloudflareConstruct } from '../../common';
@@ -22,9 +22,9 @@ import { CloudflareWorkerSiteProps } from './types';
 export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
     props: CloudflareWorkerSiteProps;
     siteZone: DataCloudflareZone | Zone;
-    siteWorkerScript: WorkerScript;
-    workerPlainTextBindingEnvironmentVariables: WorkerScriptPlainTextBinding[];
-    workerSecretTextBindingEnvironmentVariables: WorkerScriptSecretTextBinding[];
+    siteWorkerScript: WorkersScript;
+    workerPlainTextBindingEnvironmentVariables: WorkersScriptBindings[];
+    workerSecretTextBindingEnvironmentVariables: WorkersScriptBindings[];
     constructor(parent: Construct, id: string, props: CloudflareWorkerSiteProps);
     /**
      * @summary Initialise and provision resources
@@ -69,5 +69,5 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
     /**
      * @summary Create zone settings override
      */
-    protected createZoneSettingsOverride(): void;
+    protected createZoneSetting(): void;
 }

package/dist/src/lib/cloudflare/construct/worker-site/main.js

@@ -26,8 +26,8 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
     /* worker site resources */
     siteZone;
     siteWorkerScript;
-    workerPlainTextBindingEnvironmentVariables;
-    workerSecretTextBindingEnvironmentVariables;
+    workerPlainTextBindingEnvironmentVariables = [];
+    workerSecretTextBindingEnvironmentVariables = [];
     constructor(parent, id, props) {
         super(parent, id, props);
         this.props = props;
@@ -42,7 +42,7 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
         this.createWorker();
         this.createWorkerDomain();
         this.createRuleset();
-        this.createZoneSettingsOverride();
+        this.createZoneSetting();
     }
     /**
      * @summary Resolve the zone to use for the worker site
@@ -61,8 +61,7 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
     resolveEnvironmentVariables() {
         this.props.siteWorkerScript = {
             ...this.props.siteWorkerScript,
-            plainTextBinding: this.workerPlainTextBindingEnvironmentVariables,
-            secretTextBinding: this.workerSecretTextBindingEnvironmentVariables,
+            bindings: this.workerPlainTextBindingEnvironmentVariables.concat(this.workerSecretTextBindingEnvironmentVariables),
         };
     }
     /**
@@ -85,7 +84,7 @@ class CloudflareWorkerSite extends common_1.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,
         });
     }
     /**
@@ -144,10 +143,10 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
     /**
      * @summary Create zone settings override
      */
-    createZoneSettingsOverride() {
-        if (!this.props.siteZoneSettingsOverride)
+    createZoneSetting() {
+        if (!this.props.siteZoneSetting)
             return;
-        this.zoneManager.createZoneSettingsOverride(`${this.id}-zone-settings-override`, this, this.props.siteZoneSettingsOverride);
+        this.zoneManager.createZoneSetting(`${this.id}-zone-setting`, this, this.props.siteZoneSetting);
     }
 }
 exports.CloudflareWorkerSite = CloudflareWorkerSite;

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

@@ -1,5 +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;
     siteZone: ZoneProps;
@@ -7,5 +7,5 @@ export interface CloudflareWorkerSiteProps extends CommonCloudflareStackProps {
     siteWorkerDomain: WorkerDomainProps;
     siteWorkerAsset: string;
     siteRuleSet: RulesetProps;
-    siteZoneSettingsOverride: ZoneSettingsOverrideProps;
+    siteZoneSetting: ZoneSettingProps;
 }

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

@@ -1,16 +1,16 @@
-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 { CommonCloudflareConstruct } from '../../common';
-import { AccessApplicationProps, AccessCaCertificateProps, AccessCustomPageProps, AccessGroupProps, AccessIdentityProviderProps, AccessMutualTlsCertificateProps, AccessOrganizationProps, AccessPolicyProps, AccessRuleProps, AccessServiceTokenProps, AccessTagProps } from './types';
-import { AccessOrganization } from '@cdktf/provider-cloudflare/lib/access-organization';
-import { AccessPolicy } from '@cdktf/provider-cloudflare/lib/access-policy';
+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 { AccessServiceToken } from '@cdktf/provider-cloudflare/lib/access-service-token';
-import { AccessTag } from '@cdktf/provider-cloudflare/lib/access-tag';
+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 { ZeroTrustAccessApplicationProps, ZeroTrustAccessShortLivedCertificateProps, ZeroTrustAccessCustomPageProps, ZeroTrustAccessGroupProps, ZeroTrustAccessIdentityProviderProps, ZeroTrustAccessMtlsCertificateProps, ZeroTrustOrganizationProps, ZeroTrustAccessPolicyProps, AccessRuleProps, ZeroTrustAccessServiceTokenProps, ZeroTrustAccessTagProps } from './types';
 /**
  * @classdesc Provides operations on Cloudflare Access
  * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
@@ -34,65 +34,65 @@ export declare 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}
      */
-    createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: AccessApplicationProps): AccessApplication;
+    createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessApplicationProps): ZeroTrustAccessApplication;
     /**
-     * @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}
      */
-    createAccessCaCertificate(id: string, scope: CommonCloudflareConstruct, props: AccessCaCertificateProps): AccessCaCertificate;
+    createAccessShortLivedCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessShortLivedCertificateProps): ZeroTrustAccessShortLivedCertificate;
     /**
      * @summary Method to create a new Cloudflare Application Access Custom Page
      * @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}
      */
-    createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: AccessCustomPageProps): AccessCustomPage;
+    createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps): ZeroTrustAccessCustomPage;
     /**
      * @summary Method to create a new Cloudflare Application Access Group
      * @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}
      */
-    createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: AccessGroupProps): AccessGroup;
+    createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessGroupProps): ZeroTrustAccessGroup;
     /**
      * @summary Method to create a new Cloudflare Application Access Identity Provider
      * @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}
      */
-    createAccessIdentityProvider(id: string, scope: CommonCloudflareConstruct, props: AccessIdentityProviderProps): AccessIdentityProvider;
+    createAccessIdentityProvider(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessIdentityProviderProps): ZeroTrustAccessIdentityProvider;
     /**
      * @summary Method to create a new Cloudflare Application Access Mutual Tls Certificate
      * @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}
      */
-    createAccessMutualTlsCertificate(id: string, scope: CommonCloudflareConstruct, props: AccessMutualTlsCertificateProps): AccessMutualTlsCertificate;
+    createAccessMutualTlsCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessMtlsCertificateProps): ZeroTrustAccessMtlsCertificate;
     /**
      * @summary Method to create a new Cloudflare Application Access Organisation
      * @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}
      */
-    createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: AccessOrganizationProps): AccessOrganization;
+    createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustOrganizationProps): ZeroTrustOrganization;
     /**
      * @summary Method to create a new Cloudflare Application Access Policy
      * @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}
      */
-    createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: AccessPolicyProps): AccessPolicy;
+    createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps): ZeroTrustAccessPolicy;
     /**
      * @summary Method to create a new Cloudflare Application Access Rule
      * @param id scoped id of the resource
@@ -106,15 +106,15 @@ export declare 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}
      */
-    createAccessServiceToken(id: string, scope: CommonCloudflareConstruct, props: AccessServiceTokenProps): AccessServiceToken;
+    createAccessServiceToken(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessServiceTokenProps): ZeroTrustAccessServiceToken;
     /**
      * @summary Method to create a new Cloudflare Application Access Tag
      * @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}
      */
-    createAccessTag(id: string, scope: CommonCloudflareConstruct, props: AccessTagProps): AccessTag;
+    createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps): ZeroTrustAccessTag;
 }

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

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflareAccessManager = void 0;
-const access_application_1 = require("@cdktf/provider-cloudflare/lib/access-application");
-const access_ca_certificate_1 = require("@cdktf/provider-cloudflare/lib/access-ca-certificate");
-const access_custom_page_1 = require("@cdktf/provider-cloudflare/lib/access-custom-page");
-const access_group_1 = require("@cdktf/provider-cloudflare/lib/access-group");
-const access_identity_provider_1 = require("@cdktf/provider-cloudflare/lib/access-identity-provider");
-const access_mutual_tls_certificate_1 = require("@cdktf/provider-cloudflare/lib/access-mutual-tls-certificate");
-const utils_1 = require("../../utils");
-const access_organization_1 = require("@cdktf/provider-cloudflare/lib/access-organization");
-const access_policy_1 = require("@cdktf/provider-cloudflare/lib/access-policy");
+const zero_trust_access_application_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-application");
+const zero_trust_access_short_lived_certificate_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-short-lived-certificate");
+const zero_trust_access_custom_page_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-custom-page");
+const zero_trust_access_group_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-group");
+const zero_trust_access_identity_provider_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-identity-provider");
+const zero_trust_access_mtls_certificate_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-mtls-certificate");
+const zero_trust_organization_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-organization");
+const zero_trust_access_policy_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-policy");
 const access_rule_1 = require("@cdktf/provider-cloudflare/lib/access-rule");
-const access_service_token_1 = require("@cdktf/provider-cloudflare/lib/access-service-token");
-const access_tag_1 = require("@cdktf/provider-cloudflare/lib/access-tag");
+const zero_trust_access_service_token_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-service-token");
+const zero_trust_access_tag_1 = require("@cdktf/provider-cloudflare/lib/zero-trust-access-tag");
+const utils_1 = require("../../utils");
 /**
  * @classdesc Provides operations on Cloudflare Access
  * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
@@ -36,7 +36,7 @@ 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}
      */
     createAccessApplication(id, scope, props) {
         if (!props)
@@ -44,7 +44,7 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessApplication = new access_application_1.AccessApplication(scope, `${id}`, {
+        const accessApplication = new zero_trust_access_application_1.ZeroTrustAccessApplication(scope, `${id}`, {
             ...props,
             domain: `${props.domain}-${scope.props.domainName}`,
             name: `${props.name}-${scope.props.stage}`,
@@ -55,43 +55,40 @@ class CloudflareAccessManager {
         return accessApplication;
     }
     /**
-     * @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}
      */
-    createAccessCaCertificate(id, scope, props) {
+    createAccessShortLivedCertificate(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 accessCaCertificate = new access_ca_certificate_1.AccessCaCertificate(scope, `${id}`, {
+        const accessShortLivedCertificate = new zero_trust_access_short_lived_certificate_1.ZeroTrustAccessShortLivedCertificate(scope, `${id}`, {
             ...props,
             zoneId,
         });
-        (0, utils_1.createCloudflareTfOutput)(`${id}-accessCaCertificateFriendlyUniqueId`, scope, accessCaCertificate.friendlyUniqueId);
-        (0, utils_1.createCloudflareTfOutput)(`${id}-accessCaCertificateId`, scope, accessCaCertificate.id);
-        return accessCaCertificate;
+        (0, utils_1.createCloudflareTfOutput)(`${id}-accessShortLivedCertificateFriendlyUniqueId`, scope, accessShortLivedCertificate.friendlyUniqueId);
+        (0, utils_1.createCloudflareTfOutput)(`${id}-accessShortLivedCertificateId`, scope, accessShortLivedCertificate.id);
+        return accessShortLivedCertificate;
     }
     /**
      * @summary Method to create a new Cloudflare Application Access Custom Page
      * @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}
      */
     createAccessCustomPage(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 accessCustomPage = new access_custom_page_1.AccessCustomPage(scope, `${id}`, {
+        const accessCustomPage = new zero_trust_access_custom_page_1.ZeroTrustAccessCustomPage(scope, `${id}`, {
             ...props,
+            accountId: props.accountId ?? scope.props.accountId,
             name: `${props.name}-${scope.props.stage}`,
-            zoneId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessCustomPageFriendlyUniqueId`, scope, accessCustomPage.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessCustomPageId`, scope, accessCustomPage.id);
@@ -102,7 +99,7 @@ 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}
      */
     createAccessGroup(id, scope, props) {
         if (!props)
@@ -110,7 +107,7 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessGroup = new access_group_1.AccessGroup(scope, `${id}`, {
+        const accessGroup = new zero_trust_access_group_1.ZeroTrustAccessGroup(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
@@ -124,7 +121,7 @@ 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}
      */
     createAccessIdentityProvider(id, scope, props) {
         if (!props)
@@ -132,7 +129,7 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessIdentityProvider = new access_identity_provider_1.AccessIdentityProvider(scope, `${id}`, {
+        const accessIdentityProvider = new zero_trust_access_identity_provider_1.ZeroTrustAccessIdentityProvider(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
@@ -146,7 +143,7 @@ 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}
      */
     createAccessMutualTlsCertificate(id, scope, props) {
         if (!props)
@@ -154,7 +151,7 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessMutualTlsCertificate = new access_mutual_tls_certificate_1.AccessMutualTlsCertificate(scope, `${id}`, {
+        const accessMutualTlsCertificate = new zero_trust_access_mtls_certificate_1.ZeroTrustAccessMtlsCertificate(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
@@ -168,7 +165,7 @@ 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}
      */
     createAccessOrganization(id, scope, props) {
         if (!props)
@@ -176,13 +173,12 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessOrganization = new access_organization_1.AccessOrganization(scope, `${id}`, {
+        const accessOrganization = new zero_trust_organization_1.ZeroTrustOrganization(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessOrganizationFriendlyUniqueId`, scope, accessOrganization.friendlyUniqueId);
-        (0, utils_1.createCloudflareTfOutput)(`${id}-accessOrganizationId`, scope, accessOrganization.id);
         return accessOrganization;
     }
     /**
@@ -190,18 +186,15 @@ 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}
      */
     createAccessPolicy(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 accessPolicy = new access_policy_1.AccessPolicy(scope, `${id}`, {
+        const accessPolicy = new zero_trust_access_policy_1.ZeroTrustAccessPolicy(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
-            zoneId,
+            accountId: props.accountId ?? scope.props.accountId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessPolicyFriendlyUniqueId`, scope, accessPolicy.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessPolicyId`, scope, accessPolicy.id);
@@ -223,6 +216,7 @@ class CloudflareAccessManager {
         const accessRule = new access_rule_1.AccessRule(scope, `${id}`, {
             ...props,
             zoneId,
+            accountId: props.accountId ?? scope.props.accountId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessRuleFriendlyUniqueId`, scope, accessRule.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessRuleId`, scope, accessRule.id);
@@ -233,7 +227,7 @@ 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}
      */
     createAccessServiceToken(id, scope, props) {
         if (!props)
@@ -241,9 +235,10 @@ class CloudflareAccessManager {
         const zoneId = props.zoneId
             ? props.zoneId
             : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
-        const accessServiceToken = new access_service_token_1.AccessServiceToken(scope, `${id}`, {
+        const accessServiceToken = new zero_trust_access_service_token_1.ZeroTrustAccessServiceToken(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
+            accountId: props.accountId ?? scope.props.accountId,
             zoneId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessServiceTokenFriendlyUniqueId`, scope, accessServiceToken.friendlyUniqueId);
@@ -255,18 +250,15 @@ 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}
      */
     createAccessTag(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 accessTag = new access_tag_1.AccessTag(scope, `${id}`, {
+        const accessTag = new zero_trust_access_tag_1.ZeroTrustAccessTag(scope, `${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
-            zoneId,
+            accountId: props.accountId ?? scope.props.accountId,
         });
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessTagFriendlyUniqueId`, scope, accessTag.friendlyUniqueId);
         (0, utils_1.createCloudflareTfOutput)(`${id}-accessTagId`, scope, accessTag.id);