From 2700ec4b2d10ca166b9c54a08f671b2a75c0eb97 Mon Sep 17 00:00:00 2001 From: joneszc Date: Wed, 23 Oct 2024 11:38:27 -0400 Subject: [PATCH 1/4] env credentials Pytest troubleshooting on develop branch --- src/_nebari/stages/infrastructure/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/_nebari/stages/infrastructure/__init__.py b/src/_nebari/stages/infrastructure/__init__.py index 3e77f9bee..ab0d70820 100644 --- a/src/_nebari/stages/infrastructure/__init__.py +++ b/src/_nebari/stages/infrastructure/__init__.py @@ -173,6 +173,7 @@ def _infer_and_validate_ami_type(cls, value, values) -> str: class AWSInputVars(schema.Base): + name: str environment: str existing_security_group_id: Optional[str] = None From 387c1c942ffefeb958443ab349af0f713e325edb Mon Sep 17 00:00:00 2001 From: joneszc Date: Wed, 23 Oct 2024 11:49:39 -0400 Subject: [PATCH 2/4] env credentials Pytest troubleshooting on develop branch --- src/_nebari/provider/cloud/amazon_web_services.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/_nebari/provider/cloud/amazon_web_services.py b/src/_nebari/provider/cloud/amazon_web_services.py index 1123c07fe..53938b1cc 100644 --- a/src/_nebari/provider/cloud/amazon_web_services.py +++ b/src/_nebari/provider/cloud/amazon_web_services.py @@ -22,6 +22,7 @@ def check_credentials() -> None: @functools.lru_cache() + def aws_session( region: Optional[str] = None, digitalocean_region: Optional[str] = None ) -> boto3.Session: From b0e3239190a161009aec74eb158237339a5ae83f Mon Sep 17 00:00:00 2001 From: joneszc Date: Wed, 23 Oct 2024 11:50:30 -0400 Subject: [PATCH 3/4] env credentials Pytest troubleshooting2 on develop branch --- src/_nebari/provider/cloud/amazon_web_services.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/_nebari/provider/cloud/amazon_web_services.py b/src/_nebari/provider/cloud/amazon_web_services.py index 53938b1cc..b2dc49e7c 100644 --- a/src/_nebari/provider/cloud/amazon_web_services.py +++ b/src/_nebari/provider/cloud/amazon_web_services.py @@ -23,6 +23,7 @@ def check_credentials() -> None: @functools.lru_cache() + def aws_session( region: Optional[str] = None, digitalocean_region: Optional[str] = None ) -> boto3.Session: From fb3cf0ac49440060184fa39ea7ddeffe501bdb6b Mon Sep 17 00:00:00 2001 From: joneszc Date: Wed, 23 Oct 2024 11:57:08 -0400 Subject: [PATCH 4/4] env credentials Pytest troubleshooting3 on develop branch --- src/_nebari/provider/cloud/amazon_web_services.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/_nebari/provider/cloud/amazon_web_services.py b/src/_nebari/provider/cloud/amazon_web_services.py index b2dc49e7c..933d116e5 100644 --- a/src/_nebari/provider/cloud/amazon_web_services.py +++ b/src/_nebari/provider/cloud/amazon_web_services.py @@ -22,8 +22,6 @@ def check_credentials() -> None: @functools.lru_cache() - - def aws_session( region: Optional[str] = None, digitalocean_region: Optional[str] = None ) -> boto3.Session: @@ -38,7 +36,6 @@ def aws_session( aws_access_key_id = os.environ["AWS_ACCESS_KEY_ID"] aws_secret_access_key = os.environ["AWS_SECRET_ACCESS_KEY"] aws_session_token = os.environ.get("AWS_SESSION_TOKEN") - if not region: raise ValueError( "Please specify `region` in the nebari-config.yaml or if initializing the nebari-config, set the region via the "