@gradientedge/cdk-utils 10.6.0 → 10.8.0

package/src/lib/azure/services/storage/main.ts

@@ -1,18 +1,29 @@
 import {
   Blob,
   BlobContainer,
+  BlobServiceProperties,
   HttpProtocol,
   Kind,
   listStorageAccountSAS,
+  ManagementPolicy,
   Permissions,
   Services,
   SignedResourceTypes,
   SkuName,
   StorageAccount,
+  Table,
 } from '@pulumi/azure-native/storage/index.js'
 import * as pulumi from '@pulumi/pulumi'
+import { ResourceOptions } from '@pulumi/pulumi'
 import { CommonAzureConstruct } from '../../common/index.js'
-import { ContainerSasTokenProps, StorageAccountProps, StorageBlobProps, StorageContainerProps } from './types.js'
+import {
+  ContainerSasTokenProps,
+  ManagementPolicyProps,
+  StorageAccountProps,
+  StorageBlobProps,
+  StorageContainerProps,
+  StorageTableProps,
+} from './types.js'
 
 /**
  * @classdesc Provides operations on Azure Storage using Pulumi
@@ -37,16 +48,22 @@ export class AzureStorageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props storage account properties
+   * @param resourceOptions Optional settings to control resource behaviour
    * @see [Pulumi Azure Native Storage Account]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/storageaccount/}
    */
