@gradientedge/cdk-utils 8.146.1 → 8.147.0

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

@@ -1,4 +1,5 @@
-import { TerraformStack } from 'cdktf';
+import { AwsProvider } from '@cdktf/provider-aws/lib/provider';
+import { S3Backend, TerraformStack } from 'cdktf';
 import { Construct } from 'constructs';
 import { CloudflareAccessManager, CloudflareApiShieldManager, CloudflareArgoManager, CloudflareFilterManager, CloudflareFirewallManager, CloudflarePageManager, CloudflareRecordManager, CloudflareWorkerManager, CloudflareZoneManager } from '../services';
 import { CommonCloudflareStackProps } from './types';
@@ -15,6 +16,8 @@ export declare class CommonCloudflareConstruct extends TerraformStack {
     recordManager: CloudflareRecordManager;
     workerManager: CloudflareWorkerManager;
     zoneManager: CloudflareZoneManager;
+    awsProvider: AwsProvider;
+    s3Backend: S3Backend;
     constructor(scope: Construct, id: string, props: CommonCloudflareStackProps);
     /**
      * @summary Determine the fully qualified domain name based on domainName & subDomain

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

@@ -19,6 +19,8 @@ class CommonCloudflareConstruct extends cdktf_1.TerraformStack {
     recordManager;
     workerManager;
     zoneManager;
+    awsProvider;
+    s3Backend;
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
@@ -62,11 +64,11 @@ class CommonCloudflareConstruct extends cdktf_1.TerraformStack {
         const debug = this.node.tryGetContext('debug');
         switch (this.props.remoteBackend?.type) {
             case constants_1.RemoteBackend.s3:
-                new provider_1.AwsProvider(this, `${this.id}-aws-provider`, {
+                this.awsProvider = new provider_1.AwsProvider(this, `${this.id}-aws-provider`, {
                     profile: process.env.AWS_PROFILE ?? 'default',
                     region: this.props.remoteBackend.region,
                 });
-                new cdktf_1.S3Backend(this, {
+                this.s3Backend = new cdktf_1.S3Backend(this, {
                     bucket: this.props.remoteBackend.bucketName,
                     dynamodbTable: this.props.remoteBackend.tableName,
                     key: `${this.id}`,

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

@@ -27,6 +27,18 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
     sitePagesDomain: PagesDomain;
     sitePagesProject: PagesProject;
     siteZone: DataCloudflareZone | Zone;
+    sitePagesEnvironmentVariables: {
+        [key: string]: string;
+    };
+    sitePagesPreviewEnvironmentVariables: {
+        [key: string]: string;
+    };
+    sitePagesSecrets: {
+        [key: string]: string;
+    };
+    sitePagesPreviewSecrets: {
+        [key: string]: string;
+    };
     constructor(parent: Construct, id: string, props: CloudflarePagesStaticSiteProps);
     /**
      * @summary Initialise and provision resources
@@ -36,6 +48,21 @@ export declare class CloudflarePagesStaticSite extends CommonCloudflareConstruct
      * @summary Resolve the zone to use for the static site
      */
     protected resolveZone(): void;
+    /**
+     * @summary Resolve the secrets to use for the static site
+     */
+    protected resolveSecrets(): void;
+    /**
+     * @summary Resolve the environment variables to use for the static site
+     */
+    protected resolveEnvironmentVariables(): void;
+    /**
+     * @summary Resolve secrets from AWS Secrets Manager
+     * @param secretName the secret name
+     * @param secretKey the secret key
+     * @returns the secret value
+     */
+    protected resolveSecretFromAWS(secretName: string, secretKey: string): any;
     /**
      * @summary Create the pages project
      */

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflarePagesStaticSite = void 0;
+const data_aws_secretsmanager_secret_1 = require("@cdktf/provider-aws/lib/data-aws-secretsmanager-secret");
+const data_aws_secretsmanager_secret_version_1 = require("@cdktf/provider-aws/lib/data-aws-secretsmanager-secret-version");
+const cdktf_1 = require("cdktf");
 const common_1 = require("../../common");
 /**
  * @classdesc Provides a construct to create and deploy a cloudflare pages static site
@@ -23,6 +26,10 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
     sitePagesDomain;
     sitePagesProject;
     siteZone;
+    sitePagesEnvironmentVariables;
+    sitePagesPreviewEnvironmentVariables;
+    sitePagesSecrets;
+    sitePagesPreviewSecrets;
     constructor(parent, id, props) {
         super(parent, id, props);
         this.props = props;
@@ -33,6 +40,8 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
      */
     initResources() {
         this.resolveZone();
+        this.resolveSecrets();
+        this.resolveEnvironmentVariables();
         this.createProject();
         this.createDomain();
         this.createRecord();
@@ -49,6 +58,56 @@ class CloudflarePagesStaticSite extends common_1.CommonCloudflareConstruct {
             this.siteZone = this.zoneManager.createZone(`${this.id}-zone`, this, this.props.siteZone);
         }
     }
+    /**
+     * @summary Resolve the secrets to use for the static site
+     */
+    resolveSecrets() {
+        this.props.sitePagesProject = {
+            ...this.props.sitePagesProject,
+            deploymentConfigs: {
+                preview: {
+                    secrets: this.sitePagesPreviewSecrets,
+                },
+                production: {
+                    secrets: this.sitePagesSecrets,
+                },
+            },
+        };
+    }
+    /**
+     * @summary Resolve the environment variables to use for the static site
+     */
+    resolveEnvironmentVariables() {
+        this.props.sitePagesProject = {
+            ...this.props.sitePagesProject,
+            deploymentConfigs: {
+                preview: {
+                    environmentVariables: this.sitePagesPreviewEnvironmentVariables,
+                },
+                production: {
+                    environmentVariables: this.sitePagesEnvironmentVariables,
+                },
+            },
+        };
+    }
+    /**
+     * @summary Resolve secrets from AWS Secrets Manager
+     * @param secretName the secret name
+     * @param secretKey the secret key
+     * @returns the secret value
+     */
+    resolveSecretFromAWS(secretName, secretKey) {
+        if (!this.awsProvider)
+            return;
+        const secret = new data_aws_secretsmanager_secret_1.DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, { name: secretName });
+        const secretVersion = new data_aws_secretsmanager_secret_version_1.DataAwsSecretsmanagerSecretVersion(this, `${this.id}-${secretName}-${secretKey}-ver`, {
+            provider: this.awsProvider,
+            secretId: secret.id,
+        });
+        if (!secretVersion)
+            throw new Error(`Unable to resolve secret:${secretName}`);
+        return cdktf_1.Fn.lookup(cdktf_1.Fn.jsondecode(secretVersion.secretString), secretKey);
+    }
     /**
      * @summary Create the pages project
      */

