@gradientedge/cdk-utils 9.89.0 → 10.1.0

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

@@ -1,35 +1,27 @@
-import { DataCloudflareZone } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone/index.js'
-import { ZoneCacheReserve } from '@cdktf/provider-cloudflare/lib/zone-cache-reserve/index.js'
-import { ZoneCacheVariants } from '@cdktf/provider-cloudflare/lib/zone-cache-variants/index.js'
-import { ZoneDnsSettings } from '@cdktf/provider-cloudflare/lib/zone-dns-settings/index.js'
-import { ZoneDnssec } from '@cdktf/provider-cloudflare/lib/zone-dnssec/index.js'
-import { ZoneHold } from '@cdktf/provider-cloudflare/lib/zone-hold/index.js'
-import { ZoneLockdown } from '@cdktf/provider-cloudflare/lib/zone-lockdown/index.js'
-import { ZoneSetting } from '@cdktf/provider-cloudflare/lib/zone-setting/index.js'
-import { Zone } from '@cdktf/provider-cloudflare/lib/zone/index.js'
+import * as cloudflare from '@pulumi/cloudflare'
+import * as pulumi from '@pulumi/pulumi'
 import { CommonCloudflareConstruct } from '../../common/index.js'
-import { createCloudflareTfOutput } from '../../utils/index.js'
 import {
+  GetZoneProps,
   ZoneCacheReserveProps,
   ZoneCacheVariantsProps,
   ZoneDnssecProps,
   ZoneHoldProps,
   ZoneLockdownProps,
-  ZoneOptions,
   ZoneProps,
   ZoneSettingProps,
 } from './types.js'
 
 /**
- * @classdesc Provides operations on Cloudflare Zone
+ * @classdesc Provides operations on Cloudflare Zone using Pulumi
  * - 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.
  * @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) {
+ *   constructor(parent: pulumi.ComponentResource, id: string, props: CommonCloudflareStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.zoneManager.createZone('MyZone', this, props)
@@ -43,35 +35,20 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone properties
-   * @see [CDKTF Zone Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zone.typescript.md}
    */
   public createZone(id: string, scope: CommonCloudflareConstruct, props: ZoneProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zone = new Zone(scope, `${id}`, {
+    return new cloudflare.Zone(id, {
       ...props,
-      account: {
-        id: props.account.id ?? scope.props.accountId,
-      },
-      name: props.name ?? scope.props.domainName,
+      account: props.account ?? scope.props.accountId,
+      name: scope.props.domainName,
     })
-
-    createCloudflareTfOutput(`${id}-zoneName`, scope, zone.name)
-    createCloudflareTfOutput(`${id}-zoneFriendlyUniqueId`, scope, zone.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneId`, scope, zone.id)
-
-    return zone
   }
 
-  public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: ZoneOptions) {
-    const zone = new DataCloudflareZone(scope, `${id}-data-zone`, {
-      filter: {
-        name: options?.name ?? scope.props.domainName,
-      },
-      zoneId: options?.zoneId,
-    })
-
-    return zone
+  public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: GetZoneProps) {
+    const name = options?.filter?.name ?? scope.props.domainName
+    return cloudflare.Zone.get(name, id)
   }
 
   /**
@@ -79,24 +56,17 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone cache reserve properties
-   * @see [CDKTF Zone Cache Reserve Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneCacheReserve.typescript.md}
    */
   public createZoneCacheReserve(id: string, scope: CommonCloudflareConstruct, props: ZoneCacheReserveProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-
-    const zoneCacheReserve = new ZoneCacheReserve(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneCacheReserveFriendlyUniqueId`, scope, zoneCacheReserve.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneCacheReserveId`, scope, zoneCacheReserve.id)
-
-    return zoneCacheReserve
   }
 
   /**
@@ -104,23 +74,17 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone cache variants properties
-   * @see [CDKTF Zone Cache Variants Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneCacheVariants.typescript.md}
    */
   public createZoneCacheVariants(id: string, scope: CommonCloudflareConstruct, props: ZoneCacheVariantsProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneCacheVariants = new ZoneCacheVariants(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneCacheVariantsFriendlyUniqueId`, scope, zoneCacheVariants.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneCacheVariantsId`, scope, zoneCacheVariants.id)
-
-    return zoneCacheVariants
   }
 
   /**
@@ -128,23 +92,17 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone dnssec properties
-   * @see [CDKTF Zone DNS Security Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneDnssec.typescript.md}
    */
   public createZoneDnssec(id: string, scope: CommonCloudflareConstruct, props: ZoneDnssecProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneDnssec = new ZoneDnssec(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneDnssecFriendlyUniqueId`, scope, zoneDnssec.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneDnssecId`, scope, zoneDnssec.id)
-
-    return zoneDnssec
   }
 
   /**
@@ -152,23 +110,17 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone hold properties
-   * @see [CDKTF Zone Hold Security Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneHold.typescript.md}
    */
   public createZoneHold(id: string, scope: CommonCloudflareConstruct, props: ZoneHoldProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneHold = new ZoneHold(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneHoldFriendlyUniqueId`, scope, zoneHold.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneHoldId`, scope, zoneHold.id)
-
-    return zoneHold
   }
 
   /**
@@ -176,23 +128,17 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone lockdown properties
-   * @see [CDKTF Zone Lockdown Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneLockdown.typescript.md}
    */
   public createZoneLockdown(id: string, scope: CommonCloudflareConstruct, props: ZoneLockdownProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneLockdown = new ZoneLockdown(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneLockdownFriendlyUniqueId`, scope, zoneLockdown.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneLockdownId`, scope, zoneLockdown.id)
-
-    return zoneLockdown
   }
 
   /**
@@ -200,21 +146,18 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone dns settings properties
-   * @see [CDKTF Zone Dns Settings Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/dnsZoneSettings.typescript.md}
    */
   public createZoneDnsSettings(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneDnsSettings = new ZoneDnsSettings(scope, `${id}`, {
+    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,
     })
 
-    createCloudflareTfOutput(`${id}-zoneDnsSettingsFriendlyUniqueId`, scope, zoneDnsSettings.friendlyUniqueId)
-
     return zoneDnsSettings
   }
 
@@ -223,22 +166,16 @@ export class CloudflareZoneManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props zone setting properties
-   * @see [CDKTF Zone Setting Module]{@link https://github.com/cdktf/cdktf-provider-cloudflare/blob/main/docs/zoneSetting.typescript.md}
    */
   public createZoneSetting(id: string, scope: CommonCloudflareConstruct, props: ZoneSettingProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const zoneId = props.zoneId
-      ? props.zoneId
-      : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
-    const zoneSetting = new ZoneSetting(scope, `${id}`, {
+    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,
     })
-
-    createCloudflareTfOutput(`${id}-zoneSettingFriendlyUniqueId`, scope, zoneSetting.friendlyUniqueId)
-    createCloudflareTfOutput(`${id}-zoneSettingId`, scope, zoneSetting.id)
-
-    return zoneSetting
   }
 }

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

@@ -1,22 +1,21 @@
-import { ZoneConfig } from '@cdktf/provider-cloudflare/lib/zone/index.js'
-import { ZoneCacheReserveConfig } from '@cdktf/provider-cloudflare/lib/zone-cache-reserve/index.js'
-import { ZoneCacheVariantsConfig } from '@cdktf/provider-cloudflare/lib/zone-cache-variants/index.js'
-import { ZoneDnssecConfig } from '@cdktf/provider-cloudflare/lib/zone-dnssec/index.js'
-import { ZoneHoldConfig } from '@cdktf/provider-cloudflare/lib/zone-hold/index.js'
-import { ZoneLockdownConfig } from '@cdktf/provider-cloudflare/lib/zone-lockdown/index.js'
-import { ZoneSettingConfig } from '@cdktf/provider-cloudflare/lib/zone-setting/index.js'
-import { ZoneDnsSettingsConfig } from '@cdktf/provider-cloudflare/lib/zone-dns-settings/index.js'
-import { DataCloudflareZoneConfig } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone/index.js'
+import {
+  GetZoneArgs,
+  ZoneArgs,
+  ZoneCacheReserveArgs,
+  ZoneCacheVariantsArgs,
+  ZoneDnssecArgs,
+  ZoneDnsSettingsArgs,
+  ZoneHoldArgs,
+  ZoneLockdownArgs,
+  ZoneSettingArgs,
+} from '@pulumi/cloudflare'
 
-export interface ZoneProps extends ZoneConfig {}
-export interface ZoneOptions extends DataCloudflareZoneConfig {
-  id?: string
-  name?: string
-}
-export interface ZoneCacheReserveProps extends ZoneCacheReserveConfig {}
-export interface ZoneCacheVariantsProps extends ZoneCacheVariantsConfig {}
-export interface ZoneDnssecProps extends ZoneDnssecConfig {}
-export interface ZoneHoldProps extends ZoneHoldConfig {}
-export interface ZoneLockdownProps extends ZoneLockdownConfig {}
-export interface ZoneSettingProps extends ZoneSettingConfig {}
-export interface ZoneDnsSettingsProps extends ZoneDnsSettingsConfig {}
+export interface ZoneProps extends ZoneArgs {}
+export interface GetZoneProps extends GetZoneArgs {}
+export interface ZoneCacheReserveProps extends ZoneCacheReserveArgs {}
+export interface ZoneCacheVariantsProps extends ZoneCacheVariantsArgs {}
+export interface ZoneDnssecProps extends ZoneDnssecArgs {}
+export interface ZoneHoldProps extends ZoneHoldArgs {}
+export interface ZoneLockdownProps extends ZoneLockdownArgs {}
+export interface ZoneSettingProps extends ZoneSettingArgs {}
+export interface ZoneDnsSettingsProps extends ZoneDnsSettingsArgs {}

package/src/lib/common/types.ts

@@ -1,4 +1,7 @@
+import { ComponentResourceOptions } from '@pulumi/pulumi'
+
 export interface BaseProps {
+  debug?: boolean
   domainName: string
   extraContexts?: string[]
   name: string
@@ -7,3 +10,5 @@ export interface BaseProps {
   stageContextPath?: string
   subDomain?: string
 }
+
+export interface BaseOptions extends ComponentResourceOptions {}

package/dist/src/lib/cloudflare/common/constants.d.ts

@@ -1,5 +0,0 @@
-export declare enum RemoteBackend {
-    local = "local",
-    s3 = "s3",
-    azurerm = "azurerm"
-}

package/dist/src/lib/cloudflare/common/constants.js

@@ -1,6 +0,0 @@
-export var RemoteBackend;
-(function (RemoteBackend) {
-    RemoteBackend["local"] = "local";
-    RemoteBackend["s3"] = "s3";
-    RemoteBackend["azurerm"] = "azurerm";
-})(RemoteBackend || (RemoteBackend = {}));

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

@@ -1,3 +0,0 @@
-import { TerraformOutput } from 'cdktf';
-import { CommonCloudflareConstruct } from '../common/index.js';
-export declare const createCloudflareTfOutput: (id: string, scope: CommonCloudflareConstruct, value?: string, description?: string, sensitive?: boolean, overrideId?: boolean) => TerraformOutput;

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

@@ -1,13 +0,0 @@
-import { TerraformOutput } from 'cdktf';
-import _ from 'lodash';
-export const createCloudflareTfOutput = (id, scope, value, description, sensitive, overrideId = true) => {
-    const output = new TerraformOutput(scope, id, {
-        description,
-        sensitive,
-        value,
-    });
-    if (overrideId) {
-        output.overrideLogicalId(_.camelCase(id));
-    }
-    return output;
-};

package/src/lib/cloudflare/common/constants.ts

@@ -1,5 +0,0 @@
-export enum RemoteBackend {
-  local = 'local',
-  s3 = 's3',
-  azurerm = 'azurerm',
-}

package/src/lib/cloudflare/utils/index.ts

@@ -1,23 +0,0 @@
-import { TerraformOutput } from 'cdktf'
-import _ from 'lodash'
-import { CommonCloudflareConstruct } from '../common/index.js'
-
-export const createCloudflareTfOutput = (
-  id: string,
-  scope: CommonCloudflareConstruct,
-  value?: string,
-  description?: string,
-  sensitive?: boolean,
-  overrideId = true
-) => {
-  const output = new TerraformOutput(scope, id, {
-    description,
-    sensitive,
-    value,
-  })
-
-  if (overrideId) {
-    output.overrideLogicalId(_.camelCase(id))
-  }
-  return output
-}