@gradientedge/cdk-utils 10.2.0 → 10.3.0

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

@@ -1,4 +1,11 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  WorkersCronTrigger,
+  WorkersCustomDomain,
+  WorkersKv,
+  WorkersKvNamespace,
+  WorkersRoute,
+  WorkersScript,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
   WorkerCronTriggerProps,
@@ -40,11 +47,15 @@ export class CloudflareWorkerManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : 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,
-    })
+    return new WorkersCustomDomain(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -61,11 +72,15 @@ export class CloudflareWorkerManager {
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
 
-    return new cloudflare.WorkersRoute(id, {
-      ...props,
-      script: `${props.script}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new WorkersRoute(
+      id,
+      {
+        ...props,
+        script: `${props.script}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -78,11 +93,15 @@ export class CloudflareWorkerManager {
   public createWorkerScript(id: string, scope: CommonCloudflareConstruct, props: WorkerScriptProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersScript(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      scriptName: `${props.scriptName}-${scope.props.stage}`,
-    })
+    return new WorkersScript(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        scriptName: `${props.scriptName}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -95,11 +114,15 @@ export class CloudflareWorkerManager {
   public createWorkersKvNamespace(id: string, scope: CommonCloudflareConstruct, props: WorkersKvNamespaceProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersKvNamespace(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      title: scope.isProductionStage() ? props.title : `${props.title}-${scope.props.stage}`,
-    })
+    return new WorkersKvNamespace(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        title: scope.isProductionStage() ? props.title : `${props.title}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -112,10 +135,14 @@ export class CloudflareWorkerManager {
   public createWorkersKv(id: string, scope: CommonCloudflareConstruct, props: WorkersKvProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersKv(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new WorkersKv(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -128,9 +155,13 @@ export class CloudflareWorkerManager {
   public createWorkerCronTrigger(id: string, scope: CommonCloudflareConstruct, props: WorkerCronTriggerProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersCronTrigger(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new WorkersCronTrigger(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,12 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  Zone,
+  ZoneCacheReserve,
+  ZoneCacheVariants,
+  ZoneDnssec,
+  ZoneHold,
+  ZoneLockdown,
+  ZoneSetting,
+} from '@pulumi/cloudflare'
 import * as pulumi from '@pulumi/pulumi'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
@@ -39,16 +47,20 @@ export class CloudflareZoneManager {
   public createZone(id: string, scope: CommonCloudflareConstruct, props: ZoneProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.Zone(id, {
-      ...props,
-      account: props.account ?? scope.props.accountId,
-      name: scope.props.domainName,
-    })
+    return new Zone(
+      id,
+      {
+        ...props,
+        account: props.account ?? scope.props.accountId,
+        name: scope.props.domainName,
+      },
+      { parent: scope }
+    )
   }
 
   public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: GetZoneProps) {
     const name = options?.filter?.name ?? scope.props.domainName
-    return cloudflare.Zone.get(name, id)
+    return Zone.get(name, id)
   }
 
   /**
@@ -63,10 +75,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneCacheReserve(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneCacheReserve(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -81,10 +97,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneCacheVariants(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneCacheVariants(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -99,10 +119,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneDnssec(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneDnssec(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -117,10 +141,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneHold(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneHold(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -135,10 +163,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneLockdown(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneLockdown(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -153,10 +185,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    const zoneDnsSettings = new cloudflare.ZoneSetting(id, {
-      ...props,
-      zoneId,
-    })
+    const zoneDnsSettings = new ZoneSetting(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
 
     return zoneDnsSettings
   }
@@ -173,9 +209,13 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneSetting(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneSetting(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }