@gradientedge/cdk-utils 9.89.0 → 10.0.0

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

@@ -1,8 +1,7 @@
-import { DataAwsSecretsmanagerSecretVersion } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret-version/index.js';
-import { DataAwsSecretsmanagerSecret } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret/index.js';
-import { DataAzurermKeyVaultSecret } from '@cdktf/provider-azurerm/lib/data-azurerm-key-vault-secret/index.js';
-import { DataAzurermKeyVault } from '@cdktf/provider-azurerm/lib/data-azurerm-key-vault/index.js';
-import { AssetType, Fn, TerraformAsset } from 'cdktf';
+import * as aws from '@pulumi/aws';
+import * as azure from '@pulumi/azure-native';
+import * as std from '@pulumi/std';
+import fs from 'fs';
 import { CommonCloudflareConstruct } from '../../common/index.js';
 /**
  * @classdesc Provides a construct to create and deploy a cloudflare worker site
@@ -23,11 +22,15 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     /* worker site resources */
     siteZone;
     siteWorkerScript;
+    siteWorkerDomain;
+    siteRuleSet;
+    siteZoneSetting;
     workerPlainTextBindingEnvironmentVariables = [];
     workerSecretTextBindingEnvironmentVariables = [];
-    constructor(parent, id, props) {
-        super(parent, id, props);
+    constructor(id, props, options) {
+        super(id, props);
         this.props = props;
+        this.options = options;
         this.id = id;
     }
     /**
@@ -65,20 +68,17 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @summary Create the worker
      */
     createWorker() {
-        const workerContent = new TerraformAsset(this, `${this.id}-worker-content`, {
-            path: this.props.siteWorkerAsset,
-            type: AssetType.FILE,
-        });
+        const workerContent = fs.readFileSync(this.props.siteWorkerAsset, 'utf-8');
         this.siteWorkerScript = this.workerManager.createWorkerScript(`${this.id}-worker-script`, this, {
             ...this.props.siteWorkerScript,
-            content: Fn.file(workerContent.path),
+            content: workerContent,
         });
     }
     /**
      * @summary Create the worker domain
      */
     createWorkerDomain() {
-        this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
+        this.siteWorkerDomain = this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
             ...this.props.siteWorkerDomain,
             environment: this.props.siteWorkerDomain.environment ?? 'production',
             hostname: `${this.props.siteSubDomain}.${this.props.domainName}`,
@@ -91,20 +91,14 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @param secretKey the secret key
      * @returns the secret value
      */
-    resolveSecretFromAWS(secretName, secretKey, id) {
-        if (!this.awsProvider) {
-            throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`);
-        }
-        const secret = new DataAwsSecretsmanagerSecret(this, id ?? `${this.id}-${secretName}-${secretKey}`, {
-            name: secretName,
-        });
-        const secretVersion = new DataAwsSecretsmanagerSecretVersion(this, id ? `${id}-ver` : `${this.id}-${secretName}-${secretKey}-ver`, {
-            provider: this.awsProvider,
-            secretId: secret.id,
-        });
+    resolveSecretFromAWS(secretName, secretKey) {
+        if (this.config.require('secretsProvider') !== 'aws')
+            return;
+        const secret = aws.secretsmanager.getSecretOutput({ name: secretName });
+        const secretVersion = aws.secretsmanager.getSecretVersionOutput({ secretId: secret.id });
         if (!secretVersion)
             throw new Error(`Unable to resolve secret:${secretName}`);
-        return Fn.lookup(Fn.jsondecode(secretVersion.secretString), secretKey);
+        return std.jsondecodeOutput({ input: secretVersion.secretString });
     }
     /**
      * @summary Resolve secrets from Azure Key Vault
@@ -114,23 +108,17 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @param secretKey the secret key
      * @returns the secret value
      */
-    resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey, id) {
-        if (!this.azurermProvider) {
-            throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`);
-        }
-        const keyVaultData = new DataAzurermKeyVault(this, id ? `${id}-vault` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`, {
-            resourceGroupName: resourceGroupName,
-            name: keyVaultName,
-            provider: this.azurermProvider,
-        });
-        const secretValueData = new DataAzurermKeyVaultSecret(this, id ? `${id}-secret` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`, {
-            name: secretKey,
-            keyVaultId: keyVaultData.id,
-            provider: this.azurermProvider,
+    resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey) {
+        if (this.config.require('secretsProvider') !== 'azure')
+            return;
+        const secretValueData = azure.keyvault.getSecretOutput({
+            resourceGroupName,
+            secretName: secretKey,
+            vaultName: keyVaultName,
         });
         if (!secretValueData)
             throw new Error(`Unable to resolve secret:${secretKey}`);
-        return secretValueData.value;
+        return secretValueData.properties?.value;
     }
     /**
      * @summary Create the rules
@@ -138,7 +126,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     createRuleset() {
         if (!this.props.siteRuleSet)
             return;
-        this.ruleSetManager.createRuleSet(`${this.id}-rule`, this, this.props.siteRuleSet);
+        this.siteRuleSet = this.ruleSetManager.createRuleSet(`${this.id}-rule`, this, this.props.siteRuleSet);
     }
     /**
      * @summary Create zone settings override
@@ -146,6 +134,6 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
     createZoneSetting() {
         if (!this.props.siteZoneSetting)
             return;
-        this.zoneManager.createZoneSetting(`${this.id}-zone-setting`, this, this.props.siteZoneSetting);
+        this.siteZoneSetting = this.zoneManager.createZoneSetting(`${this.id}-zone-setting`, this, this.props.siteZoneSetting);
     }
 }

package/dist/src/lib/cloudflare/index.d.ts

@@ -2,4 +2,3 @@ export * from './common/index.js';
 export * from './construct/index.js';
 export * from './services/index.js';
 export * from './types/index.js';
-export * from './utils/index.js';

package/dist/src/lib/cloudflare/index.js

@@ -2,4 +2,3 @@ export * from './common/index.js';
 export * from './construct/index.js';
 export * from './services/index.js';
 export * from './types/index.js';
-export * from './utils/index.js';

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

@@ -1,29 +1,17 @@
-import { AccessRule } from '@cdktf/provider-cloudflare/lib/access-rule/index.js';
-import { ZeroTrustAccessApplication } from '@cdktf/provider-cloudflare/lib/zero-trust-access-application/index.js';
-import { ZeroTrustAccessCustomPage } from '@cdktf/provider-cloudflare/lib/zero-trust-access-custom-page/index.js';
-import { ZeroTrustAccessGroup } from '@cdktf/provider-cloudflare/lib/zero-trust-access-group/index.js';
-import { ZeroTrustAccessIdentityProvider } from '@cdktf/provider-cloudflare/lib/zero-trust-access-identity-provider/index.js';
-import { ZeroTrustAccessMtlsCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-mtls-certificate/index.js';
-import { ZeroTrustAccessPolicy } from '@cdktf/provider-cloudflare/lib/zero-trust-access-policy/index.js';
-import { ZeroTrustAccessServiceToken } from '@cdktf/provider-cloudflare/lib/zero-trust-access-service-token/index.js';
-import { ZeroTrustAccessShortLivedCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-short-lived-certificate/index.js';
-import { ZeroTrustAccessTag } from '@cdktf/provider-cloudflare/lib/zero-trust-access-tag/index.js';
-import { ZeroTrustOrganization } from '@cdktf/provider-cloudflare/lib/zero-trust-organization/index.js';
-import { CommonCloudflareConstruct } from '../../common/index.js';
+import { CommonCloudflareConstruct } from '../../common/construct.js';
 import { AccessRuleProps, ZeroTrustAccessApplicationProps, ZeroTrustAccessCustomPageProps, ZeroTrustAccessGroupProps, ZeroTrustAccessIdentityProviderProps, ZeroTrustAccessMtlsCertificateProps, ZeroTrustAccessPolicyProps, ZeroTrustAccessServiceTokenProps, ZeroTrustAccessShortLivedCertificateProps, ZeroTrustAccessTagProps, ZeroTrustOrganizationProps } from './types.js';
 /**
  * @classdesc Provides operations on Cloudflare Access
- * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
- * - If a custom construct extends {@link CommonCloudflareConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonCloudflareComponent} constructor.
+ * - If a custom component extends {@link CommonCloudflareComponent}, an instance is available within the context.
  * @example
  * ```
- * import { CommonCloudflareConstruct, CommonCloudflareConstruct } from '@gradientedge/cdk-utils'
+ * import { CommonCloudflareComponent, CloudflareAccessManager } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends CommonCloudflareConstruct {
- *   constructor(parent: Construct, id: string, props: CommonCloudflareStackProps) {
- *     super(parent, id, props)
- *     this.props = props
- *     this.accessManager.createApiShield('MyAppAccess', this, props)
+ * class CustomComponent extends CommonCloudflareComponent {
+ *   constructor(name: string, args: any, opts?: pulumi.ComponentResourceOptions) {
+ *     super(name, args, opts)
+ *     this.accessManager.createAccessApplication('MyAppAccess', this, props)
  *   }
  * }
  * ```
@@ -34,87 +22,87 @@ 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/zeroTrustAccessApplication.typescript.md}
+     * @see [Pulumi Cloudflare Access Application]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessapplication/}
      */
-    createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessApplicationProps): ZeroTrustAccessApplication;
+    createAccessApplication(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessApplicationProps): import("@pulumi/cloudflare/zeroTrustAccessApplication.js").ZeroTrustAccessApplication;
     /**
      * @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 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}
+     * @param props access short lived certificate properties
+     * @see [Pulumi Cloudflare Access Short Lived Certificate]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessshortlivedcertificate/}
      */
-    createAccessShortLivedCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessShortLivedCertificateProps): ZeroTrustAccessShortLivedCertificate;
+    createAccessShortLivedCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessShortLivedCertificateProps): import("@pulumi/cloudflare/zeroTrustAccessShortLivedCertificate.js").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/zeroTrustAccessCustomPage.typescript.md}
+     * @see [Pulumi Cloudflare Access Custom Page]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesscustompage/}
      */
