From 680f74cc216c0b7bc9840945028079158e003d9e Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Wed, 16 Mar 2022 20:19:55 -0400 Subject: [PATCH 1/6] feat(synthetics): add support for puppeteer 3.4 runtime Fixes #19382 --- packages/@aws-cdk/aws-synthetics/lib/runtime.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts index 81ac1a857e6db..b0e1dc82518c1 100644 --- a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts +++ b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts @@ -114,6 +114,16 @@ export class Runtime { */ public static readonly SYNTHETICS_NODEJS_PUPPETEER_3_3 = new Runtime('syn-nodejs-puppeteer-3.3', RuntimeFamily.NODEJS); + /** + * `syn-nodejs-puppeteer-3.4` includes the following: + * - Lambda runtime Node.js 12.x + * - Puppeteer-core version 5.5.0 + * - Chromium version 88.0.4298.0 + * + * @see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Library_nodejs_puppeteer.html#CloudWatch_Synthetics_runtimeversion-nodejs-puppeteer-3.4 + */ + public static readonly SYNTHETICS_NODEJS_PUPPETEER_3_4 = new Runtime('syn-nodejs-puppeteer-3.4', RuntimeFamily.NODEJS); + /** * `syn-python-selenium-1.0` includes the following: * - Lambda runtime Python 3.8 @@ -130,4 +140,4 @@ export class Runtime { */ public constructor(public readonly name: string, public readonly family: RuntimeFamily) { } -} \ No newline at end of file +}} From 1803ae77c82bc7b1a79351794137f75990c9bb52 Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Wed, 16 Mar 2022 20:34:15 -0400 Subject: [PATCH 2/6] Update README.md --- packages/@aws-cdk/aws-synthetics/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/@aws-cdk/aws-synthetics/README.md b/packages/@aws-cdk/aws-synthetics/README.md index 6ee19906e5800..77e0b90640d81 100644 --- a/packages/@aws-cdk/aws-synthetics/README.md +++ b/packages/@aws-cdk/aws-synthetics/README.md @@ -129,7 +129,7 @@ new synthetics.Canary(this, 'Inline Canary', { code: synthetics.Code.fromInline('/* Synthetics handler code */'), handler: 'index.handler', // must be 'index.handler' }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, }); // To supply the code from your local filesystem: @@ -138,7 +138,7 @@ new synthetics.Canary(this, 'Asset Canary', { code: synthetics.Code.fromAsset(path.join(__dirname, 'canary')), handler: 'index.handler', // must end with '.handler' }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, }); // To supply the code from a S3 bucket: @@ -149,7 +149,7 @@ new synthetics.Canary(this, 'Bucket Canary', { code: synthetics.Code.fromBucket(bucket, 'canary.zip'), handler: 'index.handler', // must end with '.handler' }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, }); ``` @@ -188,7 +188,7 @@ new synthetics.Canary(this, 'Vpc Canary', { code: synthetics.Code.fromAsset(path.join(__dirname, 'canary')), handler: 'index.handler', }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, vpc, }); ``` From 92b7886c7931cdae019c897ca36ef18cae6f8f0f Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Wed, 16 Mar 2022 20:43:37 -0400 Subject: [PATCH 3/6] Add a test --- packages/@aws-cdk/aws-synthetics/test/canary.test.ts | 2 +- packages/@aws-cdk/aws-synthetics/test/integ.canary.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-synthetics/test/canary.test.ts b/packages/@aws-cdk/aws-synthetics/test/canary.test.ts index aee1ba78cd134..4998a52757779 100644 --- a/packages/@aws-cdk/aws-synthetics/test/canary.test.ts +++ b/packages/@aws-cdk/aws-synthetics/test/canary.test.ts @@ -304,7 +304,7 @@ test('Schedule can be set with Cron', () => { handler: 'index.handler', code: synthetics.Code.fromInline('/* Synthetics handler code */'), }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, }); // THEN diff --git a/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts b/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts index 268667b8439f3..ad7473a2991f5 100644 --- a/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts +++ b/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts @@ -60,6 +60,15 @@ new synthetics.Canary(stack, 'MyCanaryThree', { runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, }); +new synthetics.Canary(stack, 'MyCanaryFour', { + canaryName: 'assetcanary-three', + test: synthetics.Test.custom({ + handler: 'canary.handler', + code: synthetics.Code.fromAsset(path.join(__dirname, 'canary.zip')), + }), + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, +}); + new synthetics.Canary(stack, 'MyPythonCanary', { canaryName: 'py-canary-integ', test: synthetics.Test.custom({ From 555c264d0dabce26ef1f98e07c31ee5b12d78e88 Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Thu, 17 Mar 2022 13:12:14 -0400 Subject: [PATCH 4/6] Update packages/@aws-cdk/aws-synthetics/lib/runtime.ts Co-authored-by: Kaizen Conroy <36202692+kaizen3031593@users.noreply.github.com> --- packages/@aws-cdk/aws-synthetics/lib/runtime.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts index b0e1dc82518c1..11679f43d8bcc 100644 --- a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts +++ b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts @@ -140,4 +140,4 @@ export class Runtime { */ public constructor(public readonly name: string, public readonly family: RuntimeFamily) { } -}} +} From 90c89a4a194ba1a00768c846b705591bbbf6e919 Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Thu, 17 Mar 2022 13:15:02 -0400 Subject: [PATCH 5/6] Revert integrity test --- packages/@aws-cdk/aws-synthetics/test/integ.canary.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts b/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts index ad7473a2991f5..268667b8439f3 100644 --- a/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts +++ b/packages/@aws-cdk/aws-synthetics/test/integ.canary.ts @@ -60,15 +60,6 @@ new synthetics.Canary(stack, 'MyCanaryThree', { runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, }); -new synthetics.Canary(stack, 'MyCanaryFour', { - canaryName: 'assetcanary-three', - test: synthetics.Test.custom({ - handler: 'canary.handler', - code: synthetics.Code.fromAsset(path.join(__dirname, 'canary.zip')), - }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, -}); - new synthetics.Canary(stack, 'MyPythonCanary', { canaryName: 'py-canary-integ', test: synthetics.Test.custom({ From 24855a933e9617b295a1d1303ef4984810a66514 Mon Sep 17 00:00:00 2001 From: Aaron Suggs Date: Thu, 17 Mar 2022 15:22:04 -0400 Subject: [PATCH 6/6] Fix the build And revert the test change. --- packages/@aws-cdk/aws-synthetics/lib/runtime.ts | 2 +- packages/@aws-cdk/aws-synthetics/test/canary.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts index 11679f43d8bcc..10c7fb566a2e6 100644 --- a/packages/@aws-cdk/aws-synthetics/lib/runtime.ts +++ b/packages/@aws-cdk/aws-synthetics/lib/runtime.ts @@ -122,7 +122,7 @@ export class Runtime { * * @see https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Library_nodejs_puppeteer.html#CloudWatch_Synthetics_runtimeversion-nodejs-puppeteer-3.4 */ - public static readonly SYNTHETICS_NODEJS_PUPPETEER_3_4 = new Runtime('syn-nodejs-puppeteer-3.4', RuntimeFamily.NODEJS); + public static readonly SYNTHETICS_NODEJS_PUPPETEER_3_4 = new Runtime('syn-nodejs-puppeteer-3.4', RuntimeFamily.NODEJS); /** * `syn-python-selenium-1.0` includes the following: diff --git a/packages/@aws-cdk/aws-synthetics/test/canary.test.ts b/packages/@aws-cdk/aws-synthetics/test/canary.test.ts index 4998a52757779..aee1ba78cd134 100644 --- a/packages/@aws-cdk/aws-synthetics/test/canary.test.ts +++ b/packages/@aws-cdk/aws-synthetics/test/canary.test.ts @@ -304,7 +304,7 @@ test('Schedule can be set with Cron', () => { handler: 'index.handler', code: synthetics.Code.fromInline('/* Synthetics handler code */'), }), - runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_4, + runtime: synthetics.Runtime.SYNTHETICS_NODEJS_PUPPETEER_3_3, }); // THEN