Skip to content

Commit 17ea9ac

Browse files
all aws_cdk symbol imports changed to module imports
1 parent 3d29b21 commit 17ea9ac

File tree

8 files changed

+22
-25
lines changed

8 files changed

+22
-25
lines changed

api/infrastructure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import pathlib
1717
from typing import Any, Dict
1818

19-
from aws_cdk import CfnOutput
19+
import aws_cdk as cdk
2020
from aws_cdk import aws_dynamodb as dynamodb
2121
from aws_cdk import aws_iam as iam
2222
from chalice.cdk import Chalice
@@ -59,7 +59,7 @@ def __init__(
5959
stage_config=stage_config,
6060
)
6161

62-
self.endpoint_url: CfnOutput = self.chalice.sam_template.get_output(
62+
self.endpoint_url: cdk.CfnOutput = self.chalice.sam_template.get_output(
6363
"EndpointURL"
6464
)
6565

app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
1414
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1515

16-
from aws_cdk import App
16+
import aws_cdk as cdk
1717

1818
import constants
1919
from deployment import UserManagementBackend
2020
from pipeline import Pipeline
2121

22-
app = App()
22+
app = cdk.App()
2323

2424
# Development
2525
UserManagementBackend(

constants.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import os
1717

18-
from aws_cdk import Environment
18+
import aws_cdk as cdk
1919
from aws_cdk import aws_dynamodb as dynamodb
2020

2121
CDK_APP_NAME = "UserManagementBackend"
@@ -27,14 +27,14 @@
2727
GITHUB_REPO = "REPO"
2828
GITHUB_TRUNK_BRANCH = "TRUNK_BRANCH"
2929

30-
DEV_ENV = Environment(
30+
DEV_ENV = cdk.Environment(
3131
account=os.environ["CDK_DEFAULT_ACCOUNT"], region=os.environ["CDK_DEFAULT_REGION"]
3232
)
3333
DEV_API_LAMBDA_RESERVED_CONCURRENCY = 1
3434
DEV_DATABASE_DYNAMODB_BILLING_MODE = dynamodb.BillingMode.PAY_PER_REQUEST
3535

36-
PIPELINE_ENV = Environment(account="222222222222", region="eu-west-1")
36+
PIPELINE_ENV = cdk.Environment(account="222222222222", region="eu-west-1")
3737

38-
PROD_ENV = Environment(account="333333333333", region="eu-west-1")
38+
PROD_ENV = cdk.Environment(account="333333333333", region="eu-west-1")
3939
PROD_API_LAMBDA_RESERVED_CONCURRENCY = 10
4040
PROD_DATABASE_DYNAMODB_BILLING_MODE = dynamodb.BillingMode.PROVISIONED

database/infrastructure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
1414
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1515

16-
from aws_cdk import RemovalPolicy
16+
import aws_cdk as cdk
1717
from aws_cdk import aws_dynamodb as dynamodb
1818
from constructs import Construct
1919

@@ -32,5 +32,5 @@ def __init__(
3232
"Table",
3333
billing_mode=dynamodb_billing_mode,
3434
partition_key=partition_key,
35-
removal_policy=RemovalPolicy.DESTROY,
35+
removal_policy=cdk.RemovalPolicy.DESTROY,
3636
)

deployment.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
from typing import Any
1717

18-
from aws_cdk import Stack
19-
from aws_cdk import Stage
18+
import aws_cdk as cdk
2019
from aws_cdk import aws_dynamodb as dynamodb
2120
from constructs import Construct
2221

@@ -25,7 +24,7 @@
2524
from monitoring.infrastructure import Monitoring
2625

2726

28-
class UserManagementBackend(Stage):
27+
class UserManagementBackend(cdk.Stage):
2928
def __init__(
3029
self,
3130
scope: Construct,
@@ -37,11 +36,11 @@ def __init__(
3736
):
3837
super().__init__(scope, id_, **kwargs)
3938

40-
stateful = Stack(self, "Stateful")
39+
stateful = cdk.Stack(self, "Stateful")
4140
database = Database(
4241
stateful, "Database", dynamodb_billing_mode=database_dynamodb_billing_mode
4342
)
44-
stateless = Stack(self, "Stateless")
43+
stateless = cdk.Stack(self, "Stateless")
4544
api = API(
4645
stateless,
4746
"API",

monitoring/infrastructure.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
1414
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1515

16-
from aws_cdk import CfnResource
17-
from aws_cdk import Fn
16+
import aws_cdk as cdk
1817
from aws_cdk import aws_cloudwatch as cloudwatch
1918
from constructs import Construct
2019

@@ -26,8 +25,8 @@ class Monitoring(Construct):
2625
def __init__(self, scope: Construct, id_: str, *, database: Database, api: API):
2726
super().__init__(scope, id_)
2827

29-
apigateway: CfnResource = api.chalice.sam_template.get_resource("RestAPI")
30-
apigateway_metric_dimensions = {"ApiName": Fn.ref(apigateway.logical_id)}
28+
apigateway: cdk.CfnResource = api.chalice.sam_template.get_resource("RestAPI")
29+
apigateway_metric_dimensions = {"ApiName": cdk.Fn.ref(apigateway.logical_id)}
3130
apigateway_metric_count = cloudwatch.Metric(
3231
namespace="AWS/APIGateway",
3332
metric_name="Count",

pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import pathlib
1818
from typing import Any
1919

20-
from aws_cdk import Stack
20+
import aws_cdk as cdk
2121
from aws_cdk import aws_codebuild as codebuild
2222
from aws_cdk import pipelines
2323
from constructs import Construct
@@ -26,7 +26,7 @@
2626
from deployment import UserManagementBackend
2727

2828

29-
class Pipeline(Stack):
29+
class Pipeline(cdk.Stack):
3030
def __init__(self, scope: Construct, id_: str, **kwargs: Any):
3131
super().__init__(scope, id_, **kwargs)
3232

tests/test_api_infrastructure.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
import tempfile
1919
import unittest
2020

21-
from aws_cdk import App
22-
from aws_cdk import Stack
21+
import aws_cdk as cdk
2322
from aws_cdk import aws_dynamodb as dynamodb
2423

2524
from api.infrastructure import API
@@ -29,8 +28,8 @@
2928
class APITestCase(unittest.TestCase):
3029
def test_endpoint_url_output_exists(self) -> None:
3130
with tempfile.TemporaryDirectory() as temp_dir:
32-
app = App(outdir=temp_dir)
33-
stack = Stack(app, "Stack")
31+
app = cdk.App(outdir=temp_dir)
32+
stack = cdk.Stack(app, "Stack")
3433
database = Database(
3534
stack,
3635
"Database",

0 commit comments

Comments
 (0)