-    createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps): ZeroTrustAccessCustomPage;
+    createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps): import("@pulumi/cloudflare/zeroTrustAccessCustomPage.js").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/zeroTrustAccessGroup.typescript.md}
+     * @see [Pulumi Cloudflare Access Group]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessgroup/}
      */
-    createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessGroupProps): ZeroTrustAccessGroup;
+    createAccessGroup(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessGroupProps): import("@pulumi/cloudflare/zeroTrustAccessGroup.js").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/zeroTrustAccessIdentityProvider.typescript.md}
+     * @see [Pulumi Cloudflare Access Identity Provider]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessidentityprovider/}
      */
-    createAccessIdentityProvider(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessIdentityProviderProps): ZeroTrustAccessIdentityProvider;
+    createAccessIdentityProvider(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessIdentityProviderProps): import("@pulumi/cloudflare/zeroTrustAccessIdentityProvider.js").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/zeroTrustAccessMtlsCertificate.typescript.md}
+     * @see [Pulumi Cloudflare Access Mutual Tls Certificate]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessmtlscertificate/}
      */
-    createAccessMutualTlsCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessMtlsCertificateProps): ZeroTrustAccessMtlsCertificate;
+    createAccessMutualTlsCertificate(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessMtlsCertificateProps): import("@pulumi/cloudflare/zeroTrustAccessMtlsCertificate.js").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/zeroTrustAccessOrganization.typescript.md}
+     * @see [Pulumi Cloudflare Zero Trust Organization]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustorganization/}
      */
