From f6518a3ba1da1b02ce2e91e1633900cbae6ad7bf Mon Sep 17 00:00:00 2001 From: Sylvain Hellegouarch Date: Tue, 11 Jul 2023 14:58:24 +0200 Subject: [PATCH] Read from env variables Signed-off-by: Sylvain Hellegouarch --- CHANGELOG.md | 10 +++++++++- chaosazure/common/config.py | 15 ++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f74252..48eb4ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,15 @@ ## [Unreleased][] -[Unreleased]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.15.1...HEAD +[Unreleased]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.15.2...HEAD + +## [0.15.2][] - 2023-07-11 + +[0.15.2]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.15.1...0.15.2 + +### Added + +* Load secrets from env variables as well ## [0.15.1][] - 2023-07-11 diff --git a/chaosazure/common/config.py b/chaosazure/common/config.py index f2f95f3..da38d08 100644 --- a/chaosazure/common/config.py +++ b/chaosazure/common/config.py @@ -74,12 +74,17 @@ def load_secrets(experiment_secrets: Secrets): # 1: lookup for secrets in experiment file if experiment_secrets: return { - 'client_id': experiment_secrets.get('client_id'), - 'client_secret': experiment_secrets.get('client_secret'), - 'tenant_id': experiment_secrets.get('tenant_id'), + 'client_id': experiment_secrets.get( + 'client_id', os.getenv("AZURE_CLIENT_ID")), + 'client_secret': experiment_secrets.get( + 'client_secret', os.getenv("AZURE_CLIENT_SECRET")), + 'tenant_id': experiment_secrets.get( + 'tenant_id', os.getenv("AZURE_TENANT_ID")), # load cloud object - 'cloud': cloud.get_or_raise(experiment_secrets.get('azure_cloud')), - 'access_token': experiment_secrets.get('access_token'), + 'cloud': cloud.get_or_raise( + experiment_secrets.get('azure_cloud', os.getenv("AZURE_CLOUD"))), + 'access_token': experiment_secrets.get( + 'access_token', os.getenv("AZURE_ACCESS_TOKEN")), } # 2: lookup for credentials in azure auth file