fix(s3): Runtime modernization of notifications-handler

aws · Dec 5, 2022 · 61fa3bc · 61fa3bc
1 parent b1d8d08
commit 61fa3bc
Show file tree

Hide file tree

Showing 34 changed files with 323 additions and 168 deletions.
diff --git a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/cdk.out b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"22.0.0"}
diff --git a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/integ.json b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "testCases": {
     "integ.notifications": {
       "stacks": [

diff --git a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/manifest.json b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/manifest.json
@@ -1,12 +1,6 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "artifacts": {
-    "Tree": {
-      "type": "cdk:tree",
-      "properties": {
-        "file": "tree.json"
-      }
-    },
     "test-3.assets": {
       "type": "cdk:asset-manifest",
       "properties": {
@@ -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}/e6a3bb19aac621a188addf660a6e2508099e3ad541966b68bebdac0a33cea832.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/97cca28a44b1b15020334dbab2b4a40d222d6664e65b52d6a98c6c84ed2cd331.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -131,6 +125,12 @@
         ]
       },
       "displayName": "test-3"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
     }
   }
 }
diff --git a/...ges/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.assets.json b/...ges/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "files": {
-    "e6a3bb19aac621a188addf660a6e2508099e3ad541966b68bebdac0a33cea832": {
+    "97cca28a44b1b15020334dbab2b4a40d222d6664e65b52d6a98c6c84ed2cd331": {
       "source": {
         "path": "test-3.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e6a3bb19aac621a188addf660a6e2508099e3ad541966b68bebdac0a33cea832.json",
+          "objectKey": "97cca28a44b1b15020334dbab2b4a40d222d6664e65b52d6a98c6c84ed2cd331.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...s/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.template.json b/...s/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/test-3.template.json
@@ -254,7 +254,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.7",
+    "Runtime": "python3.9",
     "Timeout": 300
    },
    "DependsOn": [

diff --git a/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/tree.json b/packages/@aws-cdk/aws-s3-notifications/test/integ.notifications.js.snapshot/tree.json
@@ -4,14 +4,6 @@
     "id": "App",
     "path": "",
     "children": {
-      "Tree": {
-        "id": "Tree",
-        "path": "Tree",
-        "constructInfo": {
-          "fqn": "constructs.Construct",
-          "version": "10.1.85"
-        }
-      },
       "test-3": {
         "id": "test-3",
         "path": "test-3",
@@ -40,14 +32,14 @@
                     "id": "Resource",
                     "path": "test-3/Bucket/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"
                 }
               }
             },
@@ -267,6 +259,14 @@
                 "id": "Role",
                 "path": "test-3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role",
                 "children": {
+                  "ImportRole": {
+                    "id": "ImportRole",
+                    "path": "test-3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role/ImportRole",
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/core.Resource",
+                      "version": "0.0.0"
+                    }
+                  },
                   "Resource": {
                     "id": "Resource",
                     "path": "test-3/BucketNotificationsHandler050a0587b7544547bf325f094a3db834/Role/Resource",
@@ -358,14 +358,14 @@
                 "id": "Resource",
                 "path": "test-3/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"
             }
           },
           "Bucket2": {
@@ -392,14 +392,14 @@
                     "id": "Resource",
                     "path": "test-3/Bucket2/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"
                 }
               }
             },
@@ -442,32 +442,56 @@
                     "id": "Resource",
                     "path": "test-3/Bucket3Imported/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"
                 }
               }
             },
             "constructInfo": {
               "fqn": "@aws-cdk/aws-s3.BucketBase",
               "version": "0.0.0"
             }
+          },
+          "BootstrapVersion": {
+            "id": "BootstrapVersion",
+            "path": "test-3/BootstrapVersion",
+            "constructInfo": {
+              "fqn": "@aws-cdk/core.CfnParameter",
+              "version": "0.0.0"
+            }
+          },
+          "CheckBootstrapVersion": {
+            "id": "CheckBootstrapVersion",
+            "path": "test-3/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"
     }
   }
 }
diff --git a/.../@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/cdk.out b/.../@aws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"22.0.0"}
diff --git a/...ws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/integ.json b/...ws-cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "testCases": {
     "integ.bucket-notifications": {
       "stacks": [

diff --git a/...est/lambda/integ.bucket-notifications.js.snapshot/lambda-bucket-notifications.assets.json b/...est/lambda/integ.bucket-notifications.js.snapshot/lambda-bucket-notifications.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "files": {
-    "4bc6a69496fe870e29071262705663aff373748a3ac47559ed4de1dcecd8962b": {
+    "86df893b461c8389fafc71f1a25f31ba6a371a1afb0d4222ba396ba271b2df8a": {
       "source": {
         "path": "lambda-bucket-notifications.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "4bc6a69496fe870e29071262705663aff373748a3ac47559ed4de1dcecd8962b.json",
+          "objectKey": "86df893b461c8389fafc71f1a25f31ba6a371a1afb0d4222ba396ba271b2df8a.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...t/lambda/integ.bucket-notifications.js.snapshot/lambda-bucket-notifications.template.json b/...t/lambda/integ.bucket-notifications.js.snapshot/lambda-bucket-notifications.template.json
@@ -246,7 +246,7 @@
       "Arn"
      ]
     },
-    "Runtime": "python3.7",
+    "Runtime": "python3.9",
     "Timeout": 300
    },
    "DependsOn": [

diff --git a/...cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/manifest.json b/...cdk/aws-s3-notifications/test/lambda/integ.bucket-notifications.js.snapshot/manifest.json
@@ -1,12 +1,6 @@
 {
-  "version": "20.0.0",
+  "version": "22.0.0",
   "artifacts": {
-    "Tree": {
-      "type": "cdk:tree",
-      "properties": {
-        "file": "tree.json"
-      }
-    },
     "lambda-bucket-notifications.assets": {
       "type": "cdk:asset-manifest",
       "properties": {
@@ -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}/4bc6a69496fe870e29071262705663aff373748a3ac47559ed4de1dcecd8962b.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/86df893b461c8389fafc71f1a25f31ba6a371a1afb0d4222ba396ba271b2df8a.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -119,6 +113,12 @@
         ]
       },
       "displayName": "lambda-bucket-notifications"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
     }
   }
 }