package/dist/src/lib/cloudflare/services/page/main.js

@@ -86,8 +86,7 @@ class CloudflarePageManager {
     deployPagesProject(id, scope, props) {
         if (!props)
             throw `Props undefined for ${id}`;
-        const localExecProvider = new cdktf_local_exec_1.Provider(scope, `${id}`);
-        const branch = scope.isProductionStage() ? 'main' : props.branch;
+        new cdktf_local_exec_1.Provider(scope, `${id}`);
         const message = process.env.BUILD_NUMBER ?? props.message;
         const deployment = new cdktf_local_exec_1.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}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.146.1",
+  "version": "8.147.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

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

@@ -30,6 +30,8 @@ export class CommonCloudflareConstruct extends TerraformStack {
   recordManager: CloudflareRecordManager
   workerManager: CloudflareWorkerManager
   zoneManager: CloudflareZoneManager
+  awsProvider: AwsProvider
+  s3Backend: S3Backend
 
   constructor(scope: Construct, id: string, props: CommonCloudflareStackProps) {
     super(scope, id)
@@ -80,11 +82,11 @@ export class CommonCloudflareConstruct extends TerraformStack {
     const debug = this.node.tryGetContext('debug')
     switch (this.props.remoteBackend?.type) {
       case RemoteBackend.s3:
-        new AwsProvider(this, `${this.id}-aws-provider`, {
+        this.awsProvider = new AwsProvider(this, `${this.id}-aws-provider`, {
           profile: process.env.AWS_PROFILE ?? 'default',
           region: this.props.remoteBackend.region,
         })
-        new S3Backend(this, {
+        this.s3Backend = new S3Backend(this, {
           bucket: this.props.remoteBackend.bucketName,
           dynamodbTable: this.props.remoteBackend.tableName,
           key: `${this.id}`,

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

@@ -1,8 +1,11 @@
+import { DataAwsSecretsmanagerSecret } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret'
+import { DataAwsSecretsmanagerSecretVersion } from '@cdktf/provider-aws/lib/data-aws-secretsmanager-secret-version'
 import { DataCloudflareZone } from '@cdktf/provider-cloudflare/lib/data-cloudflare-zone'
 import { PagesDomain } from '@cdktf/provider-cloudflare/lib/pages-domain'
 import { PagesProject } from '@cdktf/provider-cloudflare/lib/pages-project'
 import { Record } from '@cdktf/provider-cloudflare/lib/record'
 import { Zone } from '@cdktf/provider-cloudflare/lib/zone'
+import { Fn } from 'cdktf'
 import { Construct } from 'constructs'
 import { CommonCloudflareConstruct } from '../../common'
 import { CloudflarePagesStaticSiteProps } from './types'
@@ -30,6 +33,10 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
   sitePagesDomain: PagesDomain
   sitePagesProject: PagesProject
   siteZone: DataCloudflareZone | Zone
+  sitePagesEnvironmentVariables: { [key: string]: string }
+  sitePagesPreviewEnvironmentVariables: { [key: string]: string }
+  sitePagesSecrets: { [key: string]: string }
+  sitePagesPreviewSecrets: { [key: string]: string }
 
   constructor(parent: Construct, id: string, props: CloudflarePagesStaticSiteProps) {
     super(parent, id, props)
@@ -42,6 +49,8 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
    */
   protected initResources() {
     this.resolveZone()
+    this.resolveSecrets()
+    this.resolveEnvironmentVariables()
     this.createProject()
     this.createDomain()
     this.createRecord()
@@ -59,6 +68,57 @@ export class CloudflarePagesStaticSite extends CommonCloudflareConstruct {
     }
   }
 
+  /**
+   * @summary Resolve the secrets to use for the static site
+   */
+  protected resolveSecrets() {
+    this.props.sitePagesProject = {
+      ...this.props.sitePagesProject,
+      deploymentConfigs: {
+        preview: {
+          secrets: this.sitePagesPreviewSecrets,
+        },
+        production: {
+          secrets: this.sitePagesSecrets,
+        },
+      },
+    }
+  }
+
+  /**
+   * @summary Resolve the environment variables to use for the static site
+   */
+  protected resolveEnvironmentVariables() {
+    this.props.sitePagesProject = {
+      ...this.props.sitePagesProject,
+      deploymentConfigs: {
+        preview: {
+          environmentVariables: this.sitePagesPreviewEnvironmentVariables,
+        },
+        production: {
+          environmentVariables: this.sitePagesEnvironmentVariables,
+        },
+      },
+    }
+  }
+
+  /**
+   * @summary Resolve secrets from AWS Secrets Manager
+   * @param secretName the secret name
+   * @param secretKey the secret key
+   * @returns the secret value
+   */
+  protected resolveSecretFromAWS(secretName: string, secretKey: string) {
+    if (!this.awsProvider) 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,
+    })
+    if (!secretVersion) throw new Error(`Unable to resolve secret:${secretName}`)
+    return Fn.lookup(Fn.jsondecode(secretVersion.secretString), secretKey)
+  }
+
   /**
    * @summary Create the pages project
    */

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

@@ -96,8 +96,7 @@ export class CloudflarePageManager {
   public deployPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectDeployProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    const localExecProvider = new Provider(scope, `${id}`)
-    const branch = scope.isProductionStage() ? 'main' : props.branch
+    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}`,