Prioritize auth configuration values over environment variables (#1787)

Setting `DD_API_KEY` and `DD_APP_KEY` in the environment should not override values
manually passed to the configuration init.

Closes #1786

Author: therve

.generator/src/generator/templates/configuration.j2

@@ -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):

src/datadog_api_client/configuration.py

@@ -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):