feat: Abort instrumenting Lambda if runtime is unsupported

DataDog · Dec 6, 2024 · 25f7faf · 25f7faf
1 parent 9d2ac35
commit 25f7faf
Show file tree

Hide file tree

Showing 13 changed files with 318 additions and 214 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projenrc.js b/.projenrc.js
@@ -25,7 +25,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
     packageName: "ddcdkconstruct",
   },
   peerDeps: [],
-  cdkVersion: "2.134.0",
+  cdkVersion: "2.146.0",
   deps: ["loglevel"],
   bundledDeps: ["loglevel"],
   devDeps: [

diff --git a/integration_tests/snapshots/correct-lambda_python_old_lambda_api_stack-snapshot.json b/integration_tests/snapshots/correct-lambda_python_old_lambda_api_stack-snapshot.json
@@ -482,6 +482,14 @@
         "ap-northeast-2"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-northeast-3"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -490,6 +498,14 @@
         "ap-south-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-south-2"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -506,6 +522,26 @@
         "ap-southeast-2"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-southeast-3"
+       ]
+      }
+     ]
+    },
+    {
+     "Fn::Or": [
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-southeast-4"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -514,6 +550,14 @@
         "ca-central-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ca-west-1"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -529,11 +573,7 @@
         },
         "cn-northwest-1"
        ]
-      }
-     ]
-    },
-    {
-     "Fn::Or": [
+      },
       {
        "Fn::Equals": [
         {
@@ -542,6 +582,14 @@
         "eu-central-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "eu-central-2"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -558,6 +606,18 @@
         "eu-south-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "eu-south-2"
+       ]
+      }
+     ]
+    },
+    {
+     "Fn::Or": [
       {
        "Fn::Equals": [
         {
@@ -613,11 +673,7 @@
         },
         "sa-east-1"
        ]
-      }
-     ]
-    },
-    {
-     "Fn::Or": [
+      },
       {
        "Fn::Equals": [
         {
@@ -641,16 +697,16 @@
         },
         "us-west-1"
        ]
-      },
-      {
-       "Fn::Equals": [
-        {
-         "Ref": "AWS::Region"
-        },
-        "us-west-2"
-       ]
       }
      ]
+    },
+    {
+     "Fn::Equals": [
+      {
+       "Ref": "AWS::Region"
+      },
+      "us-west-2"
+     ]
     }
    ]
   }

diff --git a/integration_tests/snapshots/correct-lambda_python_stack-snapshot.json b/integration_tests/snapshots/correct-lambda_python_stack-snapshot.json
@@ -482,6 +482,14 @@
         "ap-northeast-2"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-northeast-3"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -490,6 +498,14 @@
         "ap-south-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-south-2"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -506,6 +522,26 @@
         "ap-southeast-2"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-southeast-3"
+       ]
+      }
+     ]
+    },
+    {
+     "Fn::Or": [
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ap-southeast-4"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -514,6 +550,14 @@
         "ca-central-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "ca-west-1"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -529,11 +573,7 @@
         },
         "cn-northwest-1"
        ]
-      }
-     ]
-    },
-    {
-     "Fn::Or": [
+      },
       {
        "Fn::Equals": [
         {
@@ -542,6 +582,14 @@
         "eu-central-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "eu-central-2"
+       ]
+      },
       {
        "Fn::Equals": [
         {
@@ -558,6 +606,18 @@
         "eu-south-1"
        ]
       },
+      {
+       "Fn::Equals": [
+        {
+         "Ref": "AWS::Region"
+        },
+        "eu-south-2"
+       ]
+      }
+     ]
+    },
+    {
+     "Fn::Or": [
       {
        "Fn::Equals": [
         {
@@ -613,11 +673,7 @@
         },
         "sa-east-1"
        ]
-      }
-     ]
-    },
-    {
-     "Fn::Or": [
+      },
       {
        "Fn::Equals": [
         {
@@ -641,16 +697,16 @@
         },
         "us-west-1"
        ]
-      },
-      {
-       "Fn::Equals": [
-        {
-         "Ref": "AWS::Region"
-        },
-        "us-west-2"
-       ]
       }
      ]
+    },
+    {
+     "Fn::Equals": [
+      {
+       "Ref": "AWS::Region"
+      },
+      "us-west-2"
+     ]
     }
    ]
   }