@gemeentenijmegen/webapp 1.1.12 → 1.1.13

package/node_modules/@gemeentenijmegen/aws-constructs/lib/QueueWithDlq.js

@@ -0,0 +1,87 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueueWithDlq = void 0;
+const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const aws_sqs_1 = require("aws-cdk-lib/aws-sqs");
+const aws_ssm_1 = require("aws-cdk-lib/aws-ssm");
+const constructs_1 = require("constructs");
+const DeadLetterQueue_1 = require("./DeadLetterQueue");
+/**
+ * A reusable SQS queue with an associated dead-letter queue (DLQ).
+ *
+ * Required props: `identifier` and `key`. Optional props customize FIFO, retention, maxReceiveCount, IAM grants, and SSM exports.
+ *
+ * ```ts
+ *
+ *   const myQueueWithDlq = new QueueWithDlq(this, 'MyQueue', {
+ *     identifier: 'my-process',
+ *     key: myKey,
+ *     role: myRole,
+ *   });
+ *   const mainQueue = myQueueWithDlq.queue;
+ *   const deadLetterQueue = myQueueWithDlq.dlq;
+ *   mainQueue.grantSendMessages(somelambda)
+ * ```
+ */
+class QueueWithDlq extends constructs_1.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        const isFifo = props.fifo ?? true;
+        const retention = props.retentionPeriod ?? aws_cdk_lib_1.Duration.days(14);
+        const maxReceive = props.maxReceiveCount ?? 3;
+        // DLQ optional or make a new one from own construct
+        if (props.dlq) {
+            this.dlq = props.dlq;
+        }
+        else {
+            const dlqId = `${props.identifier}-dlq`;
+            const deadLetter = new DeadLetterQueue_1.DeadLetterQueue(this, dlqId, {
+                alarmCriticality: props.criticality,
+                queueOptions: { fifo: isFifo, ...props.dlqQueueProps }, // fifo setting in queueProps overrides fifo from props if needed
+                kmsKey: props.kmsKey,
+            });
+            this.dlq = deadLetter.dlq;
+        }
+        // No queue names
+        this.queue = new aws_sqs_1.Queue(this, `${props.identifier}-queue`, {
+            ...props.queueProps,
+            fifo: isFifo,
+            encryption: aws_sqs_1.QueueEncryption.KMS,
+            encryptionMasterKey: props.kmsKey,
+            retentionPeriod: retention,
+            deadLetterQueue: {
+                queue: this.dlq,
+                maxReceiveCount: maxReceive,
+            },
+        });
+        if (props.role) {
+            this.queue.grantConsumeMessages(props.role);
+            if (props.grantDlqSend) {
+                this.dlq.grantSendMessages(props.role);
+            }
+        }
+        /**
+         * Ease of settings params with the queue arn into a param with one prop
+         */
+        if (props.ssmQueueArnParamName) {
+            new aws_ssm_1.StringParameter(this, `${props.identifier}-queue-arn-param`, {
+                parameterName: props.ssmQueueArnParamName,
+                stringValue: this.queue.queueArn,
+                description: props.ssmQueueArnParamDescription ?? `ARN of SQS queue ${props.identifier}`,
+            });
+        }
+        if (props.ssmDlqArnParamName) {
+            new aws_ssm_1.StringParameter(this, `${props.identifier}-dlq-arn-param`, {
+                parameterName: props.ssmDlqArnParamName,
+                stringValue: this.dlq.queueArn,
+                description: props.ssmDlqArnParamDescription ?? `ARN of DLQ ${props.identifier}-dlq`,
+            });
+        }
+    }
+}
+exports.QueueWithDlq = QueueWithDlq;
+_a = JSII_RTTI_SYMBOL_1;
+QueueWithDlq[_a] = { fqn: "@gemeentenijmegen/aws-constructs.QueueWithDlq", version: "0.0.46" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"QueueWithDlq.js","sourceRoot":"","sources":["../src/QueueWithDlq.ts"],"names":[],"mappings":";;;;;AAAA,6CAAuC;AAGvC,iDAAyE;AACzE,iDAAsD;AACtD,2CAAuC;AAEvC,uDAAoD;AAmEpD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,YAAa,SAAQ,sBAAS;IAIzC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAwB;QAChE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,eAAe,IAAI,sBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;QAE9C,oDAAoD;QACpD,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,GAAG,KAAK,CAAC,UAAU,MAAM,CAAC;YACxC,MAAM,UAAU,GAAG,IAAI,iCAAe,CAAC,IAAI,EAAE,KAAK,EAAE;gBAClD,gBAAgB,EAAE,KAAK,CAAC,WAAW;gBACnC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,iEAAiE;gBACzH,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;QAC5B,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,KAAK,GAAG,IAAI,eAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,QAAQ,EAAE;YACxD,GAAG,KAAK,CAAC,UAAU;YACnB,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,yBAAe,CAAC,GAAG;YAC/B,mBAAmB,EAAE,KAAK,CAAC,MAAM;YACjC,eAAe,EAAE,SAAS;YAC1B,eAAe,EAAE;gBACf,KAAK,EAAE,IAAI,CAAC,GAAG;gBACf,eAAe,EAAE,UAAU;aAC5B;SACF,CAAC,CAAC;QAGH,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED;;WAEG;QACH,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAC/B,IAAI,yBAAe,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,kBAAkB,EAAE;gBAC/D,aAAa,EAAE,KAAK,CAAC,oBAAoB;gBACzC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAChC,WAAW,EACT,KAAK,CAAC,2BAA2B,IAAI,oBAAoB,KAAK,CAAC,UAAU,EAAE;aAC9E,CAAC,CAAC;QACL,CAAC;QACD,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC7B,IAAI,yBAAe,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,gBAAgB,EAAE;gBAC7D,aAAa,EAAE,KAAK,CAAC,kBAAkB;gBACvC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ;gBAC9B,WAAW,EACT,KAAK,CAAC,yBAAyB,IAAI,cAAc,KAAK,CAAC,UAAU,MAAM;aAC1E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;;AAhEH,oCAiEC","sourcesContent":["import { Duration } from 'aws-cdk-lib';\nimport { Role } from 'aws-cdk-lib/aws-iam';\nimport { IKey } from 'aws-cdk-lib/aws-kms';\nimport { Queue, QueueEncryption, QueueProps } from 'aws-cdk-lib/aws-sqs';\nimport { StringParameter } from 'aws-cdk-lib/aws-ssm';\nimport { Construct } from 'constructs';\nimport { Criticality } from './Criticality/Criticality';\nimport { DeadLetterQueue } from './DeadLetterQueue';\n\nexport interface QueueWithDlqProps {\n  /**\n   * Base identifier for constructs (prefer lowercase, alphanumeric and hyphens) used to name child resources\n   * e.g. 'esb-delivery'\n   */\n  readonly identifier: string;\n  /**\n   * Encryption key for both primary queue and DLQ\n   */\n  readonly kmsKey: IKey;\n  /**\n   * Optional: existing DLQ queue to reuse; if provided, no new DLQ is created\n   */\n  readonly dlq?: Queue;\n  /**\n   * Optional: priority of the DLQ alarm\n   */\n  readonly criticality?: Criticality;\n  /**\n   * Use FIFO queue? Defaults to true\n   */\n  readonly fifo?: boolean;\n  /**\n   * Optional retention period for the main queue. Defaults to 14 days.\n   */\n  readonly retentionPeriod?: Duration;\n  /**\n   * Optional max receive count for DLQ redrive policy. Defaults to 3.\n   */\n  readonly maxReceiveCount?: number;\n  /**\n   * Customize the main queue properties. Certain props (fifo, encryption, deadLetterQueue, retentionPeriod) are overridden.\n   */\n  readonly queueProps?: QueueProps;\n  /**\n   * Customize the dlq queue properties. Certain props (fifo, encryption, deadLetterQueue, retentionPeriod) are overridden.\n   */\n  readonly dlqQueueProps?: QueueProps;\n  /**\n   * Optional: IAM Role which consumes from the queue; if provided, consume grant will be applied\n   * Another option is to get the queue or dlq from the construct and grant resources/roles on them\n   */\n  readonly role?: Role;\n  /**\n   * Optional: grant send permissions to the provided role on the DLQ. Defaults to false.\n   */\n  readonly grantDlqSend?: boolean;\n  /**\n   * Optional: SSM parameter name to store the main queue ARN\n   */\n  readonly ssmQueueArnParamName?: string;\n  /**\n   * Optional: description for the main queue ARN SSM parameter\n   */\n  readonly ssmQueueArnParamDescription?: string;\n  /**\n   * Optional: SSM parameter name to store the DLQ ARN\n   */\n  readonly ssmDlqArnParamName?: string;\n  /**\n   * Optional: description for the DLQ ARN SSM parameter\n   */\n  readonly ssmDlqArnParamDescription?: string;\n}\n\n/**\n * A reusable SQS queue with an associated dead-letter queue (DLQ).\n *\n * Required props: `identifier` and `key`. Optional props customize FIFO, retention, maxReceiveCount, IAM grants, and SSM exports.\n *\n * ```ts\n *\n *   const myQueueWithDlq = new QueueWithDlq(this, 'MyQueue', {\n *     identifier: 'my-process',\n *     key: myKey,\n *     role: myRole,\n *   });\n *   const mainQueue = myQueueWithDlq.queue;\n *   const deadLetterQueue = myQueueWithDlq.dlq;\n *   mainQueue.grantSendMessages(somelambda)\n * ```\n */\nexport class QueueWithDlq extends Construct {\n  public readonly queue: Queue;\n  public readonly dlq: Queue;\n\n  constructor(scope: Construct, id: string, props: QueueWithDlqProps) {\n    super(scope, id);\n\n    const isFifo = props.fifo ?? true;\n    const retention = props.retentionPeriod ?? Duration.days(14);\n    const maxReceive = props.maxReceiveCount ?? 3;\n\n    // DLQ optional or make a new one from own construct\n    if (props.dlq) {\n      this.dlq = props.dlq;\n    } else {\n      const dlqId = `${props.identifier}-dlq`;\n      const deadLetter = new DeadLetterQueue(this, dlqId, {\n        alarmCriticality: props.criticality,\n        queueOptions: { fifo: isFifo, ...props.dlqQueueProps }, // fifo setting in queueProps overrides fifo from props if needed\n        kmsKey: props.kmsKey,\n      });\n      this.dlq = deadLetter.dlq;\n    }\n\n    // No queue names\n    this.queue = new Queue(this, `${props.identifier}-queue`, {\n      ...props.queueProps,\n      fifo: isFifo,\n      encryption: QueueEncryption.KMS,\n      encryptionMasterKey: props.kmsKey,\n      retentionPeriod: retention,\n      deadLetterQueue: {\n        queue: this.dlq,\n        maxReceiveCount: maxReceive,\n      },\n    });\n\n\n    if (props.role) {\n      this.queue.grantConsumeMessages(props.role);\n      if (props.grantDlqSend) {\n        this.dlq.grantSendMessages(props.role);\n      }\n    }\n\n    /**\n     * Ease of settings params with the queue arn into a param with one prop\n     */\n    if (props.ssmQueueArnParamName) {\n      new StringParameter(this, `${props.identifier}-queue-arn-param`, {\n        parameterName: props.ssmQueueArnParamName,\n        stringValue: this.queue.queueArn,\n        description:\n          props.ssmQueueArnParamDescription ?? `ARN of SQS queue ${props.identifier}`,\n      });\n    }\n    if (props.ssmDlqArnParamName) {\n      new StringParameter(this, `${props.identifier}-dlq-arn-param`, {\n        parameterName: props.ssmDlqArnParamName,\n        stringValue: this.dlq.queueArn,\n        description:\n          props.ssmDlqArnParamDescription ?? `ARN of DLQ ${props.identifier}-dlq`,\n      });\n    }\n  }\n}\n"]}

package/node_modules/@gemeentenijmegen/aws-constructs/lib/Vpc.d.ts

@@ -0,0 +1,13 @@
+import { IVpc } from 'aws-cdk-lib/aws-ec2';
+import { Construct } from 'constructs';
+export declare class GemeenteNijmegenVpc extends Construct {
+    readonly vpc: IVpc;
+    /**
+     * Construct to import a VPC using Gemeente Nijmegen
+     * specific landingzone parameters.
+     * @param scope
+     * @param id
+     */
+    constructor(scope: Construct, id: string);
+    private setupVpc;
+}

package/node_modules/@gemeentenijmegen/aws-constructs/lib/Vpc.js

@@ -0,0 +1,42 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GemeenteNijmegenVpc = void 0;
+const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
+const aws_ssm_1 = require("aws-cdk-lib/aws-ssm");
+const constructs_1 = require("constructs");
+class GemeenteNijmegenVpc extends constructs_1.Construct {
+    /**
+     * Construct to import a VPC using Gemeente Nijmegen
+     * specific landingzone parameters.
+     * @param scope
+     * @param id
+     */
+    constructor(scope, id) {
+        super(scope, id);
+        this.vpc = this.setupVpc();
+    }
+    setupVpc() {
+        //VPC setup for ECS cluster
+        const vpc = aws_ec2_1.Vpc.fromVpcAttributes(this, 'vpc', {
+            vpcId: aws_ssm_1.StringParameter.valueForStringParameter(this, '/landingzone/vpc/vpc-id'),
+            availabilityZones: [0, 1, 2].map(i => aws_cdk_lib_1.Fn.select(i, aws_cdk_lib_1.Fn.getAzs(aws_cdk_lib_1.Aws.REGION))),
+            // Private subnets
+            privateSubnetRouteTableIds: [1, 2, 3].map(i => aws_ssm_1.StringParameter.valueForStringParameter(this, `/landingzone/vpc/route-table-private-subnet-${i}-id`)),
+            privateSubnetIds: [1, 2, 3].map(i => aws_ssm_1.StringParameter.valueForStringParameter(this, `/landingzone/vpc/private-subnet-${i}-id`)),
+            // Public subnets
+            publicSubnetRouteTableIds: Array(3).fill(aws_ssm_1.StringParameter.valueForStringParameter(this, '/landingzone/vpc/route-table-public-subnets-id')),
+            publicSubnetIds: [1, 2, 3].map(i => aws_ssm_1.StringParameter.valueForStringParameter(this, `/landingzone/vpc/public-subnet-${i}-id`)),
+            // Data subnets
+            isolatedSubnetRouteTableIds: [1, 2, 3].map(i => aws_ssm_1.StringParameter.valueForStringParameter(this, `/landingzone/vpc/route-table-data-subnet-${i}-id`)),
+            isolatedSubnetIds: [1, 2, 3].map(i => aws_ssm_1.StringParameter.valueForStringParameter(this, `/landingzone/vpc/data-subnet-${i}-id`)),
+        });
+        return vpc;
+    }
+}
+exports.GemeenteNijmegenVpc = GemeenteNijmegenVpc;
+_a = JSII_RTTI_SYMBOL_1;
+GemeenteNijmegenVpc[_a] = { fqn: "@gemeentenijmegen/aws-constructs.GemeenteNijmegenVpc", version: "0.0.46" };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUFzQztBQUN0QyxpREFBZ0Q7QUFDaEQsaURBQXNEO0FBQ3RELDJDQUF1QztBQUV2QyxNQUFhLG1CQUFvQixTQUFRLHNCQUFTO0lBSWhEOzs7OztPQUtHO0lBQ0gsWUFBWSxLQUFnQixFQUFFLEVBQVU7UUFDdEMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsR0FBRyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRU8sUUFBUTtRQUVkLDJCQUEyQjtRQUMzQixNQUFNLEdBQUcsR0FBRyxhQUFHLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRTtZQUM3QyxLQUFLLEVBQUUseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLEVBQUUseUJBQXlCLENBQUM7WUFDL0UsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGdCQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxnQkFBRSxDQUFDLE1BQU0sQ0FBQyxpQkFBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDMUUsa0JBQWtCO1lBQ2xCLDBCQUEwQixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyx5QkFBZSxDQUFDLHVCQUF1QixDQUFDLElBQUksRUFBRSwrQ0FBK0MsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNwSixnQkFBZ0IsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLEVBQUUsbUNBQW1DLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDOUgsaUJBQWlCO1lBQ2pCLHlCQUF5QixFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLEVBQUUsZ0RBQWdELENBQUMsQ0FBQztZQUN6SSxlQUFlLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLHlCQUFlLENBQUMsdUJBQXVCLENBQUMsSUFBSSxFQUFFLGtDQUFrQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzVILGVBQWU7WUFDZiwyQkFBMkIsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMseUJBQWUsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLEVBQUUsNENBQTRDLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbEosaUJBQWlCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLHlCQUFlLENBQUMsdUJBQXVCLENBQUMsSUFBSSxFQUFFLGdDQUFnQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQzdILENBQUMsQ0FBQztRQUVILE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQzs7QUFqQ0gsa0RBbUNDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQXdzLCBGbiB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCB7IElWcGMsIFZwYyB9IGZyb20gJ2F3cy1jZGstbGliL2F3cy1lYzInO1xuaW1wb3J0IHsgU3RyaW5nUGFyYW1ldGVyIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLXNzbSc7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcblxuZXhwb3J0IGNsYXNzIEdlbWVlbnRlTmlqbWVnZW5WcGMgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuXG4gIHJlYWRvbmx5IHZwYzogSVZwYztcblxuICAvKipcbiAgICogQ29uc3RydWN0IHRvIGltcG9ydCBhIFZQQyB1c2luZyBHZW1lZW50ZSBOaWptZWdlblxuICAgKiBzcGVjaWZpYyBsYW5kaW5nem9uZSBwYXJhbWV0ZXJzLlxuICAgKiBAcGFyYW0gc2NvcGVcbiAgICogQHBhcmFtIGlkXG4gICAqL1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgICB0aGlzLnZwYyA9IHRoaXMuc2V0dXBWcGMoKTtcbiAgfVxuXG4gIHByaXZhdGUgc2V0dXBWcGMoKSB7XG5cbiAgICAvL1ZQQyBzZXR1cCBmb3IgRUNTIGNsdXN0ZXJcbiAgICBjb25zdCB2cGMgPSBWcGMuZnJvbVZwY0F0dHJpYnV0ZXModGhpcywgJ3ZwYycsIHtcbiAgICAgIHZwY0lkOiBTdHJpbmdQYXJhbWV0ZXIudmFsdWVGb3JTdHJpbmdQYXJhbWV0ZXIodGhpcywgJy9sYW5kaW5nem9uZS92cGMvdnBjLWlkJyksXG4gICAgICBhdmFpbGFiaWxpdHlab25lczogWzAsIDEsIDJdLm1hcChpID0+IEZuLnNlbGVjdChpLCBGbi5nZXRBenMoQXdzLlJFR0lPTikpKSxcbiAgICAgIC8vIFByaXZhdGUgc3VibmV0c1xuICAgICAgcHJpdmF0ZVN1Ym5ldFJvdXRlVGFibGVJZHM6IFsxLCAyLCAzXS5tYXAoaSA9PiBTdHJpbmdQYXJhbWV0ZXIudmFsdWVGb3JTdHJpbmdQYXJhbWV0ZXIodGhpcywgYC9sYW5kaW5nem9uZS92cGMvcm91dGUtdGFibGUtcHJpdmF0ZS1zdWJuZXQtJHtpfS1pZGApKSxcbiAgICAgIHByaXZhdGVTdWJuZXRJZHM6IFsxLCAyLCAzXS5tYXAoaSA9PiBTdHJpbmdQYXJhbWV0ZXIudmFsdWVGb3JTdHJpbmdQYXJhbWV0ZXIodGhpcywgYC9sYW5kaW5nem9uZS92cGMvcHJpdmF0ZS1zdWJuZXQtJHtpfS1pZGApKSxcbiAgICAgIC8vIFB1YmxpYyBzdWJuZXRzXG4gICAgICBwdWJsaWNTdWJuZXRSb3V0ZVRhYmxlSWRzOiBBcnJheSgzKS5maWxsKFN0cmluZ1BhcmFtZXRlci52YWx1ZUZvclN0cmluZ1BhcmFtZXRlcih0aGlzLCAnL2xhbmRpbmd6b25lL3ZwYy9yb3V0ZS10YWJsZS1wdWJsaWMtc3VibmV0cy1pZCcpKSxcbiAgICAgIHB1YmxpY1N1Ym5ldElkczogWzEsIDIsIDNdLm1hcChpID0+IFN0cmluZ1BhcmFtZXRlci52YWx1ZUZvclN0cmluZ1BhcmFtZXRlcih0aGlzLCBgL2xhbmRpbmd6b25lL3ZwYy9wdWJsaWMtc3VibmV0LSR7aX0taWRgKSksXG4gICAgICAvLyBEYXRhIHN1Ym5ldHNcbiAgICAgIGlzb2xhdGVkU3VibmV0Um91dGVUYWJsZUlkczogWzEsIDIsIDNdLm1hcChpID0+IFN0cmluZ1BhcmFtZXRlci52YWx1ZUZvclN0cmluZ1BhcmFtZXRlcih0aGlzLCBgL2xhbmRpbmd6b25lL3ZwYy9yb3V0ZS10YWJsZS1kYXRhLXN1Ym5ldC0ke2l9LWlkYCkpLFxuICAgICAgaXNvbGF0ZWRTdWJuZXRJZHM6IFsxLCAyLCAzXS5tYXAoaSA9PiBTdHJpbmdQYXJhbWV0ZXIudmFsdWVGb3JTdHJpbmdQYXJhbWV0ZXIodGhpcywgYC9sYW5kaW5nem9uZS92cGMvZGF0YS1zdWJuZXQtJHtpfS1pZGApKSxcbiAgICB9KTtcblxuICAgIHJldHVybiB2cGM7XG4gIH1cblxufSJdfQ==

package/node_modules/@gemeentenijmegen/aws-constructs/lib/index.d.ts

@@ -0,0 +1,7 @@
+export * from './PermissionsBoundaryAspect';
+export * from './DeadLetterQueue';
+export * from './ErrorMonitoringAlarm';
+export * from './LambdaMonitoringAlarm';
+export * from './Criticality/Criticality';
+export * from './Vpc';
+export * from './QueueWithDlq';

package/node_modules/@gemeentenijmegen/aws-constructs/lib/index.js

@@ -0,0 +1,24 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./PermissionsBoundaryAspect"), exports);
+__exportStar(require("./DeadLetterQueue"), exports);
+__exportStar(require("./ErrorMonitoringAlarm"), exports);
+__exportStar(require("./LambdaMonitoringAlarm"), exports);
+__exportStar(require("./Criticality/Criticality"), exports);
+__exportStar(require("./Vpc"), exports);
+__exportStar(require("./QueueWithDlq"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhEQUE0QztBQUM1QyxvREFBa0M7QUFDbEMseURBQXVDO0FBQ3ZDLDBEQUF3QztBQUN4Qyw0REFBMEM7QUFDMUMsd0NBQXNCO0FBQ3RCLGlEQUErQiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gJy4vUGVybWlzc2lvbnNCb3VuZGFyeUFzcGVjdCc7XG5leHBvcnQgKiBmcm9tICcuL0RlYWRMZXR0ZXJRdWV1ZSc7XG5leHBvcnQgKiBmcm9tICcuL0Vycm9yTW9uaXRvcmluZ0FsYXJtJztcbmV4cG9ydCAqIGZyb20gJy4vTGFtYmRhTW9uaXRvcmluZ0FsYXJtJztcbmV4cG9ydCAqIGZyb20gJy4vQ3JpdGljYWxpdHkvQ3JpdGljYWxpdHknO1xuZXhwb3J0ICogZnJvbSAnLi9WcGMnO1xuZXhwb3J0ICogZnJvbSAnLi9RdWV1ZVdpdGhEbHEnOyJdfQ==

package/node_modules/@gemeentenijmegen/{apiclient/node_modules/@gemeentenijmegen/utils → aws-constructs}/package.json

@@ -1,18 +1,23 @@
 {
-  "name": "@gemeentenijmegen/utils",
+  "name": "@gemeentenijmegen/aws-constructs",
+  "description": "AWS CKD constructs for Gemeente Nijmegen",
   "repository": {
     "type": "git",
-    "url": "https://github.com/GemeenteNijmegen/modules-utils.git"
+    "url": "https://github.com/GemeenteNijmegen/modules-aws-constructs.git"
   },
   "scripts": {
     "build": "npx projen build",
     "bump": "npx projen bump",
     "clobber": "npx projen clobber",
+    "compat": "npx projen compat",
     "compile": "npx projen compile",
     "default": "npx projen default",
+    "docgen": "npx projen docgen",
     "eject": "npx projen eject",
     "eslint": "npx projen eslint",
     "package": "npx projen package",
+    "package-all": "npx projen package-all",
+    "package:js": "npx projen package:js",
     "post-compile": "npx projen post-compile",
     "post-upgrade": "npx projen post-upgrade",
     "pre-compile": "npx projen pre-compile",
@@ -24,38 +29,47 @@
     "watch": "npx projen watch",
     "projen": "npx projen"
   },
+  "author": {
+    "name": "Gemeente Nijmegen",
+    "organization": false
+  },
   "devDependencies": {
-    "@gemeentenijmegen/projen-project-type": "^1.11.1",
+    "@gemeentenijmegen/projen-project-type": "^1.11.10",
     "@stylistic/eslint-plugin": "^2",
-    "@testcontainers/localstack": "^10.28.0",
-    "@types/jest": "^28.1.8",
-    "@types/node": "^18",
+    "@types/jest": "^27",
+    "@types/node": "^16 <= 16.18.78",
     "@typescript-eslint/eslint-plugin": "^8",
     "@typescript-eslint/parser": "^8",
-    "aws-sdk-client-mock": "^2.2.0",
+    "aws-cdk-lib": "2.28.0",
     "commit-and-tag-version": "^12",
-    "constructs": "^10.0.0",
+    "constructs": "10.0.5",
     "eslint": "^9",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.32.0",
     "jest": "^27",
     "jest-junit": "^16",
-    "projen": "^0.93.3",
+    "jsii": "~5.8.0",
+    "jsii-diff": "^1.120.0",
+    "jsii-docgen": "^10.5.0",
+    "jsii-pacmak": "^1.120.0",
+    "jsii-rosetta": "~5.8.0",
+    "projen": "^0.98.28",
     "ts-jest": "^27",
     "typescript": "^4.9.5"
   },
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.850.0",
-    "@aws-sdk/client-secrets-manager": "^3.848.0",
-    "@aws-sdk/client-ssm": "^3.849.0",
-    "@aws-sdk/s3-request-presigner": "^3.850.0"
+  "peerDependencies": {
+    "aws-cdk-lib": "^2.28.0",
+    "constructs": "^10.0.5"
   },
+  "keywords": [
+    "cdk"
+  ],
   "main": "lib/index.js",
   "license": "EUPL-1.2",
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.35",
+  "version": "0.0.46",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [
@@ -98,5 +112,14 @@
     }
   },
   "types": "lib/index.d.ts",
+  "stability": "stable",
+  "jsii": {
+    "outdir": "dist",
+    "targets": {},
+    "tsc": {
+      "outDir": "lib",
+      "rootDir": "src"
+    }
+  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }

package/node_modules/@gemeentenijmegen/session/lib/index.js

@@ -200,4 +200,4 @@ class Session {
 }
 exports.Session = Session;
 exports.Session = Session;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from 'crypto';\nimport { DynamoDBClient, GetItemCommand, PutItemCommand, UpdateItemCommand } from '@aws-sdk/client-dynamodb';\nimport cookie from 'cookie';\n\nexport interface SessionOptions {\n  ttlInMinutes: number; //default 15 minutes\n}\n\nexport class Session {\n  sessionId: string | false;\n  sessionHash: string | false = false;\n  session?: any;\n  dbClient: DynamoDBClient;\n  state?: string; // state parameter to validate OpenIDConnect response\n  ttl: number;\n  /**\n     * Session handler\n     *\n     * Construct a session object and pass the lambda event object.\n     * call init() to get the current session state. create or update\n     * sessions as needed.\n     * @param {string} cookieString the event object provided to the lambda\n     */\n  constructor(cookieString: string, dynamoDBClient: DynamoDBClient, options?: SessionOptions) {\n    this.sessionId = this.getSessionId(cookieString);\n    this.dbClient = dynamoDBClient;\n    if (this.sessionId) {\n      this.sessionHash = this.hash(this.sessionId);\n    }\n    this.ttl = options?.ttlInMinutes ?? 15;\n  }\n\n  /**\n     * Parses the cookie string for the session id.\n     * @param {object} cookieString a standard cookie header value\n     * @returns {string|false}\n     */\n  getSessionId(cookieString: string): string | false {\n    if (!cookieString) { return false; }\n    const cookies = cookie.parse(cookieString);\n    if (cookies?.session != '') {\n      return cookies.session;\n    }\n    return false;\n  }\n\n  hash(hashString: string): string {\n    const hash = crypto.createHash('sha256');\n    hash.update(hashString);\n    return hash.digest('base64');\n  }\n\n  /**\n     * Get the current session state from dynamodb,\n     * set instance variables on the Session object.\n     *\n     * @returns dynamodb record | false\n     */\n  async init() {\n    if (!this.sessionHash) { return false; }\n    const getItemCommand = new GetItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Key: {\n        sessionid: { S: this.sessionHash },\n      },\n    });\n    try {\n      const session = await this.dbClient.send(getItemCommand);\n      if (session?.Item?.data !== undefined) {\n        this.session = session;\n        return session;\n      } else {\n        return false;\n      }\n    } catch (err) {\n      console.error('Error getting session from DynamoDB: ' + err);\n      throw err;\n    }\n  }\n  /**\n     * Check the current session state for login state. Call after init()\n     * @returns bool\n     */\n  isLoggedIn() {\n    return this.getValue('loggedin', 'BOOL') ?? false;\n  }\n\n  /**\n   * Get a value from the session store by key\n   *\n   * @param key key for the element in sessionData requested\n   * @param type type of data (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.NamingRulesDataTypes.html#HowItWorks.DataTypes)\n   * @returns {any} the value for the provided key or undefined if not found\n   */\n  getValue(key: string, type = 'S'): any {\n    return this.session?.Item?.data?.M[key]?.[type];\n  }\n\n  /** Update the session with a single value\n   * The new data object will be written to the session\n   * immediately.\n   */\n  async setValue(key: string, value: string) {\n    if (!this.session?.Item?.data) {\n      await this.init();\n    }\n    const data = this.session?.Item?.data;\n    data.M[key] = {\n      S: value,\n    };\n    return this.updateSession(data.M);\n  }\n\n  /**\n   * Update string values in the session in bulk\n   * The new data will be written to the session immediately.\n   */\n  async setValues(valuesToSet: Record<string, string>) {\n    if (!this.session?.Item?.data) {\n      await this.init();\n    }\n    const data = this.session?.Item?.data;\n    Object.entries(valuesToSet).forEach(([key, value]) => {\n      data.M[key] = {\n        S: value,\n      };\n    });\n    return this.updateSession(data.M);\n  }\n\n  /**\n     * Update the session with session data\n     *\n     * @param {any} sessionData set the session data\n     */\n  async updateSession(sessionData: any) {\n    if (!this.sessionHash) {\n      throw new Error('no sessionid, cannot update empty session');\n    }\n    const ttl = this.ttlFromMinutes(this.ttl);\n\n    /**\n         * ttl is a reserved keyword in dynamodb, so we need to set\n         * an alias in the ExpressionAttributeNames\n         */\n    const command = new UpdateItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Key: {\n        sessionid: { S: this.sessionHash },\n      },\n      UpdateExpression: 'SET #ttl = :ttl, #data = :data',\n      ExpressionAttributeNames: {\n        '#ttl': 'ttl',\n        '#data': 'data',\n      },\n      ExpressionAttributeValues: {\n        ':ttl': { N: ttl },\n        ':data': { M: sessionData },\n      },\n    });\n    try {\n      await this.dbClient.send(command);\n    } catch (err) {\n      console.error('Error updating session in DynamoDB: ' + err);\n      throw err;\n    }\n    if (!this?.session?.Item?.data?.M) { throw Error('Session had no data before, was this a valid session?'); }\n    this.session.Item.data.M = sessionData;\n  }\n\n  /**\n     * Create a new session, store in dynamodb\n     */\n  async createSession(sessionData: any): Promise<string> {\n    const sessionId = crypto.randomUUID();\n    this.sessionHash = this.hash(sessionId);\n    const ttl = this.ttlFromMinutes(this.ttl);\n\n    const command = new PutItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Item: {\n        sessionid: { S: this.sessionHash },\n        data: { M: sessionData },\n        ttl: { N: ttl },\n      },\n    });\n    await this.dbClient.send(command);\n    this.sessionId = sessionId;\n    return sessionId;\n  }\n\n  private ttlFromMinutes(minutes: number): string {\n    const now = new Date();\n    const ttl = Math.floor((now.getTime() / 1000) + minutes * 60).toString(); // ttl is 15 minutes\n    return ttl;\n  }\n\n  getCookie(): string {\n    const value = (this.sessionId != false) ? this.sessionId : '';\n    const cookieString = cookie.serialize('session', value, {\n      httpOnly: true,\n      secure: true,\n      path: '/', //make sure the cookie is set for all paths in the domain\n    });\n    return cookieString;\n  }\n}\n\nexports.Session = Session;\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto from 'crypto';\nimport { DynamoDBClient, GetItemCommand, PutItemCommand, UpdateItemCommand } from '@aws-sdk/client-dynamodb';\nimport cookie from 'cookie';\n\nexport interface SessionOptions {\n  ttlInMinutes: number; //default 15 minutes\n}\n\nexport class Session {\n  sessionId: string | false;\n  sessionHash: string | false = false;\n  session?: any;\n  dbClient: DynamoDBClient;\n  state?: string; // state parameter to validate OpenIDConnect response\n  ttl: number;\n  /**\n     * Session handler\n     *\n     * Construct a session object and pass the lambda event object.\n     * call init() to get the current session state. create or update\n     * sessions as needed.\n     * @param {string} cookieString the event object provided to the lambda\n     */\n  constructor(cookieString: string, dynamoDBClient: DynamoDBClient, options?: SessionOptions) {\n    this.sessionId = this.getSessionId(cookieString);\n    this.dbClient = dynamoDBClient;\n    if (this.sessionId) {\n      this.sessionHash = this.hash(this.sessionId);\n    }\n    this.ttl = options?.ttlInMinutes ?? 15;\n  }\n\n  /**\n     * Parses the cookie string for the session id.\n     * @param {object} cookieString a standard cookie header value\n     * @returns {string|false}\n     */\n  getSessionId(cookieString: string): string | false {\n    if (!cookieString) { return false; }\n    const cookies = cookie.parse(cookieString);\n    if (cookies?.session != '') {\n      return cookies.session;\n    }\n    return false;\n  }\n\n  hash(hashString: string): string {\n    const hash = crypto.createHash('sha256');\n    hash.update(hashString);\n    return hash.digest('base64');\n  }\n\n  /**\n     * Get the current session state from dynamodb,\n     * set instance variables on the Session object.\n     *\n     * @returns dynamodb record | false\n     */\n  async init() {\n    if (!this.sessionHash) { return false; }\n    const getItemCommand = new GetItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Key: {\n        sessionid: { S: this.sessionHash },\n      },\n    });\n    try {\n      const session = await this.dbClient.send(getItemCommand);\n      if (session?.Item?.data !== undefined) {\n        this.session = session;\n        return session;\n      } else {\n        return false;\n      }\n    } catch (err) {\n      console.error('Error getting session from DynamoDB: ' + err);\n      throw err;\n    }\n  }\n  /**\n     * Check the current session state for login state. Call after init()\n     * @returns bool\n     */\n  isLoggedIn() {\n    return this.getValue('loggedin', 'BOOL') ?? false;\n  }\n\n  /**\n   * Get a value from the session store by key\n   *\n   * @param key key for the element in sessionData requested\n   * @param type type of data (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.NamingRulesDataTypes.html#HowItWorks.DataTypes)\n   * @returns {any} the value for the provided key or undefined if not found\n   */\n  getValue(key: string, type = 'S'): any {\n    return this.session?.Item?.data?.M[key]?.[type];\n  }\n\n  /** Update the session with a single value\n   * The new data object will be written to the session\n   * immediately.\n   */\n  async setValue(key: string, value: string) {\n    if (!this.session?.Item?.data) {\n      await this.init();\n    }\n    const data = this.session?.Item?.data;\n    data.M[key] = {\n      S: value,\n    };\n    return this.updateSession(data.M);\n  }\n\n  /**\n   * Update string values in the session in bulk\n   * The new data will be written to the session immediately.\n   */\n  async setValues(valuesToSet: Record<string, string>) {\n    if (!this.session?.Item?.data) {\n      await this.init();\n    }\n    const data = this.session?.Item?.data;\n    Object.entries(valuesToSet).forEach(([key, value]) => {\n      data.M[key] = {\n        S: value,\n      };\n    });\n    return this.updateSession(data.M);\n  }\n\n  /**\n     * Update the session with session data\n     *\n     * @param {any} sessionData set the session data\n     */\n  async updateSession(sessionData: any) {\n    if (!this.sessionHash) {\n      throw new Error('no sessionid, cannot update empty session');\n    }\n    const ttl = this.ttlFromMinutes(this.ttl);\n\n    /**\n         * ttl is a reserved keyword in dynamodb, so we need to set\n         * an alias in the ExpressionAttributeNames\n         */\n    const command = new UpdateItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Key: {\n        sessionid: { S: this.sessionHash },\n      },\n      UpdateExpression: 'SET #ttl = :ttl, #data = :data',\n      ExpressionAttributeNames: {\n        '#ttl': 'ttl',\n        '#data': 'data',\n      },\n      ExpressionAttributeValues: {\n        ':ttl': { N: ttl },\n        ':data': { M: sessionData },\n      },\n    });\n    try {\n      await this.dbClient.send(command);\n    } catch (err) {\n      console.error('Error updating session in DynamoDB: ' + err);\n      throw err;\n    }\n    if (!this?.session?.Item?.data?.M) { throw Error('Session had no data before, was this a valid session?'); }\n    this.session.Item.data.M = sessionData;\n  }\n\n  /**\n     * Create a new session, store in dynamodb\n     */\n  async createSession(sessionData: any): Promise<string> {\n    const sessionId = crypto.randomUUID();\n    this.sessionHash = this.hash(sessionId);\n    const ttl = this.ttlFromMinutes(this.ttl);\n\n    const command = new PutItemCommand({\n      TableName: process.env.SESSION_TABLE,\n      Item: {\n        sessionid: { S: this.sessionHash },\n        data: { M: sessionData },\n        ttl: { N: ttl },\n      },\n    });\n    await this.dbClient.send(command);\n    this.sessionId = sessionId;\n    return sessionId;\n  }\n\n  private ttlFromMinutes(minutes: number): string {\n    const now = new Date();\n    const ttl = Math.floor((now.getTime() / 1000) + minutes * 60).toString(); // ttl is 15 minutes\n    return ttl;\n  }\n\n  getCookie(): string {\n    const value = (this.sessionId != false) ? this.sessionId : '';\n    const cookieString = cookie.serialize('session', value, {\n      httpOnly: true,\n      secure: true,\n      path: '/', //make sure the cookie is set for all paths in the domain\n    });\n    return cookieString;\n  }\n}\n\nexports.Session = Session;\n"]}

package/node_modules/@gemeentenijmegen/session/package.json

@@ -25,7 +25,7 @@
     "projen": "npx projen"
   },
   "devDependencies": {
-    "@gemeentenijmegen/projen-project-type": "^1.11.4",
+    "@gemeentenijmegen/projen-project-type": "^1.11.10",
     "@stylistic/eslint-plugin": "^2",
     "@types/cookie": "^0.6.0",
     "@types/jest": "^27.5.2",
@@ -40,12 +40,13 @@
     "jest": "^27",
     "jest-aws-client-mock": "^0.0.26",
     "jest-junit": "^16",
-    "projen": "^0.96.1",
-    "ts-jest": "^27",
-    "typescript": "^4.9.5"
+    "projen": "^0.98.26",
+    "ts-jest": "^29.4.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.908.0",
+    "@aws-sdk/client-dynamodb": "^3.940.0",
     "cookie": "^0.7.2"
   },
   "main": "lib/index.js",
@@ -53,12 +54,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.31",
+  "version": "0.0.32",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [
       "<rootDir>/@(src|test)/**/*(*.)@(spec|test).ts?(x)",
-      "<rootDir>/@(src|test)/**/__tests__/**/*.ts?(x)"
+      "<rootDir>/@(src|test)/**/__tests__/**/*.ts?(x)",
+      "<rootDir>/@(projenrc)/**/*(*.)@(spec|test).ts?(x)",
+      "<rootDir>/@(projenrc)/**/__tests__/**/*.ts?(x)"
     ],
     "clearMocks": true,
     "collectCoverage": true,
@@ -88,13 +91,15 @@
         }
       ]
     ],
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "tsconfig": "tsconfig.dev.json"
-      }
+    "transform": {
+      "^.+\\.[t]sx?$": [
+        "ts-jest",
+        {
+          "tsconfig": "tsconfig.dev.json"
+        }
+      ]
     }
   },
   "types": "lib/index.d.ts",
-  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
+  "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
 }

package/node_modules/@smithy/abort-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/abort-controller",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "description": "A simple abort controller library",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -26,7 +26,7 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/types": "^4.8.0",
+    "@smithy/types": "^4.9.0",
     "tslib": "^2.6.2"
   },
   "engines": {

package/node_modules/@smithy/config-resolver/dist-cjs/index.js

@@ -77,7 +77,12 @@ const NODE_REGION_CONFIG_FILE_OPTIONS = {
 const validRegions = new Set();
 const checkRegion = (region, check = utilEndpoints.isValidHostLabel) => {
     if (!validRegions.has(region) && !check(region)) {
-        throw new Error(`Region not accepted: region="${region}" is not a valid hostname component.`);
+        if (region === "*") {
+            console.warn(`@smithy/config-resolver WARN - Please use the caller region instead of "*". See "sigv4a" in https://github.com/aws/aws-sdk-js-v3/blob/main/supplemental-docs/CLIENTS.md.`);
+        }
+        else {
+            throw new Error(`Region not accepted: region="${region}" is not a valid hostname component.`);
+        }
     }
     else {
         validRegions.add(region);

package/node_modules/@smithy/config-resolver/dist-es/regionConfig/checkRegion.js

@@ -2,7 +2,12 @@ import { isValidHostLabel } from "@smithy/util-endpoints";
 const validRegions = new Set();
 export const checkRegion = (region, check = isValidHostLabel) => {
     if (!validRegions.has(region) && !check(region)) {
-        throw new Error(`Region not accepted: region="${region}" is not a valid hostname component.`);
+        if (region === "*") {
+            console.warn(`@smithy/config-resolver WARN - Please use the caller region instead of "*". See "sigv4a" in https://github.com/aws/aws-sdk-js-v3/blob/main/supplemental-docs/CLIENTS.md.`);
+        }
+        else {
+            throw new Error(`Region not accepted: region="${region}" is not a valid hostname component.`);
+        }
     }
     else {
         validRegions.add(region);

package/node_modules/@smithy/config-resolver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/config-resolver",
-  "version": "4.4.0",
+  "version": "4.4.3",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "node ../../scripts/inline config-resolver",
@@ -25,11 +25,11 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/node-config-provider": "^4.3.3",
-    "@smithy/types": "^4.8.0",
+    "@smithy/node-config-provider": "^4.3.5",
+    "@smithy/types": "^4.9.0",
     "@smithy/util-config-provider": "^4.2.0",
-    "@smithy/util-endpoints": "^3.2.3",
-    "@smithy/util-middleware": "^4.2.3",
+    "@smithy/util-endpoints": "^3.2.5",
+    "@smithy/util-middleware": "^4.2.5",
     "tslib": "^2.6.2"
   },
   "devDependencies": {

package/node_modules/@smithy/core/dist-cjs/submodules/cbor/index.js

@@ -874,8 +874,15 @@ class CborShapeDeserializer extends protocols.SerdeContext {
     }
     readValue(_schema, value) {
         const ns = schema.NormalizedSchema.of(_schema);
-        if (ns.isTimestampSchema() && typeof value === "number") {
-            return serde._parseEpochTimestamp(value);
+        if (ns.isTimestampSchema()) {
+            if (typeof value === "number") {
+                return serde._parseEpochTimestamp(value);
+            }
+            if (typeof value === "object") {
+                if (value.tag === 1 && "value" in value) {
+                    return serde._parseEpochTimestamp(value.value);
+                }
+            }
         }
         if (ns.isBlobSchema()) {
             if (typeof value === "string") {
@@ -891,7 +898,7 @@ class CborShapeDeserializer extends protocols.SerdeContext {
             typeof value === "symbol") {
             return value;
         }
-        else if (typeof value === "function" || typeof value === "object") {
+        else if (typeof value === "object") {
             if (value === null) {
                 return null;
             }
@@ -929,7 +936,10 @@ class CborShapeDeserializer extends protocols.SerdeContext {
             }
             else if (ns.isStructSchema()) {
                 for (const [key, memberSchema] of ns.structIterator()) {
-                    newObject[key] = this.readValue(memberSchema, value[key]);
+                    const v = this.readValue(memberSchema, value[key]);
+                    if (v != null) {
+                        newObject[key] = v;
+                    }
                 }
             }
             return newObject;
@@ -995,7 +1005,6 @@ class SmithyRpcV2CborProtocol extends protocols.RpcProtocol {
         }
         const errorMetadata = {
             $metadata: metadata,
-            $response: response,
             $fault: response.statusCode <= 500 ? "client" : "server",
         };
         const registry = schema.TypeRegistry.for(namespace);

package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js

@@ -76,8 +76,9 @@ class EventStreamSerde {
             const unionMember = Object.keys(event).find((key) => {
                 return key !== "__type";
             }) ?? "";
+            const body = event[unionMember].body;
             if (unionMember === "initial-response") {
-                const dataObject = await this.deserializer.read(responseSchema, event[unionMember].body);
+                const dataObject = await this.deserializer.read(responseSchema, body);
                 delete dataObject[eventStreamMember];
                 return {
                     [initialResponseMarker]: true,
@@ -86,8 +87,48 @@ class EventStreamSerde {
             }
             else if (unionMember in memberSchemas) {
                 const eventStreamSchema = memberSchemas[unionMember];
+                if (eventStreamSchema.isStructSchema()) {
+                    const out = {};
+                    let hasBindings = false;
+                    for (const [name, member] of eventStreamSchema.structIterator()) {
+                        const { eventHeader, eventPayload } = member.getMergedTraits();
+                        hasBindings = hasBindings || Boolean(eventHeader || eventPayload);
+                        if (eventPayload) {
+                            if (member.isBlobSchema()) {
+                                out[name] = body;
+                            }
+                            else if (member.isStringSchema()) {
+                                out[name] = (this.serdeContext?.utf8Encoder ?? utilUtf8.toUtf8)(body);
+                            }
+                            else if (member.isStructSchema()) {
+                                out[name] = await this.deserializer.read(member, body);
+                            }
+                        }
+                        else if (eventHeader) {
+                            const value = event[unionMember].headers[name]?.value;
+                            if (value != null) {
+                                if (member.isNumericSchema()) {
+                                    if (value && typeof value === "object" && "bytes" in value) {
+                                        out[name] = BigInt(value.toString());
+                                    }
+                                    else {
+                                        out[name] = Number(value);
+                                    }
+                                }
+                                else {
+                                    out[name] = value;
+                                }
+                            }
+                        }
+                    }
+                    if (hasBindings) {
+                        return {
+                            [unionMember]: out,
+                        };
+                    }
+                }
                 return {
-                    [unionMember]: await this.deserializer.read(eventStreamSchema, event[unionMember].body),
+                    [unionMember]: await this.deserializer.read(eventStreamSchema, body),
                 };
             }
             else {
@@ -146,7 +187,6 @@ class EventStreamSerde {
                     const { eventHeader, eventPayload } = memberSchema.getMergedTraits();
                     if (eventPayload) {
                         explicitPayloadMember = memberName;
-                        break;
                     }
                     else if (eventHeader) {
                         const value = event[unionMember][memberName];