Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(s3): update runtime of notifications-handler to python3.9 #23209

Merged
merged 7 commits into from Dec 7, 2022
Merged

feat(s3): update runtime of notifications-handler to python3.9 #23209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61fa3bc
fix(s3): Runtime modernization of notifications-handler
watany-dev Dec 2, 2022
b4fd754
integ lambda-event-sources
watany-dev Dec 6, 2022
c156ab5
import order
watany-dev Dec 6, 2022
76e5711
retake import order
watany-dev Dec 7, 2022
f4e1fb9
update integ test snapshot
mrgrain Dec 7, 2022
c423552
extend test to check notification is received by queue
mrgrain Dec 7, 2022
efdfd67
Merge branch 'main' into bucket-noti-py3.9
mergify[bot] Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/lib/kafka.ts
View file
Open in desktop
@@ -1,9 +1,9 @@
import { md5hash } from '@aws-cdk/core/lib/helpers-internal';
import { ISecurityGroup, IVpc, SubnetSelection } from '@aws-cdk/aws-ec2';
import * as iam from '@aws-cdk/aws-iam';
import * as lambda from '@aws-cdk/aws-lambda';
import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
import { Stack, Names } from '@aws-cdk/core';
import { md5hash } from '@aws-cdk/core/lib/helpers-internal';
Comment on lines -1 to +6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind reverting this unrelated change. Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error was automatically fixed by yarn build --fix before integ-test.
Do I still need to fix it now that the test has passed because the IDE outputs the following Warning.

Import of `@aws-cdk/core/lib/helpers-internal` must be done after import of `@aws-cdk/core`.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevertheless, I have added the commit to be corrected as requested.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see, thanks for explaining where this came from. 👍🏻 Probably would have been fine to leave it in then. From a PR review it's difficult to establish the source of these kind of changes (and manually checking would just take to long).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I was in a hurry to fix it. This commit should bring us back to the beginning of this review!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good and thank you for being diligent. It's a tricky thing. When the same module has other change I usually don't question it.

Maybe adding a comment to the line on GitHub would help reviewers. 🤔

import { Construct } from 'constructs';
import { StreamEventSource, BaseStreamEventSourceProps } from './stream';

