Initial update to CDKv2 (#1)

* Initial update to CDKv2

Imports adjusted
- updated requirements files
- replacement of aws_cdk.core with aws_cdk
- import new constructs module

Cleared cdk context values

Updated aws-cdk CLI to compatible version

* Removed ignored pylint options

* Replaced cdk-chalice with chalice[cdkv2]

As cdk-chalice has not been updated for cdkv2 yet, chalice[cdkv2]
provides an alternative implementation for these constructs.
However, this breaks the current tests.

Bumped pip-tools for requirements resolution

* Pinned flake8 to prevent dependency conflict

flake8>=4.0 pins importlib-metadata<4.3 as a dependency. This is incompatible
with other packages requiring importlib-metadata>=4.12.

* Resolved pylint W1514: unspecified encoding

* Updated token values in chalice config

Author: jgreenbow-userful

api/infrastructure.py

@@ -16,15 +16,18 @@
 import pathlib
 from typing import Any, Dict
 
-import cdk_chalice
+import aws_cdk as cdk
+import chalice.cdk
+from aws_cdk import aws_dynamodb as dynamodb
 from aws_cdk import aws_iam as iam
-from aws_cdk import core as cdk
+from aws_cdk import aws_sam as sam
+from constructs import Construct
 
 
-class API(cdk.Construct):
+class API(Construct):
     def __init__(
         self,
-        scope: cdk.Construct,
+        scope: Construct,
         id_: str,
         *,
         dynamodb_table_name: str,
@@ -47,14 +50,14 @@ def __init__(
             self.handler_role, dynamodb_table_name, lambda_reserved_concurrency
         )
         source_dir = pathlib.Path(__file__).resolve().parent.joinpath("runtime")
-        chalice = cdk_chalice.Chalice(
+        chalice = chalice.cdk.Chalice(
             self,
             "Chalice",
             source_dir=str(source_dir),
             stage_config=stage_config,
         )
-        self.rest_api = chalice.sam_template.get_resource("RestAPI")
-        self.endpoint_url: cdk.CfnOutput = chalice.sam_template.get_output(
+        self.rest_api: sam.CfnApi = chalice.get_resource("RestAPI")
+        self.endpoint_url: cdk.CfnOutput = chalice.get_output(
             "EndpointURL"
         )
 

api/runtime/requirements.txt

@@ -8,33 +8,35 @@ attrs==21.4.0
     # via chalice
 blessed==1.19.1
     # via inquirer
-boto3==1.24.74
+boto3==1.24.37
     # via -r api/runtime/requirements.in
-botocore==1.27.74
+botocore==1.27.37
     # via
     #   boto3
     #   chalice
     #   s3transfer
-chalice==1.27.3
+chalice==1.27.1
     # via -r api/runtime/requirements.in
 click==8.1.3
     # via chalice
-importlib-metadata==4.2.0
+importlib-metadata==4.12.0
     # via click
-inquirer==2.10.0
+inquirer==2.9.2
     # via chalice
 jmespath==1.0.1
     # via
     #   boto3
     #   botocore
     #   chalice
+mypy-extensions==0.4.3
+    # via chalice
 python-dateutil==2.8.2
     # via botocore
 python-editor==1.0.4
     # via inquirer
 pyyaml==6.0
     # via chalice
-readchar==4.0.3
+readchar==3.1.0
     # via inquirer
 s3transfer==0.6.0
     # via boto3
@@ -44,10 +46,8 @@ six==1.16.0
     #   chalice
     #   python-dateutil
 typing-extensions==4.3.0
-    # via
-    #   chalice
-    #   importlib-metadata
-urllib3==1.26.12
+    # via importlib-metadata
+urllib3==1.26.11
     # via botocore
 wcwidth==0.2.5
     # via blessed

app.py

@@ -15,8 +15,8 @@
 
 import os
 
+import aws_cdk as cdk
 from aws_cdk import aws_dynamodb as dynamodb
-from aws_cdk import core as cdk
 
 import constants
 from component import UserManagementBackend

cdk.context.json

@@ -1,7 +1,2 @@
 {
-  "@aws-cdk/core:enableStackNameDuplicates": "true",
-  "@aws-cdk/core:newStyleStackSynthesis": "true",
-  "acknowledged-issue-numbers": [
-    19836
-  ]
 }

component.py

@@ -15,8 +15,9 @@
 
 from typing import Any
 
+import aws_cdk as cdk
 from aws_cdk import aws_dynamodb as dynamodb
-from aws_cdk import core as cdk
+from constructs import Construct
 
 from api.infrastructure import API
 from database.infrastructure import Database
@@ -26,7 +27,7 @@
 class UserManagementBackend(cdk.Stack):
     def __init__(
         self,
-        scope: cdk.Construct,
+        scope: Construct,
         id_: str,
         *,
         database_dynamodb_billing_mode: dynamodb.BillingMode,

database/infrastructure.py

@@ -13,17 +13,18 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import aws_cdk as cdk
 from aws_cdk import aws_dynamodb as dynamodb
-from aws_cdk import core as cdk
+from constructs import Construct
 
 
-class Database(cdk.Construct):
+class Database(Construct):
     def __init__(
         self,
-        scope: cdk.Construct,
+        scope: Construct,
         id_: str,
         *,
-        dynamodb_billing_mode: dynamodb.BillingMode
+        dynamodb_billing_mode: dynamodb.BillingMode,
     ):
         super().__init__(scope, id_)
 

monitoring/infrastructure.py

@@ -13,16 +13,17 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import aws_cdk as cdk
 from aws_cdk import aws_cloudwatch as cloudwatch
 from aws_cdk import aws_sam as sam
-from aws_cdk import core as cdk
+from constructs import Construct
 
 from api.infrastructure import API
 from database.infrastructure import Database
 
 
-class Monitoring(cdk.Construct):
-    def __init__(self, scope: cdk.Construct, id_: str, *, database: Database, api: API):
+class Monitoring(Construct):
+    def __init__(self, scope: Construct, id_: str, *, database: Database, api: API):
         super().__init__(scope, id_)
 
         apigateway: sam.CfnApi = api.rest_api

package-lock.json

@@ -1,5 +1,5 @@
 {
     "devDependencies": {
-        "aws-cdk": "1.172.0"
+        "aws-cdk": "2.33.0"
     }
 }

package.json

@@ -2,7 +2,7 @@
 bandit
 black
 coverage
-flake8
+flake8~=3.9
 isort
 mypy
 pylint

requirements-dev.in

@@ -4,46 +4,40 @@
 #
 #    pip-compile requirements-dev.in
 #
-astroid==2.12.9
+astroid==2.11.7
     # via pylint
 bandit==1.7.4
     # via -r requirements-dev.in
-black==22.8.0
+black==22.6.0
     # via -r requirements-dev.in
-certifi==2022.9.14
-    # via
-    #   -c requirements.txt
-    #   requests
-charset-normalizer==2.1.1
-    # via
-    #   -c requirements.txt
-    #   requests
+certifi==2022.6.15
+    # via requests
+charset-normalizer==2.1.0
+    # via requests
 click==8.1.3
     # via
     #   -c requirements.txt
     #   black
     #   safety
 colorama==0.4.5
     # via radon
-coverage==6.4.4
+coverage==6.4.2
     # via -r requirements-dev.in
 dill==0.3.5.1
     # via pylint
-dparse==0.6.0
+dparse==0.5.1
     # via safety
-flake8==5.0.4
+flake8==3.9.2
     # via -r requirements-dev.in
 future==0.18.2
     # via radon
 gitdb==4.0.9
     # via gitpython
 gitpython==3.1.27
     # via bandit
-idna==3.4
-    # via
-    #   -c requirements.txt
-    #   requests
-importlib-metadata==4.2.0
+idna==3.3
+    # via requests
+importlib-metadata==4.12.0
     # via
     #   -c requirements.txt
     #   click
@@ -57,57 +51,55 @@ lazy-object-proxy==1.7.1
     # via astroid
 mando==0.6.4
     # via radon
-mccabe==0.7.0
+mccabe==0.6.1
     # via
     #   flake8
     #   pylint
 mypy==0.971
     # via -r requirements-dev.in
 mypy-extensions==0.4.3
     # via
+    #   -c requirements.txt
     #   black
     #   mypy
 packaging==21.3
     # via
-    #   -c requirements.txt
     #   dparse
     #   safety
-pathspec==0.10.1
+pathspec==0.9.0
     # via black
-pbr==5.10.0
+pbr==5.9.0
     # via stevedore
 platformdirs==2.5.2
     # via
     #   black
     #   pylint
-pycodestyle==2.9.1
+pycodestyle==2.7.0
     # via flake8
-pyflakes==2.5.0
+pyflakes==2.3.1
     # via flake8
-pylint==2.15.2
+pylint==2.14.5
     # via -r requirements-dev.in
 pyparsing==3.0.9
-    # via
-    #   -c requirements.txt
-    #   packaging
+    # via packaging
 pyyaml==6.0
     # via
     #   -c requirements.txt
     #   bandit
+    #   dparse
     #   xenon
 radon==5.1.0
     # via
     #   -r requirements-dev.in
     #   xenon
 requests==2.28.1
     # via
-    #   -c requirements.txt
     #   safety
     #   xenon
-ruamel.yaml==0.17.21
+ruamel-yaml==0.17.21
     # via safety
-ruamel.yaml.clib==0.2.6
-    # via ruamel.yaml
+ruamel-yaml-clib==0.2.6
+    # via ruamel-yaml
 safety==2.1.1
     # via -r requirements-dev.in
 six==1.16.0
@@ -125,7 +117,7 @@ tomli==2.0.1
     #   black
     #   mypy
     #   pylint
-tomlkit==0.11.4
+tomlkit==0.11.1
     # via pylint
 typed-ast==1.5.4
     # via
@@ -141,7 +133,7 @@ typing-extensions==4.3.0
     #   importlib-metadata
     #   mypy
     #   pylint
-urllib3==1.26.12
+urllib3==1.26.11
     # via
     #   -c requirements.txt
     #   requests

requirements-dev.txt

@@ -1,5 +1,4 @@
 -c api/runtime/requirements.txt
-aws_cdk.aws_dynamodb
-aws_cdk.pipelines
-aws_cdk.core
-cdk-chalice
+aws-cdk-lib
+chalice[cdkv2]
+constructs