Merge pull request #89 from tschaffter/dev-to-stage

Merge dev into stage

Author: tschaffter

app.py

@@ -17,7 +17,7 @@
 # get the environment
 environment = utils.get_environment()
 stack_name_prefix = f"openchallenges-{environment}"
-image_version = "1.1.2"
+image_version = "1.3.1"
 
 # get VARS from cdk.json
 env_vars = app.node.try_get_context(environment)

openchallenges/data_integration_lambda.py

@@ -28,7 +28,7 @@ def __init__(self, scope: Construct, id: str) -> None:
     def _build_lambda_role(self) -> iam.Role:
         return iam.Role(
             self,
-            "LambdaRole",
+            f"{id}-LambdaRole",
             assumed_by=iam.ServicePrincipal("lambda.amazonaws.com"),
             managed_policies=[
                 iam.ManagedPolicy.from_aws_managed_policy_name(
@@ -51,7 +51,7 @@ def _build_lambda_function(self, role: iam.Role) -> lambda_.Function:
         """
         return lambda_.DockerImageFunction(
             self,
-            "LambdaFunction",
+            f"{id}-LambdaFunction",
             code=lambda_.DockerImageCode.from_image_asset(
                 # Directory relative to where you execute cdk deploy contains a
                 # Dockerfile with build instructions.

openchallenges/data_integration_stack.py

@@ -41,7 +41,7 @@ def __init__(
         """
         super().__init__(scope, id, **kwargs)
 
-        data_integration_lambda = DataIntegrationLambda(self, "data-integration-lambda")
+        data_integration_lambda = DataIntegrationLambda(self, f"{id}-lambda")
 
         target = scheduler_targets.LambdaInvoke(
             data_integration_lambda.lambda_function,
@@ -52,13 +52,13 @@ def __init__(
         # to this group the future)
         schedule_group = scheduler_alpha.Group(
             self,
-            "group",
-            group_name="schedule-group",
+            f"{id}-schedule-group",
+            group_name=f"{id}-schedule-group",
         )
 
         scheduler_alpha.Schedule(
             self,
-            "schedule",
+            f"{id}-schedule",
             schedule=props.schedule,
             target=target,
             group=schedule_group,