Merge pull request #56 from VerticalRelevance/cdk-v2.92.0

use cdk v2.92.0
VerticalRelevance · Aug 23, 2023 · 59c59ee · 59c59ee
2 parents ce034de + d272d86
commit 59c59ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ package-lock.json
 __pycache__
 .pytest_cache
 .venv
+venv
 *.egg-info
 
 # CDK asset staging directory

diff --git a/components/control_broker_api.py b/components/control_broker_api.py
@@ -5,6 +5,7 @@
 import aws_cdk
 from aws_cdk import (
  CfnOutput,
+ RemovalPolicy,
  aws_apigatewayv2,
  aws_apigatewayv2_alpha,
  aws_apigatewayv2_authorizers_alpha,
@@ -26,6 +27,7 @@ def __init__(
  lambda_invoked_by_apigw_eval_engine_endpoint: aws_lambda.Function,
  control_broker_results_bucket: aws_s3.Bucket,
  access_log_retention: aws_logs.RetentionDays = aws_logs.RetentionDays.ONE_DAY,
+ removal_policy=RemovalPolicy.DESTROY,
  **kwargs,
  ):
  super().__init__(scope, name, **kwargs)
@@ -36,7 +38,10 @@ def __init__(
  self.control_broker_results_bucket = control_broker_results_bucket
 
  api_log_group = aws_logs.LogGroup(
- self, f"{id}AccessLogs", retention=access_log_retention
+ self, f"{id}AccessLogs",
+ retention=access_log_retention,
+ removal_policy=removal_policy,
+ log_group_name=f"/aws/vendedlogs/apigateway/{name}"
  )
 
  api_log_group.grant_write(aws_iam.ServicePrincipal("apigateway.amazonaws.com"))

diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,11 @@
 appnope==0.1.3
 asttokens==2.0.5
 attrs==21.4.0
-aws-cdk-lib==2.23.0
-aws-cdk.aws-apigatewayv2-alpha==2.22.0a0
-aws-cdk.aws-apigatewayv2-authorizers-alpha==2.22.0a0
-aws-cdk.aws-apigatewayv2-integrations-alpha==2.22.0a0
-aws-cdk.aws-lambda-python-alpha==2.22.0a0
-aws-cdk.aws-s3objectlambda-alpha==2.23.0a0
+aws-cdk-lib==2.92.0
+aws-cdk.aws-apigatewayv2-alpha==2.92.0a0
+aws-cdk.aws-apigatewayv2-authorizers-alpha==2.92.0a0
+aws-cdk.aws-apigatewayv2-integrations-alpha==2.92.0a0
+aws-cdk.aws-lambda-python-alpha==2.92.0a0
 backcall==0.2.0
 black==22.3.0
 boto3==1.21.42
@@ -24,7 +23,7 @@ ipdb==0.13.9
 ipython==8.2.0
 jedi==0.18.1
 jmespath==1.0.0
-jsii==1.57.0
+jsii==1.87.0
 matplotlib-inline==0.1.3
 mypy-extensions==0.4.3
 packaging==21.3

diff --git a/stacks/control_broker_stack.py b/stacks/control_broker_stack.py
@@ -25,7 +25,6 @@
  aws_apigatewayv2_authorizers_alpha,
  aws_apigatewayv2_integrations_alpha,
  aws_lambda_python_alpha,
- aws_s3objectlambda_alpha,
 )
 
 from constructs import Construct