-  public createStorageAccount(id: string, scope: CommonAzureConstruct, props: StorageAccountProps) {
+  public createStorageAccount(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: StorageAccountProps,
+    resourceOptions?: ResourceOptions
+  ) {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroupName = scope.props.resourceGroupName
       ? scope.resourceNameFormatter.format(scope.props.resourceGroupName)
       : `${props.resourceGroupName}`
 
-    return new StorageAccount(
+    const storageAccount = new StorageAccount(
       `${id}-sa`,
       {
         ...props,
@@ -54,6 +71,7 @@ export class AzureStorageManager {
           .format(props.accountName?.toString(), scope.props.resourceNameOptions?.storageAccount)
           .replace(/\W/g, '')
           .toLowerCase(),
+        allowBlobPublicAccess: props.allowBlobPublicAccess ?? false,
         resourceGroupName,
         sku: props.sku ?? {
           name: SkuName.Standard_LRS,
@@ -64,8 +82,23 @@ export class AzureStorageManager {
           environment: scope.props.stage,
         },
       },
-      { parent: scope }
+      { parent: scope, ...resourceOptions }
     )
+
+    new BlobServiceProperties(`${id}-blob-props`, {
+      ...props.blobProperties,
+      accountName: scope.resourceNameFormatter
+        .format(props.accountName?.toString(), scope.props.resourceNameOptions?.storageAccount)
+        .replace(/\W/g, '')
+        .toLowerCase(),
+      resourceGroupName,
+      deleteRetentionPolicy: props.blobProperties?.deleteRetentionPolicy ?? {
+        enabled: true,
+        days: 7,
+      },
+    })
+
+    return storageAccount
   }
 
   /**
@@ -73,9 +106,15 @@ export class AzureStorageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props storage container properties
+   * @param resourceOptions Optional settings to control resource behaviour
    * @see [Pulumi Azure Native Blob Container]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/blobcontainer/}
    */
-  public createStorageContainer(id: string, scope: CommonAzureConstruct, props: StorageContainerProps) {
+  public createStorageContainer(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: StorageContainerProps,
+    resourceOptions?: ResourceOptions
+  ) {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroupName = scope.props.resourceGroupName
@@ -93,7 +132,7 @@ export class AzureStorageManager {
         accountName: props.accountName,
         resourceGroupName,
       },
-      { parent: scope }
+      { parent: scope, ...resourceOptions }
     )
   }
 
@@ -102,9 +141,15 @@ export class AzureStorageManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props storage blob properties
+   * @param resourceOptions Optional settings to control resource behaviour
    * @see [Pulumi Azure Native Blob]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/blob/}
    */
-  public createStorageBlob(id: string, scope: CommonAzureConstruct, props: StorageBlobProps) {
+  public createStorageBlob(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: StorageBlobProps,
+    resourceOptions?: ResourceOptions
+  ) {
     if (!props) throw `Props undefined for ${id}`
 
     const resourceGroupName = scope.props.resourceGroupName
@@ -123,7 +168,7 @@ export class AzureStorageManager {
         containerName: `${props.containerName}-${scope.props.stage}`,
         resourceGroupName,
       },
-      { parent: scope }
+      { parent: scope, ...resourceOptions }
     )
   }
 
@@ -140,7 +185,6 @@ export class AzureStorageManager {
    *   - start: Optional start date in the format 'YYYY-MM-DD'. Defaults to today's date.
    *   - expiry: Optional expiry date in the format 'YYYY-MM-DD'. Defaults to 7 days from current date.
    * @param storageAccount - The storage account resource
-   * @param storageContainer - Optional blob container resource
    *
    * @returns A Pulumi Output containing the SAS token
    *
@@ -173,4 +217,42 @@ export class AzureStorageManager {
       })
       .apply(result => result.accountSasToken)
   }
+
+  /**
+   * @summary Method to create a new storage management policy
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props storage management policy properties
+   * @param resourceOptions Optional settings to control resource behaviour
+   * @see [Pulumi Azure Native Storage Management Policy]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/managementpolicy/}
+   */
+  public createManagementPolicy(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: ManagementPolicyProps,
+    resourceOptions?: ResourceOptions
+  ) {
+    if (!props) throw `Props undefined for ${id}`
+
+    return new ManagementPolicy(`${id}`, props, { parent: scope, ...resourceOptions })
+  }
+
+  /**
+   * @summary Method to create a new storage table
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props storage table properties
+   * @param resourceOptions Optional settings to control resource behaviour
+   * @see [Pulumi Azure Native Storage Table]{@link https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/table/}
+   */
+  public createTable(
+    id: string,
+    scope: CommonAzureConstruct,
+    props: StorageTableProps,
+    resourceOptions?: ResourceOptions
+  ) {
+    if (!props) throw `Props undefined for ${id}`
+
+    return new Table(`${id}`, props, { parent: scope, ...resourceOptions })
+  }
 }

package/src/lib/azure/services/storage/types.ts

@@ -1,17 +1,26 @@
 import {
   BlobArgs,
   BlobContainerArgs,
+  BlobServicePropertiesArgs,
   ListStorageAccountSASArgs,
+  ManagementPolicyArgs,
   StorageAccountArgs,
+  TableArgs,
 } from '@pulumi/azure-native/storage/index.js'
 import { BaseAzureConfigProps } from '../../types/index.js'
 
-export interface StorageAccountProps extends StorageAccountArgs {}
+export interface StorageAccountProps extends StorageAccountArgs {
+  blobProperties?: BlobServicePropertiesArgs
+}
 
-export interface StorageContainerProps extends BaseAzureConfigProps, BlobContainerArgs {}
+export interface StorageContainerProps extends BlobContainerArgs, BaseAzureConfigProps {}
 
 export interface StorageBlobProps extends BaseAzureConfigProps, BlobArgs {}
 
+export interface ManagementPolicyProps extends ManagementPolicyArgs {}
+
+export interface StorageTableProps extends TableArgs {}
+
 export interface ContainerSasTokenProps extends ListStorageAccountSASArgs {
   resourceGroupName: string
   containerName?: string

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

@@ -34,7 +34,7 @@ export class CommonCloudflareConstruct extends ComponentResource {
   provider: CloudflareProvider
 
   constructor(name: string, props: CommonCloudflareStackProps, options?: ComponentResourceOptions) {
-    super(`custom:cloudflare:Construct:${name}`, name, props, options)
+    super(`cloudflare:${name}`, name, props, options)
     this.props = props
     this.options = options
     this.id = name

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

@@ -48,17 +48,12 @@ export class CommonCloudflareStack extends ComponentResource {
     }
 
     return {
-      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),
+      ...props,
+      extraContexts: this.config.getObject('extraContexts'),
+      stage: this.config.require('stage'),
+      stageContextPath: this.config.require('stageContextPath'),
+      ...this.determineExtraContexts(),
+      ...this.determineStageContexts(),
     }
   }
 
@@ -67,22 +62,24 @@ export class CommonCloudflareStack extends ComponentResource {
    * - 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(props: CommonCloudflareStackProps) {
-    if (!props.extraContexts) {
-      if (props.debug) console.debug(`No additional contexts provided. Using default context properties`)
+  protected determineExtraContexts() {
+    const extraContexts = this.config.getObject('extraContexts')
+    const debug = this.config.getBoolean('debug')
+    if (!extraContexts) {
+      if (debug) console.debug(`No additional contexts provided. Using default context properties`)
       return {}
     }
 
     let extraContextProps: Record<string, any> = {}
-    _.forEach(props.extraContexts, (context: string) => {
+    _.forEach(extraContexts, (context: string) => {
       const extraContextPath = path.join(appRoot.path, context)
 
-      /* scenario where extra context is configured in cdk.json but absent in file system */
+      /* scenario where extra context is configured 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 (props.debug) console.debug(`Adding additional contexts provided in ${extraContextPath}`)
+      if (debug) console.debug(`Adding additional contexts provided in ${extraContextPath}`)
 
       /* parse as JSON properties */
       extraContextProps = {
@@ -98,23 +95,26 @@ export class CommonCloudflareStack extends ComponentResource {
    * - 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(props: CommonCloudflareStackProps) {
-    const stageContextFilePath = path.join(appRoot.path, props.stageContextPath ?? 'env', `${props.stage}.json`)
-
-    if (isDevStage(props.stage)) {
-      if (props.debug) console.debug(`Development stage. Using default stage context properties`)
+  protected determineStageContexts() {
+    const debug = this.config.getBoolean('debug')
+    const stage = this.config.require('stage')
+    const stageContextPath = this.config.get('stageContextPath')
+    const stageContextFilePath = path.join(appRoot.path, stageContextPath ?? 'env', `${stage}.json`)
+
+    if (isDevStage(stage)) {
+      if (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 (props.debug) console.debug(`Stage specific context properties unavailable in path:${stageContextFilePath}`)
-      if (props.debug) console.debug(`Using default stage context properties for ${props.stage} stage`)
+      if (debug) console.debug(`Stage specific context properties unavailable in path:${stageContextFilePath}`)
+      if (debug) console.debug(`Using default stage context properties for ${stage} stage`)
       return {}
     }
 
     /* read the extra properties */
     const stageContextPropsBuffer = fs.readFileSync(stageContextFilePath)
-    if (props.debug) console.debug(`Adding additional stage contexts provided in ${stageContextFilePath}`)
+    if (debug) console.debug(`Adding additional stage contexts provided in ${stageContextFilePath}`)
 
     /* parse as JSON properties */
     return JSON.parse(stageContextPropsBuffer.toString('utf-8'))

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

@@ -6,6 +6,7 @@ import {
   WorkersRoute,
   WorkersScript,
 } from '@pulumi/cloudflare'
+import _ from 'lodash'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
   WorkerCronTriggerProps,
@@ -93,7 +94,7 @@ export class CloudflareWorkerManager {
   public createWorkerScript(id: string, scope: CommonCloudflareConstruct, props: WorkerScriptProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new WorkersScript(
+    const script = new WorkersScript(
       id,
       {
         ...props,
@@ -102,6 +103,14 @@ export class CloudflareWorkerManager {
       },
       { parent: scope }
     )
+
+    if (props.routes) {
+      _.forEach(props.routes, (route: WorkerRouteProps) => {
+        this.createWorkerRoute(`${id}-route-${route.pattern}`, scope, route)
+      })
+    }
+
+    return script
   }
 
   /**

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

@@ -8,8 +8,15 @@ import {
 } from '@pulumi/cloudflare'
 
 export interface WorkerDomainProps extends WorkersCustomDomainArgs {}
+
 export interface WorkerRouteProps extends WorkersRouteArgs {}
-export interface WorkerScriptProps extends WorkersScriptArgs {}
+
+export interface WorkerScriptProps extends WorkersScriptArgs {
+  routes?: WorkerRouteProps[]
+}
+
 export interface WorkersKvNamespaceProps extends WorkersKvNamespaceArgs {}
+
 export interface WorkersKvProps extends WorkersKvArgs {}
+
 export interface WorkerCronTriggerProps extends WorkersCronTriggerArgs {}

package/dist/lib/lambda.d.ts

@@ -1,17 +0,0 @@
-export declare const processEvent: (event: any) => {
-    body: {
-        event: any;
-    };
-    httpMethod: any;
-    id: string;
-    message: string;
-    origin: any;
-    path: any;
-    referer: any;
-    resource: any;
-    source: string;
-    sourceId: string | undefined;
-    statusCode: number;
-    success: boolean;
-};
-//# sourceMappingURL=lambda.d.ts.map

package/dist/lib/lambda.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lambda.d.ts","sourceRoot":"","sources":["../../app/api-destined-function/src/lib/lambda.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG;;;;;;;;;;;;;;;CAmBtC,CAAA"}

package/dist/lib/lambda.js

@@ -1,28 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-export const processEvent = (event) => {
-    if (!event)
-        throw new Error('Invalid Event');
-    return {
-        body: {
-            event: event,
-        },
-        httpMethod: event.httpMethod,
-        id: uuidv4(),
-        message: 'Webhook call successful',
-        origin: event.headers?.origin,
-        path: event.path,
-        referer: event.headers?.referer,
-        resource: event.resource,
-        source: 'custom:api-destined-lambda',
-        sourceId: process.env.SOURCE_ID,
-        statusCode: 200,
-        success: true,
-    };
-};
-exports.handler = async (event, context, callback) => {
-    console.log('Event:', JSON.stringify(event));
-    console.log('Context:', JSON.stringify(context));
-    console.log('Event Records:', JSON.stringify(event.Records));
-    return callback(null, processEvent(event));
-};
-//# sourceMappingURL=lambda.js.map

package/dist/lib/lambda.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../app/api-destined-function/src/lib/lambda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAA;AAEnC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE;IACzC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAE5C,OAAO;QACL,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK;SACb;QACD,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,EAAE,EAAE,MAAM,EAAE;QACZ,OAAO,EAAE,yBAAyB;QAClC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM;QAC7B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO;QAC/B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,4BAA4B;QACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;QAC/B,UAAU,EAAE,GAAG;QACf,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,OAAO,CAAC,OAAO,GAAG,KAAK,EAAE,KAAU,EAAE,OAAY,EAAE,QAAa,EAAE,EAAE;IAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5D,OAAO,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAA;AAC5C,CAAC,CAAA"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../app/api-destined-function/src/lib/lambda.ts","../app/api-destined-function/src/test/lambda.test.ts"],"version":"5.9.3"}