@gradientedge/cdk-utils 9.89.0 → 10.1.0

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

@@ -1,7 +1,5 @@
-import { ArgoSmartRouting } from '@cdktf/provider-cloudflare/lib/argo-smart-routing/index.js'
-import { ArgoTieredCaching } from '@cdktf/provider-cloudflare/lib/argo-tiered-caching/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { ArgoSmartRoutingProps, ArgoTieredCachingProps } from './types.js'
 
 /**
@@ -23,52 +21,40 @@ import { ArgoSmartRoutingProps, ArgoTieredCachingProps } from './types.js'
  */
 export class CloudflareArgoManager {
   /**
-   * @summary Method to create a new Cloudflare Argo
+   * @summary Method to create a new Cloudflare Argo Smart Routing
    * @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/argoSmartRouting.typescript.md}
+   * @see [Pulumi Cloudflare ArgoSmartRouting]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/argosmartrouting/}
    */
   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 })?.zoneId
-
-    const argoSmartRouting = new ArgoSmartRouting(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.ArgoSmartRouting(`${id}`, {
       ...props,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-argoSmartRoutingFriendlyUniqueId`, scope, argoSmartRouting.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-argoSmartRoutingId`, scope, argoSmartRouting.id)
-
-    return argoSmartRouting
   }
 
   /**
-   * @summary Method to create a new Cloudflare Argo
+   * @summary Method to create a new Cloudflare Argo Tiered Caching
    * @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}
+   * @see [Pulumi Cloudflare ArgoTieredCaching]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/argotieredcaching/}
    */
   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 })?.zoneId