Expand Down
144 changes: 144 additions & 0 deletions .../asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/__entrypoint__.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...0a600592dec8ccbb06c051e95b9c1b26/index.js → ...1321d9e56711926b04c5705e5f63874c/index.js
View file
Open in desktop
File renamed without changes.
118 changes: 0 additions & 118 deletions .../asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26/__entrypoint__.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...napshot/asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26/index.d.ts
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions ....snapshot/asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.js.snapshot/cdk.out
View file
Open in desktop
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"22.0.0"}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.js.snapshot/integ.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "22.0.0",
"testCases": {
"integ.s3": {
"stacks": [
Expand Down
12 changes: 6 additions & 6 deletions ...cdk/aws-lambda-event-sources/test/integ.s3.js.snapshot/lambda-event-source-s3.assets.json
View file
Open in desktop
@@ -1,28 +1,28 @@
{
"version": "20.0.0",
"version": "22.0.0",
"files": {
"60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26": {
"33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c": {
"source": {
"path": "asset.60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26",
"path": "asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip",
"objectKey": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"0bd7f56caf58087052c78e8b8dfb76284423c45fe7556ed0ca3c5f9c47d6b79b": {
"88cd97cf8b61eb834d47062d3a923e447d47131e886b9487a06833f23868a9ec": {
"source": {
"path": "lambda-event-source-s3.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "0bd7f56caf58087052c78e8b8dfb76284423c45fe7556ed0ca3c5f9c47d6b79b.json",
"objectKey": "88cd97cf8b61eb834d47062d3a923e447d47131e886b9487a06833f23868a9ec.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...k/aws-lambda-event-sources/test/integ.s3.js.snapshot/lambda-event-source-s3.template.json
View file
Open in desktop
Expand Up @@ -227,7 +227,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "60767da3831353fede3cfe92efef10580a600592dec8ccbb06c051e95b9c1b26.zip"
"S3Key": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down Expand Up @@ -322,7 +322,7 @@
"Arn"
]
},
"Runtime": "python3.7",
"Runtime": "python3.9",
"Timeout": 300
},
"DependsOn": [
Expand Down
16 changes: 8 additions & 8 deletions packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.js.snapshot/manifest.json
View file
Open in desktop
@@ -1,12 +1,6 @@
{
"version": "20.0.0",
"version": "22.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"lambda-event-source-s3.assets": {
"type": "cdk:asset-manifest",
"properties": {
Expand All @@ -23,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0bd7f56caf58087052c78e8b8dfb76284423c45fe7556ed0ca3c5f9c47d6b79b.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/88cd97cf8b61eb834d47062d3a923e447d47131e886b9487a06833f23868a9ec.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -125,6 +119,12 @@
]
},
"displayName": "lambda-event-source-s3"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
90 changes: 61 additions & 29 deletions packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.js.snapshot/tree.json
View file
Open in desktop
Expand Up @@ -4,14 +4,6 @@
"id": "App",
"path": "",
"children": {
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
}
},
"lambda-event-source-s3": {
"id": "lambda-event-source-s3",
"path": "lambda-event-source-s3",
Expand All @@ -24,6 +16,14 @@
"id": "ServiceRole",
"path": "lambda-event-source-s3/F/ServiceRole",
"children": {
"ImportServiceRole": {
"id": "ImportServiceRole",
"path": "lambda-event-source-s3/F/ServiceRole/ImportServiceRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "lambda-event-source-s3/F/ServiceRole/Resource",
Expand Down Expand Up @@ -199,14 +199,14 @@
"id": "Default",
"path": "lambda-event-source-s3/B/AutoDeleteObjectsCustomResource/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CustomResource",
"version": "0.0.0"
}
},
"Notifications": {
Expand All @@ -217,14 +217,14 @@
"id": "Resource",
"path": "lambda-event-source-s3/B/Notifications/Resource",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"version": "10.1.168"
}
},
"AllowBucketNotificationsTolambdaeventsources3F74160805": {
Expand Down Expand Up @@ -271,30 +271,30 @@
"id": "Staging",
"path": "lambda-event-source-s3/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
}
},
"Role": {
"id": "Role",
"path": "lambda-event-source-s3/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
},
"Handler": {
"id": "Handler",
"path": "lambda-event-source-s3/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CustomResourceProvider",
"version": "0.0.0"
}
},
"BucketNotificationsHandler050a0587b7544547bf325f094a3db834": {
Expand All @@ -305,6 +305,14 @@
"id": "Role",
"path": "lambda-event-source-s3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role",
"children": {
"ImportRole": {
"id": "ImportRole",
"path": "lambda-event-source-s3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role/ImportRole",
"constructInfo": {
"fqn": "@aws-cdk/core.Resource",
"version": "0.0.0"
}
},
"Resource": {
"id": "Resource",
"path": "lambda-event-source-s3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role/Resource",
Expand Down Expand Up @@ -393,26 +401,50 @@
"id": "Resource",
"path": "lambda-event-source-s3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Resource",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.CfnResource",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"version": "10.1.168"
}
},
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "lambda-event-source-s3/BootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "lambda-event-source-s3/CheckBootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
}
},
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"version": "10.1.168"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.85"
"fqn": "@aws-cdk/core.App",
"version": "0.0.0"
}
}
}
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-s3-notifications/package.json
View file
Open in desktop
Expand Up @@ -75,6 +75,7 @@
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/integ-tests": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.5.2",
"jest": "^27.5.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/cdk.out
View file
Open in desktop
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"22.0.0"}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/integ.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "22.0.0",
"testCases": {
"integ.notifications": {
"stacks": [
Expand Down