@gradientedge/cdk-utils 10.2.0 → 10.3.0

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

@@ -1,4 +1,16 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  AccessRule,
+  ZeroTrustAccessApplication,
+  ZeroTrustAccessCustomPage,
+  ZeroTrustAccessGroup,
+  ZeroTrustAccessIdentityProvider,
+  ZeroTrustAccessMtlsCertificate,
+  ZeroTrustAccessPolicy,
+  ZeroTrustAccessServiceToken,
+  ZeroTrustAccessShortLivedCertificate,
+  ZeroTrustAccessTag,
+  ZeroTrustOrganization,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/construct.js'
 import {
   AccessRuleProps,
@@ -47,12 +59,16 @@ export class CloudflareAccessManager {
           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,
-    })
+    return new ZeroTrustAccessApplication(
+      `${id}`,
+      {
+        ...props,
+        domain: `${props.domain}-${scope.props.domainName}`,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -75,10 +91,14 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessShortLivedCertificate(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ZeroTrustAccessShortLivedCertificate(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -91,11 +111,15 @@ export class CloudflareAccessManager {
   public createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessCustomPage(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: `${props.name}-${scope.props.stage}`,
-    })
+    return new ZeroTrustAccessCustomPage(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: `${props.name}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -114,11 +138,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessGroup(`${id}`, {
-      ...props,
-      name: `${props.name} - ${scope.props.stage.toUpperCase()}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessGroup(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name} - ${scope.props.stage.toUpperCase()}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -141,12 +169,16 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessIdentityProvider(`${id}`, {
-      ...props,
-      config: props.config ?? {},
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessIdentityProvider(
+      `${id}`,
+      {
+        ...props,
+        config: props.config ?? {},
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -169,11 +201,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessMtlsCertificate(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessMtlsCertificate(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -192,11 +228,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustOrganization(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustOrganization(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -209,11 +249,15 @@ export class CloudflareAccessManager {
   public createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessPolicy(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new ZeroTrustAccessPolicy(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -232,11 +276,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.AccessRule(`${id}`, {
-      ...props,
-      zoneId,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new AccessRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -259,12 +307,16 @@ export class CloudflareAccessManager {
           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,
-    })
+    return new ZeroTrustAccessServiceToken(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -277,10 +329,14 @@ export class CloudflareAccessManager {
   public createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessTag(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new ZeroTrustAccessTag(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 }

package/src/lib/cloudflare/services/api-shield/main.ts

@@ -1,4 +1,10 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  ApiShield,
+  ApiShieldOperation,
+  ApiShieldOperationSchemaValidationSettings,
+  ApiShieldSchema,
+  ApiShieldSchemaValidationSettings,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
   ApiShieldOperationProps,
@@ -39,10 +45,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShield(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShield(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -58,11 +68,15 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldSchema(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ApiShieldSchema(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -82,10 +96,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldSchemaValidationSettings(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldSchemaValidationSettings(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -101,10 +119,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldOperation(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldOperation(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -124,9 +146,13 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldOperationSchemaValidationSettings(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldOperationSchemaValidationSettings(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { ArgoSmartRouting, ArgoTieredCaching } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { ArgoSmartRoutingProps, ArgoTieredCachingProps } from './types.js'
 
@@ -33,10 +33,14 @@ export class CloudflareArgoManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ArgoSmartRouting(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ArgoSmartRouting(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -52,9 +56,13 @@ export class CloudflareArgoManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ArgoTieredCaching(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ArgoTieredCaching(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { Filter } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { FilterProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareFilterManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.Filter(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new Filter(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { FirewallRule } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { FirewallRuleProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareFirewallManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.FirewallRule(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new FirewallRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { PageRule, PagesDomain, PagesProject } from '@pulumi/cloudflare'
 import { local } from '@pulumi/command'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { PageRuleProps, PagesDomainProps, PagesProjectDeployProps, PagesProjectProps } from './types.js'
@@ -31,11 +31,15 @@ export class CloudflarePageManager {
   public createPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.PagesProject(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: `${props.name}-${scope.props.stage}`,
-    })
+    return new PagesProject(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: `${props.name}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -48,11 +52,15 @@ export class CloudflarePageManager {
   public createPagesDomain(id: string, scope: CommonCloudflareConstruct, props: PagesDomainProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.PagesDomain(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: props.name ?? scope.props.domainName,
-    })
+    return new PagesDomain(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: props.name ?? scope.props.domainName,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -68,10 +76,14 @@ export class CloudflarePageManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.PageRule(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new PageRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   public deployPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectDeployProps) {

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { DnsRecord } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { DnsRecordProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareRecordManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.DnsRecord(id, {
-      ...props,
-      zoneId,
-    })
+    return new DnsRecord(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }

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

@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { Ruleset } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { RulesetProps } from './types.js'
 
@@ -25,7 +25,7 @@ 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 [Pulumi Cloudflare Ruleset]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/ruleset/}
+   * @see [Pulumi Cloudflare Ruleset]{@link https://www.pulumi.com/registry/packages//api-docs/ruleset/}
    */
   public createRuleSet(id: string, scope: CommonCloudflareConstruct, props: RulesetProps) {
     if (!props) throw `Props undefined for ${id}`
@@ -33,11 +33,13 @@ export class CloudflareRuleSetManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    const ruleSet = new cloudflare.Ruleset(`${id}`, {
-      ...props,
-      zoneId,
-    })
-
-    return ruleSet
+    return new Ruleset(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }