truemark-cdk-lib 1.21.0-beta.1766378245 → 1.21.0-beta.1766964363

package/aws-lambda/lib/function-log-options.d.ts

@@ -1,5 +1,5 @@
 import * as lambda from 'aws-cdk-lib/aws-lambda';
-import { LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
+import { RetentionDays } from 'aws-cdk-lib/aws-logs';
 import { Construct } from 'constructs';
 /**
  * Configuration for function logs. By default the log group will be destroyed
@@ -35,4 +35,4 @@ export interface FunctionLogOptions {
  * @param props The properties of the function.
  * @returns The log group, or undefined if it was not configured.
  */
-export declare function configureLogGroupForFunction(scope: Construct, id: string, props: lambda.FunctionOptions): LogGroup | undefined;
+export declare function configureLogGroupForFunction(scope: Construct, id: string, props: lambda.FunctionOptions): import("aws-cdk-lib/aws-logs").ILogGroup | undefined;

package/aws-lambda/lib/function-log-options.js

@@ -12,28 +12,39 @@ const aws_logs_1 = require("aws-cdk-lib/aws-logs");
  * @returns The log group, or undefined if it was not configured.
  */
 function configureLogGroupForFunction(scope, id, props) {
-    var _a, _b;
+    var _a, _b, _c;
     let logConfig;
     if (props.logConfig) {
         logConfig = props.logConfig;
     }
+    if (logConfig && props.logGroup) {
+        throw new Error('Cannot specify both logGroup and logConfig.');
+    }
+    if (logConfig && props.logRetention) {
+        throw new Error('Cannot specify both logRetention and logConfig.');
+    }
     if (props.logGroup && logConfig) {
         throw new Error('Cannot specify both logGroup and logConfig.');
     }
     if (props.logRetention && logConfig) {
         throw new Error('Cannot specify both logRetention and logConfig.');
     }
-    if (!props.logGroup && !props.logRetention) {
-        // Calculate the function name that CDK will generate
-        // This mimics CDK's default naming: {StackName}-{ConstructId}-{UniqueHash}
-        const uniqueId = aws_cdk_lib_1.Names.uniqueId(scope).substring(0, 8);
-        const functionName = (_a = props.functionName) !== null && _a !== void 0 ? _a : `${aws_cdk_lib_1.Stack.of(scope).stackName}-${id}-${uniqueId}`.substring(0, 64);
-        return new aws_logs_1.LogGroup(scope, `${id}LogGroup`, {
-            logGroupName: `/aws/lambda/${functionName}`,
-            retention: (_b = logConfig === null || logConfig === void 0 ? void 0 : logConfig.retention) !== null && _b !== void 0 ? _b : aws_logs_1.RetentionDays.THREE_DAYS,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
+    // Use the logGroup is one is passed in
+    if (props.logGroup) {
+        return props.logGroup;
+    }
+    // If log retention is defined, fallback to deprecated behavior
+    if (props.logRetention) {
+        return undefined;
     }
-    return undefined;
+    // Calculate the function name that CDK will generate
+    // This mimics CDK's default naming: {StackName}-{ConstructId}-{UniqueHash}
+    const uniqueId = aws_cdk_lib_1.Names.uniqueId(scope).substring(0, 8);
+    const functionName = (_a = props.functionName) !== null && _a !== void 0 ? _a : `${aws_cdk_lib_1.Stack.of(scope).stackName}-${id}-${uniqueId}`.substring(0, 64);
+    return new aws_logs_1.LogGroup(scope, `${id}LogGroup`, {
+        logGroupName: (_b = logConfig === null || logConfig === void 0 ? void 0 : logConfig.logGroupName) !== null && _b !== void 0 ? _b : `/aws/lambda/${functionName}`,
+        retention: (_c = logConfig === null || logConfig === void 0 ? void 0 : logConfig.retention) !== null && _c !== void 0 ? _c : aws_logs_1.RetentionDays.THREE_DAYS,
+        removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+    });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb24tbG9nLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmdW5jdGlvbi1sb2ctb3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQXlDQSxvRUE4QkM7QUF2RUQsNkNBQXdEO0FBRXhELG1EQUE2RDtBQStCN0Q7Ozs7Ozs7R0FPRztBQUNILFNBQWdCLDRCQUE0QixDQUMxQyxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBNkI7O0lBRTdCLElBQUksU0FBd0MsQ0FBQztJQUM3QyxJQUFLLEtBQTRCLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDNUMsU0FBUyxHQUFJLEtBQTRCLENBQUMsU0FBUyxDQUFDO0lBQ3RELENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxRQUFRLElBQUksU0FBUyxFQUFFLENBQUM7UUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxZQUFZLElBQUksU0FBUyxFQUFFLENBQUM7UUFDcEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUMzQyxxREFBcUQ7UUFDckQsMkVBQTJFO1FBQzNFLE1BQU0sUUFBUSxHQUFHLG1CQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkQsTUFBTSxZQUFZLEdBQ2hCLE1BQUEsS0FBSyxDQUFDLFlBQVksbUNBQ2xCLEdBQUcsbUJBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxJQUFJLEVBQUUsSUFBSSxRQUFRLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRXBFLE9BQU8sSUFBSSxtQkFBUSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFO1lBQzFDLFlBQVksRUFBRSxlQUFlLFlBQVksRUFBRTtZQUMzQyxTQUFTLEVBQUUsTUFBQSxTQUFTLGFBQVQsU0FBUyx1QkFBVCxTQUFTLENBQUUsU0FBUyxtQ0FBSSx3QkFBYSxDQUFDLFVBQVU7WUFDM0QsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztTQUNyQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7TmFtZXMsIFJlbW92YWxQb2xpY3ksIFN0YWNrfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnYXdzLWNkay1saWIvYXdzLWxhbWJkYSc7XG5pbXBvcnQge0xvZ0dyb3VwLCBSZXRlbnRpb25EYXlzfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtbG9ncyc7XG5pbXBvcnQge0NvbnN0cnVjdH0gZnJvbSAnY29uc3RydWN0cyc7XG5cbi8qKlxuICogQ29uZmlndXJhdGlvbiBmb3IgZnVuY3Rpb24gbG9ncy4gQnkgZGVmYXVsdCB0aGUgbG9nIGdyb3VwIHdpbGwgYmUgZGVzdHJveWVkXG4gKiB3aGVuIHRoZSBzdGFjayBpcyBkZXN0cm95ZWQuIElmIHlvdSByZXF1aXJlIGEgZGlmZmVyZW50IGJlaGF2aW9yIG9yIGhhdmVcbiAqIG90aGVyIGxvZyByZXF1aXJlbWVudHMsIGl0J3MgcmVjb21tZW5kZWQgdG8gY3JlYXRlIGEgbG9nIGdyb3VwIGFuZCBzZXRcbiAqIGxvZ0dyb3VwIGV4cGxpY2l0bHkgaW5zdGVhZCBvZiB1c2luZyB0aGlzIGNvbmZpZ3VyYXRpb24uXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgRnVuY3Rpb25Mb2dDb25maWcge1xuICAvKipcbiAgICogVGhlIHJldGVudGlvbiBwZXJpb2QgZm9yIHRoZSBsb2cgZ3JvdXAuIERlZmF1bHQgaXMgMyBkYXlzLlxuICAgKi9cbiAgcmVhZG9ubHkgcmV0ZW50aW9uPzogUmV0ZW50aW9uRGF5cztcbiAgLyoqXG4gICAqIFRoZSBsb2cgZ3JvdXAgdG8gdXNlIGZvciB0aGUgZnVuY3Rpb24gbG9ncy4gSWYgbm90IHByb3ZpZGVkLCBDREsgd2lsbFxuICAgKiBnZW5lcmF0ZSB0aGUgbmFtZS5cbiAgICovXG4gIHJlYWRvbmx5IGxvZ0dyb3VwTmFtZT86IHN0cmluZztcbn1cblxuLyoqXG4gKiBPcHRpb25zIGZvciBjb25maWd1cmluZyBmdW5jdGlvbiBsb2dzLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEZ1bmN0aW9uTG9nT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgY29uZmlndXJhdGlvbiBmb3IgdGhlIGZ1bmN0aW9uIGxvZ3MuXG4gICAqL1xuICBsb2dDb25maWc/OiBGdW5jdGlvbkxvZ0NvbmZpZztcbn1cblxuLyoqXG4gKiBDb25maWd1cmUgdGhlIGxvZyBncm91cCBmb3IgYSBMYW1iZGEgZnVuY3Rpb24uXG4gKlxuICogQHBhcmFtIHNjb3BlIFRoZSBwYXJlbnQgc2NvcGUgaW4gd2hpY2ggdG8gY3JlYXRlIHRoZSBsb2cgZ3JvdXAuXG4gKiBAcGFyYW0gaWQgVGhlIElEIG9mIHRoZSBMYW1iZGEgZnVuY3Rpb24gY29uc3RydWN0LlxuICogQHBhcmFtIHByb3BzIFRoZSBwcm9wZXJ0aWVzIG9mIHRoZSBmdW5jdGlvbi5cbiAqIEByZXR1cm5zIFRoZSBsb2cgZ3JvdXAsIG9yIHVuZGVmaW5lZCBpZiBpdCB3YXMgbm90IGNvbmZpZ3VyZWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjb25maWd1cmVMb2dHcm91cEZvckZ1bmN0aW9uKFxuICBzY29wZTogQ29uc3RydWN0LFxuICBpZDogc3RyaW5nLFxuICBwcm9wczogbGFtYmRhLkZ1bmN0aW9uT3B0aW9ucyxcbikge1xuICBsZXQgbG9nQ29uZmlnOiBGdW5jdGlvbkxvZ0NvbmZpZyB8IHVuZGVmaW5lZDtcbiAgaWYgKChwcm9wcyBhcyBGdW5jdGlvbkxvZ09wdGlvbnMpLmxvZ0NvbmZpZykge1xuICAgIGxvZ0NvbmZpZyA9IChwcm9wcyBhcyBGdW5jdGlvbkxvZ09wdGlvbnMpLmxvZ0NvbmZpZztcbiAgfVxuICBpZiAocHJvcHMubG9nR3JvdXAgJiYgbG9nQ29uZmlnKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdDYW5ub3Qgc3BlY2lmeSBib3RoIGxvZ0dyb3VwIGFuZCBsb2dDb25maWcuJyk7XG4gIH1cbiAgaWYgKHByb3BzLmxvZ1JldGVudGlvbiAmJiBsb2dDb25maWcpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ0Nhbm5vdCBzcGVjaWZ5IGJvdGggbG9nUmV0ZW50aW9uIGFuZCBsb2dDb25maWcuJyk7XG4gIH1cbiAgaWYgKCFwcm9wcy5sb2dHcm91cCAmJiAhcHJvcHMubG9nUmV0ZW50aW9uKSB7XG4gICAgLy8gQ2FsY3VsYXRlIHRoZSBmdW5jdGlvbiBuYW1lIHRoYXQgQ0RLIHdpbGwgZ2VuZXJhdGVcbiAgICAvLyBUaGlzIG1pbWljcyBDREsncyBkZWZhdWx0IG5hbWluZzoge1N0YWNrTmFtZX0te0NvbnN0cnVjdElkfS17VW5pcXVlSGFzaH1cbiAgICBjb25zdCB1bmlxdWVJZCA9IE5hbWVzLnVuaXF1ZUlkKHNjb3BlKS5zdWJzdHJpbmcoMCwgOCk7XG4gICAgY29uc3QgZnVuY3Rpb25OYW1lID1cbiAgICAgIHByb3BzLmZ1bmN0aW9uTmFtZSA/P1xuICAgICAgYCR7U3RhY2sub2Yoc2NvcGUpLnN0YWNrTmFtZX0tJHtpZH0tJHt1bmlxdWVJZH1gLnN1YnN0cmluZygwLCA2NCk7XG5cbiAgICByZXR1cm4gbmV3IExvZ0dyb3VwKHNjb3BlLCBgJHtpZH1Mb2dHcm91cGAsIHtcbiAgICAgIGxvZ0dyb3VwTmFtZTogYC9hd3MvbGFtYmRhLyR7ZnVuY3Rpb25OYW1lfWAsXG4gICAgICByZXRlbnRpb246IGxvZ0NvbmZpZz8ucmV0ZW50aW9uID8/IFJldGVudGlvbkRheXMuVEhSRUVfREFZUyxcbiAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWSxcbiAgICB9KTtcbiAgfVxuICByZXR1cm4gdW5kZWZpbmVkO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb24tbG9nLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmdW5jdGlvbi1sb2ctb3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQXlDQSxvRUF5Q0M7QUFsRkQsNkNBQXdEO0FBRXhELG1EQUE2RDtBQStCN0Q7Ozs7Ozs7R0FPRztBQUNILFNBQWdCLDRCQUE0QixDQUMxQyxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBNkI7O0lBRTdCLElBQUksU0FBd0MsQ0FBQztJQUM3QyxJQUFLLEtBQTRCLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDNUMsU0FBUyxHQUFJLEtBQTRCLENBQUMsU0FBUyxDQUFDO0lBQ3RELENBQUM7SUFDRCxJQUFJLFNBQVMsSUFBSSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFDRCxJQUFJLFNBQVMsSUFBSSxLQUFLLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDcEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxRQUFRLElBQUksU0FBUyxFQUFFLENBQUM7UUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxZQUFZLElBQUksU0FBUyxFQUFFLENBQUM7UUFDcEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpREFBaUQsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFDRCx1Q0FBdUM7SUFDdkMsSUFBSSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDbkIsT0FBTyxLQUFLLENBQUMsUUFBUSxDQUFDO0lBQ3hCLENBQUM7SUFDRCwrREFBK0Q7SUFDL0QsSUFBSSxLQUFLLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDdkIsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUNELHFEQUFxRDtJQUNyRCwyRUFBMkU7SUFDM0UsTUFBTSxRQUFRLEdBQUcsbUJBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2RCxNQUFNLFlBQVksR0FDaEIsTUFBQSxLQUFLLENBQUMsWUFBWSxtQ0FDbEIsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLElBQUksRUFBRSxJQUFJLFFBQVEsRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFcEUsT0FBTyxJQUFJLG1CQUFRLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUU7UUFDMUMsWUFBWSxFQUFFLE1BQUEsU0FBUyxhQUFULFNBQVMsdUJBQVQsU0FBUyxDQUFFLFlBQVksbUNBQUksZUFBZSxZQUFZLEVBQUU7UUFDdEUsU0FBUyxFQUFFLE1BQUEsU0FBUyxhQUFULFNBQVMsdUJBQVQsU0FBUyxDQUFFLFNBQVMsbUNBQUksd0JBQWEsQ0FBQyxVQUFVO1FBQzNELGFBQWEsRUFBRSwyQkFBYSxDQUFDLE9BQU87S0FDckMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7TmFtZXMsIFJlbW92YWxQb2xpY3ksIFN0YWNrfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnYXdzLWNkay1saWIvYXdzLWxhbWJkYSc7XG5pbXBvcnQge0xvZ0dyb3VwLCBSZXRlbnRpb25EYXlzfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtbG9ncyc7XG5pbXBvcnQge0NvbnN0cnVjdH0gZnJvbSAnY29uc3RydWN0cyc7XG5cbi8qKlxuICogQ29uZmlndXJhdGlvbiBmb3IgZnVuY3Rpb24gbG9ncy4gQnkgZGVmYXVsdCB0aGUgbG9nIGdyb3VwIHdpbGwgYmUgZGVzdHJveWVkXG4gKiB3aGVuIHRoZSBzdGFjayBpcyBkZXN0cm95ZWQuIElmIHlvdSByZXF1aXJlIGEgZGlmZmVyZW50IGJlaGF2aW9yIG9yIGhhdmVcbiAqIG90aGVyIGxvZyByZXF1aXJlbWVudHMsIGl0J3MgcmVjb21tZW5kZWQgdG8gY3JlYXRlIGEgbG9nIGdyb3VwIGFuZCBzZXRcbiAqIGxvZ0dyb3VwIGV4cGxpY2l0bHkgaW5zdGVhZCBvZiB1c2luZyB0aGlzIGNvbmZpZ3VyYXRpb24uXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgRnVuY3Rpb25Mb2dDb25maWcge1xuICAvKipcbiAgICogVGhlIHJldGVudGlvbiBwZXJpb2QgZm9yIHRoZSBsb2cgZ3JvdXAuIERlZmF1bHQgaXMgMyBkYXlzLlxuICAgKi9cbiAgcmVhZG9ubHkgcmV0ZW50aW9uPzogUmV0ZW50aW9uRGF5cztcbiAgLyoqXG4gICAqIFRoZSBsb2cgZ3JvdXAgdG8gdXNlIGZvciB0aGUgZnVuY3Rpb24gbG9ncy4gSWYgbm90IHByb3ZpZGVkLCBDREsgd2lsbFxuICAgKiBnZW5lcmF0ZSB0aGUgbmFtZS5cbiAgICovXG4gIHJlYWRvbmx5IGxvZ0dyb3VwTmFtZT86IHN0cmluZztcbn1cblxuLyoqXG4gKiBPcHRpb25zIGZvciBjb25maWd1cmluZyBmdW5jdGlvbiBsb2dzLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEZ1bmN0aW9uTG9nT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgY29uZmlndXJhdGlvbiBmb3IgdGhlIGZ1bmN0aW9uIGxvZ3MuXG4gICAqL1xuICBsb2dDb25maWc/OiBGdW5jdGlvbkxvZ0NvbmZpZztcbn1cblxuLyoqXG4gKiBDb25maWd1cmUgdGhlIGxvZyBncm91cCBmb3IgYSBMYW1iZGEgZnVuY3Rpb24uXG4gKlxuICogQHBhcmFtIHNjb3BlIFRoZSBwYXJlbnQgc2NvcGUgaW4gd2hpY2ggdG8gY3JlYXRlIHRoZSBsb2cgZ3JvdXAuXG4gKiBAcGFyYW0gaWQgVGhlIElEIG9mIHRoZSBMYW1iZGEgZnVuY3Rpb24gY29uc3RydWN0LlxuICogQHBhcmFtIHByb3BzIFRoZSBwcm9wZXJ0aWVzIG9mIHRoZSBmdW5jdGlvbi5cbiAqIEByZXR1cm5zIFRoZSBsb2cgZ3JvdXAsIG9yIHVuZGVmaW5lZCBpZiBpdCB3YXMgbm90IGNvbmZpZ3VyZWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjb25maWd1cmVMb2dHcm91cEZvckZ1bmN0aW9uKFxuICBzY29wZTogQ29uc3RydWN0LFxuICBpZDogc3RyaW5nLFxuICBwcm9wczogbGFtYmRhLkZ1bmN0aW9uT3B0aW9ucyxcbikge1xuICBsZXQgbG9nQ29uZmlnOiBGdW5jdGlvbkxvZ0NvbmZpZyB8IHVuZGVmaW5lZDtcbiAgaWYgKChwcm9wcyBhcyBGdW5jdGlvbkxvZ09wdGlvbnMpLmxvZ0NvbmZpZykge1xuICAgIGxvZ0NvbmZpZyA9IChwcm9wcyBhcyBGdW5jdGlvbkxvZ09wdGlvbnMpLmxvZ0NvbmZpZztcbiAgfVxuICBpZiAobG9nQ29uZmlnICYmIHByb3BzLmxvZ0dyb3VwKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdDYW5ub3Qgc3BlY2lmeSBib3RoIGxvZ0dyb3VwIGFuZCBsb2dDb25maWcuJyk7XG4gIH1cbiAgaWYgKGxvZ0NvbmZpZyAmJiBwcm9wcy5sb2dSZXRlbnRpb24pIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ0Nhbm5vdCBzcGVjaWZ5IGJvdGggbG9nUmV0ZW50aW9uIGFuZCBsb2dDb25maWcuJyk7XG4gIH1cbiAgaWYgKHByb3BzLmxvZ0dyb3VwICYmIGxvZ0NvbmZpZykge1xuICAgIHRocm93IG5ldyBFcnJvcignQ2Fubm90IHNwZWNpZnkgYm90aCBsb2dHcm91cCBhbmQgbG9nQ29uZmlnLicpO1xuICB9XG4gIGlmIChwcm9wcy5sb2dSZXRlbnRpb24gJiYgbG9nQ29uZmlnKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdDYW5ub3Qgc3BlY2lmeSBib3RoIGxvZ1JldGVudGlvbiBhbmQgbG9nQ29uZmlnLicpO1xuICB9XG4gIC8vIFVzZSB0aGUgbG9nR3JvdXAgaXMgb25lIGlzIHBhc3NlZCBpblxuICBpZiAocHJvcHMubG9nR3JvdXApIHtcbiAgICByZXR1cm4gcHJvcHMubG9nR3JvdXA7XG4gIH1cbiAgLy8gSWYgbG9nIHJldGVudGlvbiBpcyBkZWZpbmVkLCBmYWxsYmFjayB0byBkZXByZWNhdGVkIGJlaGF2aW9yXG4gIGlmIChwcm9wcy5sb2dSZXRlbnRpb24pIHtcbiAgICByZXR1cm4gdW5kZWZpbmVkO1xuICB9XG4gIC8vIENhbGN1bGF0ZSB0aGUgZnVuY3Rpb24gbmFtZSB0aGF0IENESyB3aWxsIGdlbmVyYXRlXG4gIC8vIFRoaXMgbWltaWNzIENESydzIGRlZmF1bHQgbmFtaW5nOiB7U3RhY2tOYW1lfS17Q29uc3RydWN0SWR9LXtVbmlxdWVIYXNofVxuICBjb25zdCB1bmlxdWVJZCA9IE5hbWVzLnVuaXF1ZUlkKHNjb3BlKS5zdWJzdHJpbmcoMCwgOCk7XG4gIGNvbnN0IGZ1bmN0aW9uTmFtZSA9XG4gICAgcHJvcHMuZnVuY3Rpb25OYW1lID8/XG4gICAgYCR7U3RhY2sub2Yoc2NvcGUpLnN0YWNrTmFtZX0tJHtpZH0tJHt1bmlxdWVJZH1gLnN1YnN0cmluZygwLCA2NCk7XG5cbiAgcmV0dXJuIG5ldyBMb2dHcm91cChzY29wZSwgYCR7aWR9TG9nR3JvdXBgLCB7XG4gICAgbG9nR3JvdXBOYW1lOiBsb2dDb25maWc/LmxvZ0dyb3VwTmFtZSA/PyBgL2F3cy9sYW1iZGEvJHtmdW5jdGlvbk5hbWV9YCxcbiAgICByZXRlbnRpb246IGxvZ0NvbmZpZz8ucmV0ZW50aW9uID8/IFJldGVudGlvbkRheXMuVEhSRUVfREFZUyxcbiAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LkRFU1RST1ksXG4gIH0pO1xufVxuIl19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "truemark-cdk-lib",
   "description": "AWS CDK constructs created by TrueMark",
-  "version": "1.21.0-beta.1766378245",
+  "version": "1.21.0-beta.1766964363",
   "main": "index.js",
   "types": "index.d.ts",
   "author": "TrueMark Technologies, Inc.",