-
-    const argoTieredCaching = new ArgoTieredCaching(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.ArgoTieredCaching(`${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,5 +1,4 @@
-import { ArgoSmartRoutingConfig } from '@cdktf/provider-cloudflare/lib/argo-smart-routing/index.js'
-import { ArgoTieredCachingConfig } from '@cdktf/provider-cloudflare/lib/argo-tiered-caching/index.js'
+import { ArgoSmartRoutingArgs, ArgoTieredCachingArgs } from '@pulumi/cloudflare'
 
-export interface ArgoSmartRoutingProps extends ArgoSmartRoutingConfig {}
-export interface ArgoTieredCachingProps extends ArgoTieredCachingConfig {}
+export interface ArgoSmartRoutingProps extends ArgoSmartRoutingArgs {}
+export interface ArgoTieredCachingProps extends ArgoTieredCachingArgs {}

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

@@ -1,6 +1,5 @@
-import { Filter } from '@cdktf/provider-cloudflare/lib/filter/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { FilterProps } from './types.js'
 
 /**
@@ -15,7 +14,7 @@ import { FilterProps } from './types.js'
  *   constructor(parent: Construct, id: string, props: CommonCloudflareStackProps) {
  *     super(parent, id, props)
  *     this.props = props
- *     this.filterManager.createApiShield('MyFilter', this, props)
+ *     this.filterManager.createFilter('MyFilter', this, props)
  *   }
  * }
  * ```
@@ -26,23 +25,17 @@ export class CloudflareFilterManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props filter properties
-   * @see [CDKTF Filter Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/filter.typescript.md}
+   * @see [Pulumi Cloudflare Filter]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/filter/}
    */
-  public createApiShield(id: string, scope: CommonCloudflareConstruct, props: FilterProps) {
+  public createFilter(id: string, scope: CommonCloudflareConstruct, props: FilterProps) {
     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 filter = new Filter(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.Filter(`${id}`, {
       ...props,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-filterFriendlyUniqueId`, scope, filter.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-filterId`, scope, filter.id)
-
-    return filter
   }
 }

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

@@ -1,3 +1,3 @@
-import { FilterConfig } from '@cdktf/provider-cloudflare/lib/filter/index.js'
+import { FilterArgs } from '@pulumi/cloudflare'
 
-export interface FilterProps extends FilterConfig {}
+export interface FilterProps extends FilterArgs {}

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

@@ -1,6 +1,5 @@
-import { FirewallRule } from '@cdktf/provider-cloudflare/lib/firewall-rule/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { FirewallRuleProps } from './types.js'
 
 /**
@@ -26,23 +25,17 @@ export class CloudflareFirewallManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props firewall rule properties
-   * @see [CDKTF Firewall Rule Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/firewallRule.typescript.md}
+   * @see [Pulumi Cloudflare Firewall Rule]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/firewallrule/}
    */
   public createFirewallRule(id: string, scope: CommonCloudflareConstruct, props: FirewallRuleProps) {
     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 firewallRule = new FirewallRule(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.FirewallRule(`${id}`, {
       ...props,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-firewallRuleFriendlyUniqueId`, scope, firewallRule.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-firewallRuleId`, scope, firewallRule.id)
-
-    return firewallRule
   }
 }

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

@@ -1,3 +1,3 @@
-import { FirewallRuleConfig } from '@cdktf/provider-cloudflare/lib/firewall-rule/index.js'
+import { FirewallRuleArgs } from '@pulumi/cloudflare'
 
-export interface FirewallRuleProps extends FirewallRuleConfig {}
+export interface FirewallRuleProps extends FirewallRuleArgs {}

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

@@ -1,9 +1,6 @@
-import { PageRule } from '@cdktf/provider-cloudflare/lib/page-rule/index.js'
-import { PagesDomain } from '@cdktf/provider-cloudflare/lib/pages-domain/index.js'
-import { PagesProject } from '@cdktf/provider-cloudflare/lib/pages-project/index.js'
-import { LocalExec, Provider } from 'cdktf-local-exec'
+import * as cloudflare from '@pulumi/cloudflare'
+import { local } from '@pulumi/command'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { PageRuleProps, PagesDomainProps, PagesProjectDeployProps, PagesProjectProps } from './types.js'
 
 /**
@@ -29,21 +26,16 @@ export class CloudflarePageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props pages project properties
-   * @see [CDKTF Pages Project Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/pagesProject.typescript.md}
+   * @see [Pulumi Cloudflare Pages Project]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/pagesproject/}
    */
   public createPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const pagesProject = new PagesProject(scope, `${id}`, {
+    return new cloudflare.PagesProject(`${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       name: `${props.name}-${scope.props.stage}`,
     })
-
-    createCloudflareTfOutput(`${id}-pagesProjectFriendlyUniqueId`, scope, pagesProject.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-pagesProjectId`, scope, pagesProject.id)
-
-    return pagesProject
   }
 
   /**
@@ -51,21 +43,16 @@ export class CloudflarePageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props pages domain properties
-   * @see [CDKTF Pages Domain Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/pagesDomain.typescript.md}
+   * @see [Pulumi Cloudflare Pages Domain]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/pagesdomain/}
    */
   public createPagesDomain(id: string, scope: CommonCloudflareConstruct, props: PagesDomainProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const pagesDomain = new PagesDomain(scope, `${id}`, {
+    return new cloudflare.PagesDomain(`${id}`, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       name: props.name ?? scope.props.domainName,
     })
-
-    createCloudflareTfOutput(`${id}-pagesDomainFriendlyUniqueId`, scope, pagesDomain.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-pagesDomainId`, scope, pagesDomain.id)
-
-    return pagesDomain
   }
 
   /**
@@ -73,37 +60,33 @@ export class CloudflarePageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props page rule properties
-   * @see [CDKTF Page Rule Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/pageRule.typescript.md}
+   * @see [Pulumi Cloudflare Page Rule]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/pagerule/}
    */
   public createPageRule(id: string, scope: CommonCloudflareConstruct, props: PageRuleProps) {
     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 pageRule = new PageRule(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.PageRule(`${id}`, {
       ...props,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-pageRuleFriendlyUniqueId`, scope, pageRule.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-pageRuleId`, scope, pageRule.id)
-
-    return pageRule
   }
 
   public deployPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectDeployProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    new Provider(scope, `${id}`)
     const message = process.env.BUILD_NUMBER ?? props.message
-    const deployment = new LocalExec(scope, `${id}-deploy-${new Date().toISOString()}`, {
-      command: `CLOUDFLARE_ACCOUNT_ID=${scope.props.accountId} CLOUDFLARE_API_TOKEN=${scope.props.apiToken} npx wrangler pages deploy ${props.directory} --project-name=${props.projectName} --branch=${props.branch} --commit-message=${message}`,
-      cwd: '',
-      dependsOn: props.dependsOn,
-    })
-
-    return deployment
+    return new local.Command(
+      `${id}-deploy-${new Date().toISOString()}`,
+      {
+        create: `CLOUDFLARE_ACCOUNT_ID=${scope.props.accountId} CLOUDFLARE_API_TOKEN=${scope.props.apiToken} npx wrangler pages deploy ${props.directory} --project-name=${props.projectName} --branch=${props.branch} --commit-message=${message}`,
+        dir: '',
+      },
+      {
+        dependsOn: props.dependsOn,
+      }
+    )
   }
 }

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

@@ -1,10 +1,8 @@
-import { PageRuleConfig } from '@cdktf/provider-cloudflare/lib/page-rule/index.js'
-import { PagesDomainConfig } from '@cdktf/provider-cloudflare/lib/pages-domain/index.js'
-import { PagesProjectConfig } from '@cdktf/provider-cloudflare/lib/pages-project/index.js'
+import { PageRuleArgs, PagesDomainArgs, PagesProjectArgs } from '@pulumi/cloudflare'
 
-export interface PagesProjectProps extends PagesProjectConfig {}
-export interface PagesDomainProps extends PagesDomainConfig {}
-export interface PageRuleProps extends PageRuleConfig {}
+export interface PagesProjectProps extends PagesProjectArgs {}
+export interface PagesDomainProps extends PagesDomainArgs {}
+export interface PageRuleProps extends PageRuleArgs {}
 export interface PagesProjectDeployProps {
   branch: string
   directory: string

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

@@ -1,6 +1,5 @@
-import { DnsRecord } from '@cdktf/provider-cloudflare/lib/dns-record/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { DnsRecordProps } from './types.js'
 
 /**
@@ -26,23 +25,17 @@ export class CloudflareRecordManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props record properties
-   * @see [CDKTF Record Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/dnsRecord.typescript.md}
+   * @see [Pulumi Cloudflare Record]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/record/}
    */
   public createRecord(id: string, scope: CommonCloudflareConstruct, props: DnsRecordProps) {
     if (!props) throw `Props undefined for ${id}`
 
     const zoneId = props.zoneId
       ? props.zoneId
-      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
-
-    const record = new DnsRecord(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.DnsRecord(id, {
       ...props,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-recordFriendlyUniqueId`, scope, record.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-recordId`, scope, record.id)
-
-    return record
   }
 }

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

@@ -1,3 +1,3 @@
-import { DnsRecordConfig } from '@cdktf/provider-cloudflare/lib/dns-record/index.js'
+import { DnsRecordArgs } from '@pulumi/cloudflare'
 
-export interface DnsRecordProps extends DnsRecordConfig {}
+export interface DnsRecordProps extends DnsRecordArgs {}

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

@@ -1,6 +1,5 @@
-import { Ruleset } from '@cdktf/provider-cloudflare/lib/ruleset/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import { RulesetProps } from './types.js'
 
 /**
@@ -9,11 +8,11 @@ import { RulesetProps } from './types.js'
  * - If a custom construct extends {@link CommonCloudflareConstruct}, an instance is available within the context.
  * @example
  * ```
- * import { CommonCloudflareConstruct, CommonCloudflareConstruct } from '@gradientedge/cdk-utils'
+ * import { CommonCloudflareConstruct } from '@gradientedge/cdk-utils'
  *
  * class CustomConstruct extends CommonCloudflareConstruct {
- *   constructor(parent: Construct, id: string, props: CommonCloudflareStackProps) {
- *     super(parent, id, props)
+ *   constructor(parent: pulumi.ComponentResource, name: string, props: CommonCloudflareStackProps) {
+ *     super(parent, name, props)
  *     this.props = props
  *     this.ruleSetManager.createRuleSet('MyRule', this, props)
  *   }
@@ -26,23 +25,19 @@ export class CloudflareRuleSetManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props rule set properties
-   * @see [CDKTF Ruleset Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/ruleset.typescript.md}
+   * @see [Pulumi Cloudflare Ruleset]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/ruleset/}
    */
   public createRuleSet(id: string, scope: CommonCloudflareConstruct, props: RulesetProps) {
     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 ruleSet = new Ruleset(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    const ruleSet = new cloudflare.Ruleset(`${id}`, {
       ...props,
       zoneId,
     })
 
-    createCloudflareTfOutput(`${id}-ruleSetFriendlyUniqueId`, scope, ruleSet.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-ruleSetId`, scope, ruleSet.id)
-
     return ruleSet
   }
 }

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

@@ -1,3 +1,3 @@
-import { RulesetConfig } from '@cdktf/provider-cloudflare/lib/ruleset/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 
-export interface RulesetProps extends RulesetConfig {}
+export interface RulesetProps extends cloudflare.RulesetArgs {}

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

@@ -1,11 +1,5 @@
-import { WorkersCronTrigger } from '@cdktf/provider-cloudflare/lib/workers-cron-trigger/index.js'
-import { WorkersCustomDomain } from '@cdktf/provider-cloudflare/lib/workers-custom-domain/index.js'
-import { WorkersKvNamespace } from '@cdktf/provider-cloudflare/lib/workers-kv-namespace/index.js'
-import { WorkersKv } from '@cdktf/provider-cloudflare/lib/workers-kv/index.js'
-import { WorkersRoute } from '@cdktf/provider-cloudflare/lib/workers-route/index.js'
-import { WorkersScript } from '@cdktf/provider-cloudflare/lib/workers-script/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import {
   WorkerCronTriggerProps,
   WorkerDomainProps,
@@ -38,25 +32,19 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props worker domain properties
-   * @see [CDKTF Worker Domain Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersCustomDomain.typescript.md}
+   * @see [Pulumi Worker Domain]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workercustomdomain/}
    */
   public createWorkerDomain(id: string, scope: CommonCloudflareConstruct, props: WorkerDomainProps) {
     if (!props) throw `Props undefined for ${id}`
 
     const zoneId = props.zoneId
       ? props.zoneId
-      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
-
-    const workerDomain = new WorkersCustomDomain(scope, `${id}`, {
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
+    return new cloudflare.WorkersCustomDomain(id, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-workerDomainFriendlyUniqueId`, scope, workerDomain.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workerDomainId`, scope, workerDomain.id)
-
-    return workerDomain
   }
 
   /**
@@ -64,25 +52,20 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props worker route properties
-   * @see [CDKTF Worker Route Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersRoute.typescript.md}
+   * @see [Pulumi Worker Route]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workerroute/}
    */
   public createWorkerRoute(id: string, scope: CommonCloudflareConstruct, props: WorkerRouteProps) {
     if (!props) throw `Props undefined for ${id}`
 
     const zoneId = props.zoneId
       ? props.zoneId
-      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
+      : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
 
-    const workerRoute = new WorkersRoute(scope, `${id}`, {
+    return new cloudflare.WorkersRoute(id, {
       ...props,
       script: `${props.script}-${scope.props.stage}`,
       zoneId,
     })
-
-    createCloudflareTfOutput(`${id}-workerRouteFriendlyUniqueId`, scope, workerRoute.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workerRouteId`, scope, workerRoute.id)
-
-    return workerRoute
   }
 
   /**
@@ -90,21 +73,16 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props worker script properties
-   * @see [CDKTF Worker Script Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersScript.typescript.md}
+   * @see [Pulumi Worker Script]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workerscript/}
    */
   public createWorkerScript(id: string, scope: CommonCloudflareConstruct, props: WorkerScriptProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workerScript = new WorkersScript(scope, `${id}`, {
+    return new cloudflare.WorkersScript(id, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       scriptName: `${props.scriptName}-${scope.props.stage}`,
     })
-
-    createCloudflareTfOutput(`${id}-workerScriptFriendlyUniqueId`, scope, workerScript.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workerScriptId`, scope, workerScript.id)
-
-    return workerScript
   }
 
   /**
@@ -112,21 +90,16 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props workers kv namespace properties
-   * @see [CDKTF Workers KV Namespace Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersKvNamespace.typescript.md}
+   * @see [Pulumi Workers KV Namespace]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workerskvnamespace/}
    */
   public createWorkersKvNamespace(id: string, scope: CommonCloudflareConstruct, props: WorkersKvNamespaceProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workersKvNamespace = new WorkersKvNamespace(scope, `${id}`, {
+    return new cloudflare.WorkersKvNamespace(id, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
       title: scope.isProductionStage() ? props.title : `${props.title}-${scope.props.stage}`,
     })
-
-    createCloudflareTfOutput(`${id}-workersKvNamespaceFriendlyUniqueId`, scope, workersKvNamespace.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workersKvNamespaceId`, scope, workersKvNamespace.id)
-
-    return workersKvNamespace
   }
 
   /**
@@ -134,20 +107,15 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props workers kv properties
-   * @see [CDKTF Workers KV Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersKv.typescript.md}
+   * @see [Pulumi Workers KV]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workerskv/}
    */
   public createWorkersKv(id: string, scope: CommonCloudflareConstruct, props: WorkersKvProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workersKv = new WorkersKv(scope, `${id}`, {
+    return new cloudflare.WorkersKv(id, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
     })
-
-    createCloudflareTfOutput(`${id}-workersKvFriendlyUniqueId`, scope, workersKv.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workersKvId`, scope, workersKv.id)
-
-    return workersKv
   }
 
   /**
@@ -155,19 +123,14 @@ export class CloudflareWorkerManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props workers cron trigger properties
-   * @see [CDKTF Workers Cron Trigger Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/workersCronTrigger.typescript.md}
+   * @see [Pulumi Workers Cron Trigger]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/workercrontrigger/}
    */
   public createWorkerCronTrigger(id: string, scope: CommonCloudflareConstruct, props: WorkerCronTriggerProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const workerCronTrigger = new WorkersCronTrigger(scope, `${id}`, {
+    return new cloudflare.WorkersCronTrigger(id, {
       ...props,
       accountId: props.accountId ?? scope.props.accountId,
     })
-
-    createCloudflareTfOutput(`${id}-workerCronTriggerFriendlyUniqueId`, scope, workerCronTrigger.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-workerCronTriggerId`, scope, workerCronTrigger.id)
-
-    return workerCronTrigger
   }
 }

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

@@ -1,13 +1,15 @@
-import { WorkersCronTriggerConfig } from '@cdktf/provider-cloudflare/lib/workers-cron-trigger/index.js'
-import { WorkersCustomDomainConfig } from '@cdktf/provider-cloudflare/lib/workers-custom-domain/index.js'
-import { WorkersRouteConfig } from '@cdktf/provider-cloudflare/lib/workers-route/index.js'
-import { WorkersScriptConfig } from '@cdktf/provider-cloudflare/lib/workers-script/index.js'
-import { WorkersKvConfig } from '@cdktf/provider-cloudflare/lib/workers-kv/index.js'
-import { WorkersKvNamespaceConfig } from '@cdktf/provider-cloudflare/lib/workers-kv-namespace/index.js'
+import {
+  WorkersCronTriggerArgs,
+  WorkersCustomDomainArgs,
+  WorkersKvArgs,
+  WorkersKvNamespaceArgs,
+  WorkersRouteArgs,
+  WorkersScriptArgs,
+} from '@pulumi/cloudflare'
 
-export interface WorkerDomainProps extends WorkersCustomDomainConfig {}
-export interface WorkerRouteProps extends WorkersRouteConfig {}
-export interface WorkerScriptProps extends WorkersScriptConfig {}
-export interface WorkersKvNamespaceProps extends WorkersKvNamespaceConfig {}
-export interface WorkersKvProps extends WorkersKvConfig {}
-export interface WorkerCronTriggerProps extends WorkersCronTriggerConfig {}
+export interface WorkerDomainProps extends WorkersCustomDomainArgs {}
+export interface WorkerRouteProps extends WorkersRouteArgs {}
+export interface WorkerScriptProps extends WorkersScriptArgs {}
+export interface WorkersKvNamespaceProps extends WorkersKvNamespaceArgs {}
+export interface WorkersKvProps extends WorkersKvArgs {}
+export interface WorkerCronTriggerProps extends WorkersCronTriggerArgs {}