-    createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustOrganizationProps): ZeroTrustOrganization;
+    createAccessOrganization(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustOrganizationProps): import("@pulumi/cloudflare/zeroTrustOrganization.js").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/zeroTrustAccessPolicy.typescript.md}
+     * @see [Pulumi Cloudflare Access Policy]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesspolicy/}
      */
-    createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps): ZeroTrustAccessPolicy;
+    createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps): import("@pulumi/cloudflare/zeroTrustAccessPolicy.js").ZeroTrustAccessPolicy;
     /**
      * @summary Method to create a new Cloudflare Application Access Rule
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props access rule properties
-     * @see [CDKTF Access Rule Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessRule.typescript.md}
+     * @see [Pulumi Cloudflare Access Rule]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/accessrule/}
      */
-    createAccessRule(id: string, scope: CommonCloudflareConstruct, props: AccessRuleProps): AccessRule;
+    createAccessRule(id: string, scope: CommonCloudflareConstruct, props: AccessRuleProps): import("@pulumi/cloudflare/accessRule.js").AccessRule;
     /**
      * @summary Method to create a new Cloudflare Application Access Service Token
      * @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/zeroTrustAccessServiceToken.typescript.md}
+     * @see [Pulumi Cloudflare Access Service Token]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessservicetoken/}
      */
