@gradientedge/cdk-utils 9.89.0 → 10.1.0

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

@@ -1,12 +1,12 @@
-import { AwsProvider } from '@cdktf/provider-aws/lib/provider/index.js';
-import { AzurermProvider } from '@cdktf/provider-azurerm/lib/provider/index.js';
-import { AzurermBackend, S3Backend, TerraformStack } from 'cdktf';
-import { Construct } from 'constructs';
+import { Provider as CloudflareProvider } from '@pulumi/cloudflare';
+import { ComponentResource, ComponentResourceOptions, Config } from '@pulumi/pulumi';
 import { CloudflareAccessManager, CloudflareApiShieldManager, CloudflareArgoManager, CloudflareFilterManager, CloudflareFirewallManager, CloudflarePageManager, CloudflareRecordManager, CloudflareRuleSetManager, CloudflareWorkerManager, CloudflareZoneManager } from '../services/index.js';
 import { CommonCloudflareStackProps } from './types.js';
-export declare class CommonCloudflareConstruct extends TerraformStack {
+export declare class CommonCloudflareConstruct extends ComponentResource {
     props: CommonCloudflareStackProps;
+    options?: ComponentResourceOptions;
     id: string;
+    config: Config;
     fullyQualifiedDomainName: string;
     accessManager: CloudflareAccessManager;
     apiShieldManager: CloudflareApiShieldManager;
@@ -18,24 +18,12 @@ export declare class CommonCloudflareConstruct extends TerraformStack {
     ruleSetManager: CloudflareRuleSetManager;
     workerManager: CloudflareWorkerManager;
     zoneManager: CloudflareZoneManager;
-    awsProvider: AwsProvider;
-    s3Backend: S3Backend;
-    azurermProvider: AzurermProvider;
-    azurermBackend: AzurermBackend;
-    constructor(scope: Construct, id: string, props: CommonCloudflareStackProps);
+    provider: CloudflareProvider;
+    constructor(name: string, props: CommonCloudflareStackProps, options?: ComponentResourceOptions);
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain
      */
     protected determineFullyQualifiedDomain(): void;
-    /**
-     * @summary Determine the account id based on the cdktf.json context
-     */
-    protected determineAccountId(): void;
-    /**
-     * @summary Determine the api token based on the cdktf.json context
-     */
-    protected determineApiToken(): void;
-    protected determineRemoteBackend(): void;
     /**
      * @summary Utility method to determine if the initialisation is in development (dev) stage
      * This is determined by the stage property injected via cdk context

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

@@ -1,12 +1,10 @@
-import { AwsProvider } from '@cdktf/provider-aws/lib/provider/index.js';
-import { CloudflareProvider } from '@cdktf/provider-cloudflare/lib/provider/index.js';
-import { AzurermProvider } from '@cdktf/provider-azurerm/lib/provider/index.js';
-import { AzurermBackend, S3Backend, TerraformStack, TerraformVariable } from 'cdktf';
+import { Provider as CloudflareProvider } from '@pulumi/cloudflare';
+import { ComponentResource, Config } from '@pulumi/pulumi';
 import { isDevStage, isPrdStage, isTestStage, isUatStage } from '../../common/index.js';
 import { CloudflareAccessManager, CloudflareApiShieldManager, CloudflareArgoManager, CloudflareFilterManager, CloudflareFirewallManager, CloudflarePageManager, CloudflareRecordManager, CloudflareRuleSetManager, CloudflareWorkerManager, CloudflareZoneManager, } from '../services/index.js';
-import { RemoteBackend } from './constants.js';
-export class CommonCloudflareConstruct extends TerraformStack {
+export class CommonCloudflareConstruct extends ComponentResource {
     id;
+    config;
     fullyQualifiedDomainName;
     accessManager;
     apiShieldManager;
@@ -18,14 +16,12 @@ export class CommonCloudflareConstruct extends TerraformStack {
     ruleSetManager;
     workerManager;
     zoneManager;
-    awsProvider;
-    s3Backend;
-    azurermProvider;
-    azurermBackend;
-    constructor(scope, id, props) {
-        super(scope, id);
+    provider;
+    constructor(name, props, options) {
+        super(`custom:cloudflare:Construct:${name}`, name, props, options);
         this.props = props;
-        this.id = id;
+        this.options = options;
+        this.id = name;
         this.accessManager = new CloudflareAccessManager();
         this.apiShieldManager = new CloudflareApiShieldManager();
         this.argoManager = new CloudflareArgoManager();
@@ -36,11 +32,10 @@ export class CommonCloudflareConstruct extends TerraformStack {
         this.ruleSetManager = new CloudflareRuleSetManager();
         this.workerManager = new CloudflareWorkerManager();
         this.zoneManager = new CloudflareZoneManager();
+        /* initialise config */
+        this.config = new Config();
         this.determineFullyQualifiedDomain();
-        this.determineAccountId();
-        this.determineApiToken();
-        this.determineRemoteBackend();
-        new CloudflareProvider(this, `${this.id}-provider`, this.props);
+        this.provider = new CloudflareProvider(`${this.id}-provider`, this.props, options);
     }
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain
@@ -50,55 +45,6 @@ export class CommonCloudflareConstruct extends TerraformStack {
             ? `${this.props.subDomain}.${this.props.domainName}`
             : this.props.domainName;
     }
-    /**
-     * @summary Determine the account id based on the cdktf.json context
-     */
-    determineAccountId() {
-        this.props.accountId = new TerraformVariable(this, `accountId`, {}).stringValue;
-    }
-    /**
-     * @summary Determine the api token based on the cdktf.json context
-     */
-    determineApiToken() {
-        this.props.apiToken = new TerraformVariable(this, `apiToken`, {}).stringValue;
-    }
-    determineRemoteBackend() {
-        const debug = this.node.tryGetContext('debug');
-        switch (this.props.remoteBackend?.type) {
-            case RemoteBackend.s3:
-                this.awsProvider = new AwsProvider(this, `${this.id}-aws-provider`, {
-                    profile: process.env.AWS_PROFILE,
-                    region: this.props.remoteBackend.region,
-                });
-                this.s3Backend = new S3Backend(this, {
-                    bucket: this.props.remoteBackend.bucketName,
-                    dynamodbTable: this.props.remoteBackend.tableName,
-                    key: `${this.id}`,
-                    profile: process.env.AWS_PROFILE,
-                    region: this.props.remoteBackend.region,
-                });
-                break;
-            case RemoteBackend.azurerm:
-                this.azurermProvider = new AzurermProvider(this, `${this.id}-azurerm-provider`, {
-                    features: [{}],
-                    subscriptionId: this.props.remoteBackend.subscriptionId,
-                });
-                this.azurermBackend = new AzurermBackend(this, {
-                    storageAccountName: this.props.remoteBackend.storageAccountName,
-                    containerName: this.props.remoteBackend.containerName,
-                    key: `${this.id}`,
-                    subscriptionId: this.props.remoteBackend.subscriptionId,
-                    resourceGroupName: this.props.remoteBackend.resourceGroupName,
-                });
-                break;
-            case RemoteBackend.local:
-                if (debug)
-                    console.debug(`Using local backend for ${this.id}`);
-                break;
-            default:
-                break;
-        }
-    }
     /**
      * @summary Utility method to determine if the initialisation is in development (dev) stage
      * This is determined by the stage property injected via cdk context

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

@@ -1,4 +1,3 @@
-export * from './constants.js';
 export * from './construct.js';
 export * from './stack.js';
 export * from './types.js';

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

@@ -1,4 +1,3 @@
-export * from './constants.js';
 export * from './construct.js';
 export * from './stack.js';
 export * from './types.js';

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

@@ -1,7 +1,6 @@
+import { ComponentResource, ComponentResourceOptions, Config } from '@pulumi/pulumi';
 import { CommonCloudflareConstruct } from './construct.js';
 import { CommonCloudflareStackProps } from './types.js';
-import { TerraformStack } from 'cdktf';
-import { Construct } from 'constructs';
 /**
  * @classdesc Common stack to use as a base for all higher level constructs.
  * @example
@@ -14,40 +13,31 @@ import { Construct } from 'constructs';
  *   }
  * }
  */
-export declare class CommonCloudflareStack extends TerraformStack {
+export declare class CommonCloudflareStack extends ComponentResource {
     construct: CommonCloudflareConstruct;
     props: CommonCloudflareStackProps;
-    constructor(parent: Construct, name: string, props: CommonCloudflareStackProps);
+    config: Config;
+    constructor(name: string, props: CommonCloudflareStackProps, options?: ComponentResourceOptions);
     /**
-     * @summary Method to determine the core CDK construct properties injected via context cdktf.json
+     * @summary Method to determine the core CDK construct properties injected via context
      * @param props The stack properties
      * @returns The stack properties
      */
-    protected determineConstructProps(props: CommonCloudflareStackProps): {
-        accountId: any;
-        apiToken: any;
-        domainName: any;
-        extraContexts: any;
-        features: any;
-        name: any;
-        skipStageForARecords: any;
-        stage: any;
-        subDomain: any;
-    };
+    protected determineConstructProps(props: CommonCloudflareStackProps): any;
     /**
-     * @summary Method to determine extra cdk contexts apart from the main cdktf.json
+     * @summary Method to determine extra cdk contexts apart from the main context
      * - Sets the properties from the extra contexts into cdk node context
      * - Primary use is to have layered config in separate files to enable easier maintenance and readability
      */
-    protected determineExtraContexts(): void;
+    protected determineExtraContexts(props: CommonCloudflareStackProps): Record<string, any>;
     /**
-     * @summary Method to determine extra cdk stage contexts apart from the main cdktf.json
+     * @summary Method to determine extra cdk stage contexts apart from the main context
      * - Sets the properties from the extra stage contexts into cdk node context
      * - Primary use is to have layered config for each environment which is injected into the context
      */
-    protected determineStageContexts(): void;
+    protected determineStageContexts(props: CommonCloudflareStackProps): any;
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain
      */
-    protected fullyQualifiedDomain(): any;
+    protected fullyQualifiedDomain(): string;
 }

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

@@ -1,6 +1,6 @@
-import fs from 'fs';
+import { ComponentResource, Config } from '@pulumi/pulumi';
 import appRoot from 'app-root-path';
-import { TerraformStack } from 'cdktf';
+import fs from 'fs';
 import _ from 'lodash';
 import path from 'path';
 import { isDevStage } from '../../common/index.js';
@@ -16,112 +16,105 @@ import { isDevStage } from '../../common/index.js';
  *   }
  * }
  */
-export class CommonCloudflareStack extends TerraformStack {
+export class CommonCloudflareStack extends ComponentResource {
     construct;
     props;
-    constructor(parent, name, props) {
-        super(parent, name);
-        /* determine extra cdk contexts */
-        this.determineExtraContexts();
-        /* determine extra cdk stage contexts */
-        this.determineStageContexts();
+    config;
+    constructor(name, props, options) {
+        super(`custom:cloudflare:Stack:${name}`, name, props, options);
+        /* initialise config */
+        this.config = new Config();
         this.props = this.determineConstructProps(props);
     }
     /**
-     * @summary Method to determine the core CDK construct properties injected via context cdktf.json
+     * @summary Method to determine the core CDK construct properties injected via context
      * @param props The stack properties
      * @returns The stack properties
      */
     determineConstructProps(props) {
-        const stage = this.node.tryGetContext('stage');
+        let projectProps = props;
+        if (!projectProps) {
+            const projectPropsPath = path.join(appRoot.path, 'pulumi.json');
+            if (!fs.existsSync(projectPropsPath))
+                throw `Context properties unavailable in path:${projectPropsPath}`;
+            const projectPropsBuffer = fs.readFileSync(projectPropsPath);
+            projectProps = JSON.parse(projectPropsBuffer.toString('utf-8'));
+        }
         return {
-            accountId: this.node.tryGetContext('accountId'),
-            apiToken: this.node.tryGetContext('apiToken'),
-            domainName: this.node.tryGetContext('domainName'),
-            extraContexts: this.node.tryGetContext('extraContexts'),
-            features: this.node.tryGetContext('features'),
-            name: this.node.tryGetContext('resourceGroupName'),
-            skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
-            stage: stage,
-            subDomain: this.node.tryGetContext('subDomain'),
+            accountId: projectProps.accountId,
+            apiToken: projectProps.apiToken,
+            domainName: projectProps.domainName,
+            extraContexts: projectProps.extraContexts,
+            name: projectProps.resourceGroupName ?? projectProps.name,
+            skipStageForARecords: projectProps.skipStageForARecords,
+            stage: projectProps.stage,
+            stageContextPath: projectProps.stageContextPath,
+            subDomain: projectProps.subDomain,
+            ...this.determineExtraContexts(props),
+            ...this.determineStageContexts(props),
         };
     }
     /**
-     * @summary Method to determine extra cdk contexts apart from the main cdktf.json
+     * @summary Method to determine extra cdk contexts apart from the main context
      * - Sets the properties from the extra contexts into cdk node context
      * - Primary use is to have layered config in separate files to enable easier maintenance and readability
      */
-    determineExtraContexts() {
-        const extraContexts = this.node.tryGetContext('extraContexts');
-        const debug = this.node.tryGetContext('debug');
-        if (!extraContexts) {
-            if (debug)
-                console.debug(`No additional contexts provided. Using default context properties from cdktf.json`);
-            return;
+    determineExtraContexts(props) {
+        if (!props.extraContexts) {
+            if (props.debug)
+                console.debug(`No additional contexts provided. Using default context properties`);
+            return {};
         }
-        _.forEach(extraContexts, (context) => {
+        let extraContextProps = {};
+        _.forEach(props.extraContexts, (context) => {
             const extraContextPath = path.join(appRoot.path, context);
             /* scenario where extra context is configured in cdk.json but absent in file system */
             if (!fs.existsSync(extraContextPath))
                 throw `Extra context properties unavailable in path:${extraContextPath}`;
             /* read the extra properties */
             const extraContextPropsBuffer = fs.readFileSync(extraContextPath);
-            if (debug)
+            if (props.debug)
                 console.debug(`Adding additional contexts provided in ${extraContextPath}`);
             /* parse as JSON properties */
-            const extraContextProps = JSON.parse(extraContextPropsBuffer.toString('utf-8'));
-            /* set each of the property into the cdk node context */
-            _.keys(extraContextProps).forEach((propKey) => {
-                this.node.setContext(propKey, extraContextProps[propKey]);
-            });
+            extraContextProps = {
+                ...extraContextProps,
+                ...JSON.parse(extraContextPropsBuffer.toString('utf-8')),
+            };
         });
+        return extraContextProps;
     }
     /**
-     * @summary Method to determine extra cdk stage contexts apart from the main cdktf.json
+     * @summary Method to determine extra cdk stage contexts apart from the main context
      * - Sets the properties from the extra stage contexts into cdk node context
      * - Primary use is to have layered config for each environment which is injected into the context
      */
-    determineStageContexts() {
-        const stage = process.env.STAGE ?? this.node.tryGetContext('stage');
-        const stageContextPath = this.node.tryGetContext('stageContextPath') || 'cdkEnv';
-        const stageContextFilePath = path.join(appRoot.path, stageContextPath, `${stage}.json`);
-        const debug = this.node.tryGetContext('debug');
-        if (isDevStage(stage)) {
-            if (debug)
+    determineStageContexts(props) {
+        const stageContextFilePath = path.join(appRoot.path, props.stageContextPath ?? 'cdkEnv', `${props.stage}.json`);
+        if (isDevStage(props.stage)) {
+            if (props.debug)
                 console.debug(`Development stage. Using default stage context properties`);
         }
         /* alert default context usage when extra stage config is missing */
         if (!fs.existsSync(stageContextFilePath)) {
-            if (debug)
+            if (props.debug)
                 console.debug(`Stage specific context properties unavailable in path:${stageContextFilePath}`);
-            if (debug)
-                console.debug(`Using default stage context properties for ${stage} stage`);
-            return;
+            if (props.debug)
+                console.debug(`Using default stage context properties for ${props.stage} stage`);
+            return {};
         }
         /* read the extra properties */
         const stageContextPropsBuffer = fs.readFileSync(stageContextFilePath);
-        if (debug)
+        if (props.debug)
             console.debug(`Adding additional stage contexts provided in ${stageContextFilePath}`);
         /* parse as JSON properties */
-        const stageContextProps = JSON.parse(stageContextPropsBuffer.toString('utf-8'));
-        /* set each of the property into the cdk node context */
-        _.keys(stageContextProps).forEach((propKey) => {
-            /* handle object, array properties */
-            if (typeof stageContextProps[propKey] === 'object' && !Array.isArray(stageContextProps[propKey])) {
-                this.node.setContext(propKey, _.merge(this.node.tryGetContext(propKey), stageContextProps[propKey]));
-            }
-            else {
-                /* handle all other primitive properties */
-                this.node.setContext(propKey, stageContextProps[propKey]);
-            }
-        });
+        return JSON.parse(stageContextPropsBuffer.toString('utf-8'));
     }
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain
      */
     fullyQualifiedDomain() {
-        const domainName = this.node.tryGetContext('domainName');
-        const subDomain = this.node.tryGetContext('subDomain');
+        const domainName = this.props.domainName;
+        const subDomain = this.props.subDomain;
         return subDomain ? `${subDomain}.${domainName}` : domainName;
     }
 }

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

@@ -1,21 +1,9 @@
-import { CloudflareProviderConfig } from '@cdktf/provider-cloudflare/lib/provider/index.js';
 import { BaseProps } from '../../common/index.js';
-import { RemoteBackend } from './constants.js';
-export interface RemoteBackendProps {
-    bucketName: string;
-    region: string;
-    tableName: string;
-    type: RemoteBackend;
-    storageAccountName: string;
-    containerName: string;
-    subscriptionId: string;
-    resourceGroupName: string;
-}
 /**
  */
-export interface CommonCloudflareStackProps extends BaseProps, CloudflareProviderConfig {
+export interface CommonCloudflareStackProps extends BaseProps {
     accountId: string;
     apiToken: string;
-    remoteBackend?: RemoteBackendProps;
+    resourceGroupName?: string;
     useExistingZone?: boolean;
 }

package/dist/src/lib/cloudflare/construct/pages-static-site/main.d.ts

@@ -1,9 +1,7 @@
-import { DataCloudflareZone } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone/index.js';
-import { DnsRecord } from '@cdktf/provider-cloudflare/lib/dns-record/index.js';
-import { PagesDomain } from '@cdktf/provider-cloudflare/lib/pages-domain/index.js';
-import { PagesProject, PagesProjectDeploymentConfigsPreviewEnvVars, PagesProjectDeploymentConfigsProductionEnvVars } from '@cdktf/provider-cloudflare/lib/pages-project/index.js';
-import { Zone } from '@cdktf/provider-cloudflare/lib/zone/index.js';
-import { Construct } from 'constructs';
+import { DnsRecord, PagesDomain, PagesProject, Zone } from '@pulumi/cloudflare';
+import { PagesProjectDeploymentConfigsPreviewEnvVars, PagesProjectDeploymentConfigsProductionEnvVars } from '@pulumi/cloudflare/types/input.js';
+import { ComponentResourceOptions } from '@pulumi/pulumi';
+import * as std from '@pulumi/std';
 import { CommonCloudflareConstruct } from '../../common/index.js';
 import { CloudflarePagesStaticSiteProps } from './types.js';
 /**
@@ -26,7 +24,7 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
     sitePagesCnameRecord: DnsRecord;
     sitePagesDomain: PagesDomain;
     sitePagesProject: PagesProject;
-    siteZone: DataCloudflareZone | Zone;
+    siteZone: Zone;
     sitePagesEnvironmentVariables: {
         [key: string]: PagesProjectDeploymentConfigsProductionEnvVars;
     };
@@ -40,7 +38,7 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
         [key: string]: PagesProjectDeploymentConfigsPreviewEnvVars;
     };
     siteDeploymentDependsOn: any;
-    constructor(parent: Construct, id: string, props: CloudflarePagesStaticSiteProps);
+    constructor(id: string, props: CloudflarePagesStaticSiteProps, options?: ComponentResourceOptions);
     /**
      * @summary Initialise and provision resources
      */
@@ -63,7 +61,7 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
      * @param secretKey the secret key
      * @returns the secret value
      */
-    protected resolveSecretFromAWS(secretName: string, secretKey: string): any;
+    protected resolveSecretFromAWS(secretName: string, secretKey: string): import("@pulumi/pulumi").Output<std.JsondecodeResult> | undefined;
     /**
      * @summary Resolve secrets from Azure Key Vault
      *
@@ -72,7 +70,7 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
      * @param secretKey the secret key
      * @returns the secret value
      */
-    protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string): string;
+    protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string): import("@pulumi/pulumi").OutputInstance<string | undefined> | undefined;
     /**
      * @summary Create the pages project
      */

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

@@ -1,8 +1,6 @@
-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 { Fn } from 'cdktf';
+import * as aws from '@pulumi/aws';
+import * as azure from '@pulumi/azure-native';
+import * as std from '@pulumi/std';
 import { CommonCloudflareConstruct } from '../../common/index.js';
 /**
  * @classdesc Provides a construct to create and deploy a cloudflare pages static site
@@ -30,9 +28,10 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
     sitePagesSecrets;
     sitePagesPreviewSecrets;
     siteDeploymentDependsOn;
-    constructor(parent, id, props) {
-        super(parent, id, props);
+    constructor(id, props, options) {
+        super(id, props);
         this.props = props;
+        this.options = options;
         this.id = id;
     }
     /**
@@ -97,16 +96,13 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
      * @returns the secret value
      */
     resolveSecretFromAWS(secretName, secretKey) {
-        if (!this.awsProvider)
+        if (this.config.require('secretsProvider') !== 'aws')
             return;
-        const secret = new DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, { name: secretName });
-        const secretVersion = new DataAwsSecretsmanagerSecretVersion(this, `${this.id}-${secretName}-${secretKey}-ver`, {
-            provider: this.awsProvider,
-            secretId: secret.id,
-        });
+        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
@@ -117,19 +113,16 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
      * @returns the secret value
      */
     resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey) {
-        const keyVaultData = new DataAzurermKeyVault(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`, {
-            resourceGroupName: resourceGroupName,
-            name: keyVaultName,
-            provider: this.azurermProvider,
-        });
-        const secretValueData = new DataAzurermKeyVaultSecret(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`, {
-            name: secretKey,
-            keyVaultId: keyVaultData.id,
-            provider: this.azurermProvider,
+        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 pages project
@@ -168,7 +161,7 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
             branch: this.props.siteBranch ?? 'main',
             directory: this.props.siteAssetDir,
             message: this.props.siteDeployMessage,
-            projectName: this.sitePagesProject.name,
+            projectName: String(this.sitePagesProject.name),
             dependsOn: this.siteDeploymentDependsOn,
         });
     }

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

@@ -1,7 +1,7 @@
-import { DataCloudflareZone } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone/index.js';
-import { WorkersScript, WorkersScriptBindings } from '@cdktf/provider-cloudflare/lib/workers-script/index.js';
-import { Zone } from '@cdktf/provider-cloudflare/lib/zone/index.js';
-import { Construct } from 'constructs';
+import { Ruleset, WorkersCustomDomain, WorkersScript, Zone, ZoneSetting } from '@pulumi/cloudflare';
+import { WorkersScriptBinding } from '@pulumi/cloudflare/types/input.js';
+import { ComponentResourceOptions } from '@pulumi/pulumi';
+import * as std from '@pulumi/std';
 import { CommonCloudflareConstruct } from '../../common/index.js';
 import { CloudflareWorkerSiteProps } from './types.js';
 /**
@@ -21,11 +21,14 @@ import { CloudflareWorkerSiteProps } from './types.js';
  */
 export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
     props: CloudflareWorkerSiteProps;
-    siteZone: DataCloudflareZone | Zone;
+    siteZone: Zone;
     siteWorkerScript: WorkersScript;
-    workerPlainTextBindingEnvironmentVariables: WorkersScriptBindings[];
-    workerSecretTextBindingEnvironmentVariables: WorkersScriptBindings[];
-    constructor(parent: Construct, id: string, props: CloudflareWorkerSiteProps);
+    siteWorkerDomain: WorkersCustomDomain;
+    siteRuleSet: Ruleset;
+    siteZoneSetting: ZoneSetting;
+    workerPlainTextBindingEnvironmentVariables: WorkersScriptBinding[];
+    workerSecretTextBindingEnvironmentVariables: WorkersScriptBinding[];
+    constructor(id: string, props: CloudflareWorkerSiteProps, options?: ComponentResourceOptions);
     /**
      * @summary Initialise and provision resources
      */
@@ -52,7 +55,7 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @param secretKey the secret key
      * @returns the secret value
      */
-    protected resolveSecretFromAWS(secretName: string, secretKey: string, id?: string): any;
+    protected resolveSecretFromAWS(secretName: string, secretKey: string): import("@pulumi/pulumi").Output<std.JsondecodeResult> | undefined;
     /**
      * @summary Resolve secrets from Azure Key Vault
      *
@@ -61,7 +64,7 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
      * @param secretKey the secret key
      * @returns the secret value
      */
-    protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string, id?: string): string;
+    protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string): import("@pulumi/pulumi").OutputInstance<string | undefined> | undefined;
     /**
      * @summary Create the rules
      */