Merge pull request #101 from fredliporace/dev

Migration to CDK2

.nvmrc

@@ -0,0 +1 @@
+18.0.0

README.md

@@ -34,13 +34,13 @@ Some lambdas require extra pip packages to be installed in the lambda directory
 
 ## CDK bootstrap
 
-Deployment uses AWS CDK.
+Deployment uses AWS CDK2.
 
 Requirements:
-* node: Use [nvm](https://heynode.com/tutorial/install-nodejs-locally-nvm/) to make sure a supported node is being used, tested with 16.16.0
+* node: Use [nvm](https://heynode.com/tutorial/install-nodejs-locally-nvm/) to make sure a supported node is being used, tested with 18.0.0
 * AWS credentials configured
 
-To install and check AWS CDK:
+To install and check AWS CDK (tested with CDK 2.129.0):
 ```bash
 $ npm install -g aws-cdk
 $ cdk --version

cdk.json

@@ -1,3 +1,6 @@
 {
-    "app": "(export PYTHONPATH=. && python stack/app.py)"
+  "app": "(export PYTHONPATH=. && python stack/app.py)",
+  "context":{
+    "@aws-cdk/customresources:installLatestAwsSdkDefault":false
+  }
 }

constraints.txt

@@ -1,64 +1,9 @@
 astroid==2.11.7
 attrs==21.4.0
-aws-cdk.assets==1.168.0
-aws-cdk.aws-acmpca==1.168.0
-aws-cdk.aws-apigateway==1.168.0
-aws-cdk.aws-applicationautoscaling==1.168.0
-aws-cdk.aws-autoscaling==1.168.0
-aws-cdk.aws-autoscaling-common==1.168.0
-aws-cdk.aws-autoscaling-hooktargets==1.168.0
-aws-cdk.aws-certificatemanager==1.168.0
-aws-cdk.aws-cloudformation==1.168.0
-aws-cdk.aws-cloudfront==1.168.0
-aws-cdk.aws-cloudwatch==1.168.0
-aws-cdk.aws-cloudwatch-actions==1.168.0
-aws-cdk.aws-codebuild==1.168.0
-aws-cdk.aws-codecommit==1.168.0
-aws-cdk.aws-codeguruprofiler==1.168.0
-aws-cdk.aws-codepipeline==1.168.0
-aws-cdk.aws-codestarnotifications==1.168.0
-aws-cdk.aws-cognito==1.168.0
-aws-cdk.aws-dynamodb==1.168.0
-aws-cdk.aws-ec2==1.168.0
-aws-cdk.aws-ecr==1.168.0
-aws-cdk.aws-ecr-assets==1.168.0
-aws-cdk.aws-ecs==1.168.0
-aws-cdk.aws-efs==1.168.0
-aws-cdk.aws-elasticloadbalancing==1.168.0
-aws-cdk.aws-elasticloadbalancingv2==1.168.0
-aws-cdk.aws-elasticsearch==1.168.0
-aws-cdk.aws-events==1.168.0
-aws-cdk.aws-events-targets==1.168.0
-aws-cdk.aws-globalaccelerator==1.168.0
-aws-cdk.aws-iam==1.168.0
-aws-cdk.aws-kinesis==1.168.0
-aws-cdk.aws-kinesisfirehose==1.168.0
-aws-cdk.aws-kms==1.168.0
-aws-cdk.aws-lambda==1.168.0
-aws-cdk.aws-lambda-event-sources==1.168.0
-aws-cdk.aws-logs==1.168.0
-aws-cdk.aws-route53==1.168.0
-aws-cdk.aws-route53-targets==1.168.0
-aws-cdk.aws-s3==1.168.0
-aws-cdk.aws-s3-assets==1.168.0
-aws-cdk.aws-s3-deployment==1.168.0
-aws-cdk.aws-s3-notifications==1.168.0
-aws-cdk.aws-sam==1.168.0
-aws-cdk.aws-secretsmanager==1.168.0
-aws-cdk.aws-servicediscovery==1.168.0
-aws-cdk.aws-signer==1.168.0
-aws-cdk.aws-sns==1.168.0
-aws-cdk.aws-sns-subscriptions==1.168.0
-aws-cdk.aws-sqs==1.168.0
-aws-cdk.aws-ssm==1.168.0
-aws-cdk.aws-stepfunctions==1.168.0
-aws-cdk.aws-synthetics==1.168.0
-aws-cdk.cloud-assembly-schema==1.168.0
-aws-cdk.core==1.168.0
-aws-cdk.custom-resources==1.168.0
-aws-cdk.cx-api==1.168.0
-aws-cdk.lambda-layer-awscli==1.168.0
-aws-cdk.region-info==1.168.0
+aws-cdk-lib==2.111.0
+aws-cdk.asset-awscli-v1==2.2.201
+aws-cdk.asset-kubectl-v20==2.1.2
+aws-cdk.asset-node-proxy-agent-v6==2.0.1
 aws-requests-auth==0.4.3
 awscli==1.25.48
 awscli-local==0.20
@@ -69,7 +14,7 @@ certifi==2022.6.15
 cfgv==3.3.1
 charset-normalizer==2.1.0
 colorama==0.4.4
-constructs==3.4.64
+constructs==10.3.0
 coverage==6.4.3
 decorator==5.1.1
 dill==0.3.5.1
@@ -83,10 +28,11 @@ filelock==3.8.0
 identify==2.5.3
 idna==3.3
 importlib-metadata==1.7.0
+importlib-resources==5.12.0
 iniconfig==1.1.1
 isort==5.10.1
 jmespath==1.0.1
-jsii==1.63.2
+jsii==1.91.0
 jsonschema==3.2.0
 lazy-object-proxy==1.7.1
 localstack-client==1.36

setup.py

@@ -34,27 +34,7 @@
         # Used in process_new_scene_queue lambda.
         "utm",
     ],
-    "deploy": [
-        "pydantic[dotenv]",
-        "aws-cdk.core",
-        "aws-cdk.aws-sqs",
-        "aws-cdk.aws-sns",
-        "aws-cdk.aws-sns-subscriptions",
-        "aws-cdk.aws-cloudwatch",
-        "aws-cdk.aws-cloudwatch-actions",
-        "aws-cdk.aws-lambda",
-        "aws-cdk.aws-s3",
-        "aws-cdk.aws-s3-deployment",
-        "aws-cdk.aws-s3-assets",
-        "aws-cdk.aws-iam",
-        "aws-cdk.aws-dynamodb",
-        "aws-cdk.aws-lambda-event-sources",
-        "aws-cdk.aws-events",
-        "aws-cdk.aws-events-targets",
-        "aws-cdk.aws-apigateway",
-        "aws-cdk.aws-elasticsearch",
-        "aws-cdk.aws-synthetics",
-    ],
+    "deploy": ["pydantic[dotenv]", "aws-cdk-lib>=2.0.0", "constructs>=10.0.0",],
 }
 
 ENTRY_POINTS = """