-    createAccessServiceToken(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessServiceTokenProps): ZeroTrustAccessServiceToken;
+    createAccessServiceToken(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessServiceTokenProps): import("@pulumi/cloudflare/zeroTrustAccessServiceToken.js").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/zeroTrustAccessTag.typescript.md}
+     * @see [Pulumi Cloudflare Access Tag]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesstag/}
      */
-    createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps): ZeroTrustAccessTag;
+    createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps): import("@pulumi/cloudflare/zeroTrustAccessTag.js").ZeroTrustAccessTag;
 }

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

@@ -1,28 +1,16 @@
-import { AccessRule } from '@cdktf/provider-cloudflare/lib/access-rule/index.js';
-import { ZeroTrustAccessApplication } from '@cdktf/provider-cloudflare/lib/zero-trust-access-application/index.js';
-import { ZeroTrustAccessCustomPage } from '@cdktf/provider-cloudflare/lib/zero-trust-access-custom-page/index.js';
-import { ZeroTrustAccessGroup } from '@cdktf/provider-cloudflare/lib/zero-trust-access-group/index.js';
-import { ZeroTrustAccessIdentityProvider } from '@cdktf/provider-cloudflare/lib/zero-trust-access-identity-provider/index.js';
-import { ZeroTrustAccessMtlsCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-mtls-certificate/index.js';
-import { ZeroTrustAccessPolicy } from '@cdktf/provider-cloudflare/lib/zero-trust-access-policy/index.js';
-import { ZeroTrustAccessServiceToken } from '@cdktf/provider-cloudflare/lib/zero-trust-access-service-token/index.js';
-import { ZeroTrustAccessShortLivedCertificate } from '@cdktf/provider-cloudflare/lib/zero-trust-access-short-lived-certificate/index.js';
-import { ZeroTrustAccessTag } from '@cdktf/provider-cloudflare/lib/zero-trust-access-tag/index.js';
-import { ZeroTrustOrganization } from '@cdktf/provider-cloudflare/lib/zero-trust-organization/index.js';
-import { createCloudflareTfOutput } from '../../utils/index.js';
+import * as cloudflare from '@pulumi/cloudflare';
 /**
  * @classdesc Provides operations on Cloudflare Access
- * - A new instance of this class is injected into {@link CommonCloudflareConstruct} constructor.
- * - If a custom construct extends {@link CommonCloudflareConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonCloudflareComponent} constructor.
+ * - If a custom component extends {@link CommonCloudflareComponent}, an instance is available within the context.
  * @example
  * ```
- * import { CommonCloudflareConstruct, CommonCloudflareConstruct } from '@gradientedge/cdk-utils'
+ * import { CommonCloudflareComponent, CloudflareAccessManager } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends CommonCloudflareConstruct {
- *   constructor(parent: Construct, id: string, props: CommonCloudflareStackProps) {
- *     super(parent, id, props)
- *     this.props = props
- *     this.accessManager.createApiShield('MyAppAccess', this, props)
+ * class CustomComponent extends CommonCloudflareComponent {
+ *   constructor(name: string, args: any, opts?: pulumi.ComponentResourceOptions) {
+ *     super(name, args, opts)
+ *     this.accessManager.createAccessApplication('MyAppAccess', this, props)
  *   }
  * }
  * ```
@@ -33,232 +21,217 @@ 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/zeroTrustAccessApplication.typescript.md}
+     * @see [Pulumi Cloudflare Access Application]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessapplication/}
      */
     createAccessApplication(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 })?.zoneId;
