From d2c062da71c4f25451d924ca46e1d37840e827a0 Mon Sep 17 00:00:00 2001 From: danellecline Date: Thu, 16 May 2024 19:28:13 -0700 Subject: [PATCH] fix: correct check for CDK_STACK_CONFIG --- cdk/cdk.py | 8 ++++++-- cdk/fastapi.py | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cdk/cdk.py b/cdk/cdk.py index b1b3060..6f539f3 100644 --- a/cdk/cdk.py +++ b/cdk/cdk.py @@ -15,6 +15,7 @@ ''' import datetime as dt import yaml +import os from fastapi import FastAPIStack from aws_cdk import ( App, Environment @@ -22,8 +23,11 @@ app = App() -# Import project config -with open("config.yml", 'r') as stream: +# Import project config from CDK_STACK_CONFIG environment variable +if 'CDK_STACK_CONFIG' not in os.environ: + raise ValueError("CDK_STACK_CONFIG environment variable not set") + +with open(os.environ['CDK_STACK_CONFIG'], 'r') as stream: config = yaml.safe_load(stream) deletion_date = (dt.datetime.utcnow() + dt.timedelta(days=90)).strftime('%Y%m%dT%H%M%SZ') diff --git a/cdk/fastapi.py b/cdk/fastapi.py index 3d1f8b0..91c29d1 100644 --- a/cdk/fastapi.py +++ b/cdk/fastapi.py @@ -15,6 +15,7 @@ ''' import yaml +import os from aws_cdk import Stack from constructs import Construct from aws_cdk import ( @@ -36,8 +37,11 @@ def __init__( ) -> None: super().__init__(scope, id, **kwargs) - # Import project config - with open(process.env.CDK_STACK_CONFIG, 'r') as stream: + # Import project config from CDK_STACK_CONFIG environment variable + if 'CDK_STACK_CONFIG' not in os.environ: + raise ValueError("CDK_STACK_CONFIG environment variable not set") + + with open(os.environ['CDK_STACK_CONFIG'], 'r') as stream: config = yaml.safe_load(stream) # Cluster capacity