Fall back to cdk v2 before skipping cdk tests

Author: jamesls

tests/functional/cdk/test_construct.py

@@ -10,9 +10,12 @@
 
 try:
     from aws_cdk import core as cdk
-except Exception:
-    pytestmark = pytest.mark.skip(
-        "aws_cdk package needed to run CDK tests.")
+except ImportError:
+    try:
+        import aws_cdk as cdk
+    except ImportError:
+        pytestmark = pytest.mark.skip(
+            "aws_cdk package needed to run CDK tests.")
 
 
 @pytest.fixture