-        const accessApplication = new ZeroTrustAccessApplication(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessApplication(`${id}`, {
             ...props,
             domain: `${props.domain}-${scope.props.domainName}`,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessApplicationFriendlyUniqueId`, scope, accessApplication.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessApplicationId`, scope, accessApplication.id);
-        return accessApplication;
     }
     /**
      * @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 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}
+     * @param props access short lived certificate properties
+     * @see [Pulumi Cloudflare Access Short Lived Certificate]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessshortlivedcertificate/}
      */
     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 })?.zoneId;
-        const accessShortLivedCertificate = new ZeroTrustAccessShortLivedCertificate(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessShortLivedCertificate(`${id}`, {
             ...props,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessShortLivedCertificateFriendlyUniqueId`, scope, accessShortLivedCertificate.friendlyUniqueId);
-        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/zeroTrustAccessCustomPage.typescript.md}
+     * @see [Pulumi Cloudflare Access Custom Page]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesscustompage/}
      */
     createAccessCustomPage(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const accessCustomPage = new ZeroTrustAccessCustomPage(scope, `${id}`, {
+        return new cloudflare.ZeroTrustAccessCustomPage(`${id}`, {
             ...props,
             accountId: props.accountId ?? scope.props.accountId,
             name: `${props.name}-${scope.props.stage}`,
         });
-        createCloudflareTfOutput(`${id}-accessCustomPageFriendlyUniqueId`, scope, accessCustomPage.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessCustomPageId`, scope, accessCustomPage.id);
-        return accessCustomPage;
     }
     /**
      * @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/zeroTrustAccessGroup.typescript.md}
+     * @see [Pulumi Cloudflare Access Group]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessgroup/}
      */
     createAccessGroup(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 })?.zoneId;
-        const accessGroup = new ZeroTrustAccessGroup(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessGroup(`${id}`, {
             ...props,
             name: `${props.name} - ${scope.props.stage.toUpperCase()}`,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessGroupFriendlyUniqueId`, scope, accessGroup.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessGroupId`, scope, accessGroup.id);
-        return accessGroup;
     }
     /**
      * @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/zeroTrustAccessIdentityProvider.typescript.md}
+     * @see [Pulumi Cloudflare Access Identity Provider]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessidentityprovider/}
      */
     createAccessIdentityProvider(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 })?.zoneId;
-        const accessIdentityProvider = new ZeroTrustAccessIdentityProvider(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessIdentityProvider(`${id}`, {
             ...props,
+            config: props.config ?? {},
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessIdentityProviderFriendlyUniqueId`, scope, accessIdentityProvider.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessIdentityProviderId`, scope, accessIdentityProvider.id);
-        return accessIdentityProvider;
     }
     /**
      * @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/zeroTrustAccessMtlsCertificate.typescript.md}
+     * @see [Pulumi Cloudflare Access Mutual Tls Certificate]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessmtlscertificate/}
      */
     createAccessMutualTlsCertificate(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 })?.zoneId;
