Merge branch 'main' into colifran/migrate-log-retention

aws · Nov 17, 2023 · 0551837 · 0551837
2 parents 4131220 + ff20d6b
commit 0551837
Show file tree

Hide file tree

Showing 23 changed files with 314 additions and 2,155 deletions.
diff --git a/....snapshot/asset.4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638/index.js b/....snapshot/asset.4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638/index.js
diff --git a/....snapshot/asset.b8cec122f25692e8b194663d25a2ee5e0b65e55df966120791d6a3ddc08fc136/index.js b/....snapshot/asset.b8cec122f25692e8b194663d25a2ee5e0b65e55df966120791d6a3ddc08fc136/index.js
diff --git a/.../test/integ.evaluate-expression.js.snapshot/cdk-sfn-evaluate-expression-integ.assets.json b/.../test/integ.evaluate-expression.js.snapshot/cdk-sfn-evaluate-expression-integ.assets.json
diff --git a/...est/integ.evaluate-expression.js.snapshot/cdk-sfn-evaluate-expression-integ.template.json b/...est/integ.evaluate-expression.js.snapshot/cdk-sfn-evaluate-expression-integ.template.json
@@ -38,7 +38,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638.zip"
+     "S3Key": "b8cec122f25692e8b194663d25a2ee5e0b65e55df966120791d6a3ddc08fc136.zip"
     },
     "Handler": "index.handler",
     "Role": {
@@ -91,7 +91,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638.zip"
+     "S3Key": "b8cec122f25692e8b194663d25a2ee5e0b65e55df966120791d6a3ddc08fc136.zip"
     },
     "Handler": "index.handler",
     "Role": {

diff --git a/...teg/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/manifest.json b/...teg/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/manifest.json
diff --git a/...k-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/tree.json b/...k-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/tree.json
diff --git a/...ns-tasks/lib/eval-nodejs-handler/index.ts → ...ctions-tasks/eval-nodejs-handler/index.ts b/...ns-tasks/lib/eval-nodejs-handler/index.ts → ...ctions-tasks/eval-nodejs-handler/index.ts
@@ -1,5 +1,21 @@
 /* eslint-disable no-console */
-import { Event } from '../evaluate-expression';
+
+/**
+ * The event received by the Lambda function
+ *
+ * @internal
+ */
+export interface Event {
+  /**
+   * The expression to evaluate
+   */
+  readonly expression: string;
+
+  /**
+   * The expression attribute values
+   */
+  readonly expressionAttributeValues: { [key: string]: any };
+}
 
 function escapeRegex(x: string) {
   return x.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
@@ -15,5 +31,6 @@ export async function handler(event: Event): Promise<any> {
     );
   console.log(`Expression: ${expression}`);
 
-  return eval(expression);
+  // direct eval with bundler is not recommended - using indirect eval
+  return [eval][0](expression);
 }
diff --git a/...ns-tasks/test/eval-nodejs-handler.test.ts → ...nctions-tasks/eval-nodejs-handler.test.ts b/...ns-tasks/test/eval-nodejs-handler.test.ts → ...nctions-tasks/eval-nodejs-handler.test.ts
@@ -1,5 +1,4 @@
-import { Event } from '../lib';
-import { handler } from '../lib/eval-nodejs-handler';
+import { handler, Event } from '../../lib/aws-stepfunctions-tasks/eval-nodejs-handler';
 
 beforeAll(() => {
   jest.spyOn(console, 'log').mockImplementation();

diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eval-nodejs-handler/.is_custom_resource b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/eval-nodejs-handler/.is_custom_resource
diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/evaluate-expression.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/evaluate-expression.ts
@@ -27,6 +27,8 @@ export interface EvaluateExpressionProps extends sfn.TaskStateBaseProps {
 /**
  * The event received by the Lambda function
  *
+ * Shared definition with packages/@aws-cdk/custom-resource-handlers/lib/custom-resources/aws-stepfunctions-tasks/index.ts
+ *
  * @internal
  */
 export interface Event {
@@ -119,7 +121,7 @@ function createEvalFn(runtime: lambda.Runtime | undefined, scope: Construct) {
     uuid,
     handler: 'index.handler',
     lambdaPurpose,
-    code: lambda.Code.fromAsset(path.join(__dirname, 'eval-nodejs-handler'), {
+    code: lambda.Code.fromAsset(path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-stepfunctions-tasks', 'eval-nodejs-handler'), {
       exclude: ['*.ts'],
     }),
   });