Skip to content

Prioritize auth configuration values over environment variables #1787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2024
+4 −4
Merged

Prioritize auth configuration values over environment variables #1787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a17b2d6
Prioritize auth configuration values over environment variables
therve Dec 5, 2023
d34259a
Merge branch 'master' into therve/fix-keyloading
therve Dec 5, 2023
bc035f2
Merge branch 'master' into therve/fix-keyloading
therve Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .generator/src/generator/templates/configuration.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ class Configuration:
# Load default values from environment
if "DD_SITE" in os.environ:
self.server_variables["site"] = os.environ["DD_SITE"]
if "DD_API_KEY" in os.environ:
if "DD_API_KEY" in os.environ and not self.api_key.get("apiKeyAuth"):
self.api_key["apiKeyAuth"] = os.environ["DD_API_KEY"]
if "DD_APP_KEY" in os.environ:
if "DD_APP_KEY" in os.environ and not self.api_key.get("appKeyAuth"):
self.api_key["appKeyAuth"] = os.environ["DD_APP_KEY"]

def __deepcopy__(self, memo):
Expand Down
4 changes: 2 additions & 2 deletions src/datadog_api_client/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ def __init__(
# Load default values from environment
if "DD_SITE" in os.environ:
self.server_variables["site"] = os.environ["DD_SITE"]
if "DD_API_KEY" in os.environ:
if "DD_API_KEY" in os.environ and not self.api_key.get("apiKeyAuth"):
self.api_key["apiKeyAuth"] = os.environ["DD_API_KEY"]
if "DD_APP_KEY" in os.environ:
if "DD_APP_KEY" in os.environ and not self.api_key.get("appKeyAuth"):
self.api_key["appKeyAuth"] = os.environ["DD_APP_KEY"]

def __deepcopy__(self, memo):
Expand Down