-        const accessMutualTlsCertificate = new ZeroTrustAccessMtlsCertificate(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessMtlsCertificate(`${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessMutualTlsCertificateFriendlyUniqueId`, scope, accessMutualTlsCertificate.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessMutualTlsCertificateId`, scope, accessMutualTlsCertificate.id);
-        return accessMutualTlsCertificate;
     }
     /**
      * @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/zeroTrustAccessOrganization.typescript.md}
+     * @see [Pulumi Cloudflare Zero Trust Organization]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustorganization/}
      */
     createAccessOrganization(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 })?.zoneId;
-        const accessOrganization = new ZeroTrustOrganization(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustOrganization(`${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessOrganizationFriendlyUniqueId`, scope, accessOrganization.friendlyUniqueId);
-        return accessOrganization;
     }
     /**
      * @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/zeroTrustAccessPolicy.typescript.md}
+     * @see [Pulumi Cloudflare Access Policy]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesspolicy/}
      */
     createAccessPolicy(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const accessPolicy = new ZeroTrustAccessPolicy(scope, `${id}`, {
+        return new cloudflare.ZeroTrustAccessPolicy(`${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             accountId: props.accountId ?? scope.props.accountId,
         });
-        createCloudflareTfOutput(`${id}-accessPolicyFriendlyUniqueId`, scope, accessPolicy.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessPolicyId`, scope, accessPolicy.id);
-        return accessPolicy;
     }
     /**
      * @summary Method to create a new Cloudflare Application Access Rule
      * @param id scoped id of the resource
      * @param scope scope in which this resource is defined
      * @param props access rule properties
-     * @see [CDKTF Access Rule Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/accessRule.typescript.md}
+     * @see [Pulumi Cloudflare Access Rule]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/accessrule/}
      */
     createAccessRule(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 })?.zoneId;
-        const accessRule = new AccessRule(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.AccessRule(`${id}`, {
             ...props,
             zoneId,
             accountId: props.accountId ?? scope.props.accountId,
         });
-        createCloudflareTfOutput(`${id}-accessRuleFriendlyUniqueId`, scope, accessRule.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessRuleId`, scope, accessRule.id);
-        return accessRule;
     }
     /**
      * @summary Method to create a new Cloudflare Application Access Service Token
      * @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/zeroTrustAccessServiceToken.typescript.md}
+     * @see [Pulumi Cloudflare Access Service Token]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccessservicetoken/}
      */
     createAccessServiceToken(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 })?.zoneId;
-        const accessServiceToken = new ZeroTrustAccessServiceToken(scope, `${id}`, {
+            : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
+                filter: { name: scope.props.domainName },
+            })?.id;
+        return new cloudflare.ZeroTrustAccessServiceToken(`${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             accountId: props.accountId ?? scope.props.accountId,
             zoneId,
         });
-        createCloudflareTfOutput(`${id}-accessServiceTokenFriendlyUniqueId`, scope, accessServiceToken.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessServiceTokenId`, scope, accessServiceToken.id);
-        return accessServiceToken;
     }
     /**
      * @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/zeroTrustAccessTag.typescript.md}
+     * @see [Pulumi Cloudflare Access Tag]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/zerotrustaccesstag/}
      */
     createAccessTag(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const accessTag = new ZeroTrustAccessTag(scope, `${id}`, {
+        return new cloudflare.ZeroTrustAccessTag(`${id}`, {
             ...props,
             name: `${props.name}-${scope.props.stage}`,
             accountId: props.accountId ?? scope.props.accountId,
         });
-        createCloudflareTfOutput(`${id}-accessTagFriendlyUniqueId`, scope, accessTag.friendlyUniqueId);
-        createCloudflareTfOutput(`${id}-accessTagId`, scope, accessTag.id);
-        return accessTag;
     }
 }