get token from overrides

allenai · Dec 14, 2021 · 2c53c2b · 2c53c2b
1 parent 0b0bd57
commit 2c53c2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fixed bug where `Beaker.from_env()` would fail with missing `BEAKER_TOKEN` even if you passed the token to the method.
+
 ## [v0.2.4](https://github.com/allenai/beaker-py/releases/tag/v0.2.4) - 2021-12-09
 
 ### Changed

diff --git a/beaker/config.py b/beaker/config.py
@@ -63,9 +63,11 @@ def from_env(cls, **overrides) -> "Config":
             config = cls(
                 user_token=os.environ[cls.TOKEN_KEY],
             )
+        elif user_token in overrides:
+            config = cls(user_token=user_token)
         else:
             raise ConfigurationError(
-                f"Missing config file or environment variable '{cls.TOKEN_KEY}'"
+                f"Failed to find config file or environment variable '{cls.TOKEN_KEY}'"
             )
 
         # Override with environment variables.