fix tests

Signed-off-by: Sylvain Hellegouarch <sh@defuze.org>
chaostoolkit-incubator · Mar 26, 2024 · ab802aa · ab802aa
1 parent 0830e16
commit ab802aa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 162 deletions.
diff --git a/chaosazure/common/cloud.py b/chaosazure/common/cloud.py
diff --git a/chaosazure/common/config.py b/chaosazure/common/config.py
@@ -4,9 +4,6 @@
 import os
 
 from chaoslib.types import Configuration, Secrets
-from msrestazure import azure_cloud
-
-from chaosazure.common import cloud
 
 logger = logging.getLogger("chaostoolkit")
 
@@ -85,33 +82,19 @@ def load_secrets(experiment_secrets: Secrets):
                 "tenant_id", os.getenv("AZURE_TENANT_ID")
             ),
             # load cloud object
-            "cloud": cloud.get_or_raise(
-                experiment_secrets.get("azure_cloud", os.getenv("AZURE_CLOUD"))
+            "cloud": experiment_secrets.get(
+                "azure_cloud", os.getenv("AZURE_CLOUD", "AZURE_PUBLIC_CLOUD")
             ),
             "access_token": experiment_secrets.get(
                 "access_token", os.getenv("AZURE_ACCESS_TOKEN")
             ),
         }
 
-    # 2: lookup for credentials in azure auth file
-    az_auth_file = _load_azure_auth_file()
-    if az_auth_file:
-        rm_endpoint = az_auth_file.get("resourceManagerEndpointUrl")
-        return {
-            "client_id": az_auth_file.get("clientId"),
-            "client_secret": az_auth_file.get("clientSecret"),
-            "tenant_id": az_auth_file.get("tenantId"),
-            # load cloud object
-            "cloud": azure_cloud.get_cloud_from_metadata_endpoint(rm_endpoint),
-            # access token is not supported for credential files
-            "access_token": None,
-        }
-
     return {
         "client_id": os.getenv("AZURE_CLIENT_ID"),
         "client_secret": os.getenv("AZURE_CLIENT_SECRET"),
         "tenant_id": os.getenv("AZURE_TENANT_ID"),
-        "cloud": cloud.get_or_raise(os.getenv("AZURE_CLOUD")),
+        "cloud": os.getenv("AZURE_CLOUD", "AZURE_PUBLIC_CLOUD"),
         "access_token": os.getenv("AZURE_ACCESS_TOKEN"),
     }
 

diff --git a/tests/common/test_cloud.py b/tests/common/test_cloud.py
diff --git a/tests/common/test_config.py b/tests/common/test_config.py
@@ -1,5 +1,6 @@
 import os
 
+from chaosazure import get_management_url_from_authority
 from chaosazure.common import config
 
 settings_dir = os.path.join(os.path.dirname(__file__), "fixtures")
@@ -21,8 +22,8 @@ def test_load_secrets_from_experiment_dict():
     assert secrets.get("client_secret") == "AZURE_CLIENT_SECRET"
     assert secrets.get("tenant_id") == "AZURE_TENANT_ID"
     assert (
-        secrets.get("cloud").endpoints.resource_manager
-        == "https://management.azure.com/"
+        get_management_url_from_authority(secrets)
+        == "https://management.azure.com"
     )
 
 
@@ -36,28 +37,8 @@ def test_load_token_from_experiment_dict():
     # assert
     assert secrets.get("access_token") == "ACCESS_TOKEN"
     assert (
-        secrets.get("cloud").endpoints.resource_manager
-        == "https://management.azure.com/"
-    )
-
-
-def test_load_secrets_from_credential_file(monkeypatch):
-    # arrange
-    experiment_secrets = None
-    monkeypatch.setenv(
-        "AZURE_AUTH_LOCATION", os.path.join(settings_dir, "credentials.json")
-    )
-
-    # act
-    secrets = config.load_secrets(experiment_secrets)
-
-    # assert
-    assert secrets.get("client_id") == "AZURE_CLIENT_ID"
-    assert secrets.get("client_secret") == "AZURE_CLIENT_SECRET"
-    assert secrets.get("tenant_id") == "AZURE_TENANT_ID"
-    assert (
-        secrets.get("cloud").endpoints.resource_manager
-        == "https://management.azure.com/"
+        get_management_url_from_authority(secrets)
+        == "https://management.azure.com"
     )
 
 

diff --git a/tests/data/secrets_provider.py b/tests/data/secrets_provider.py
@@ -1,19 +1,16 @@
-from chaosazure.common import cloud
-
-
 def provide_secrets_via_service_principal():
     return {"client_id": "***", "client_secret": "***", "tenant_id": "***"}
 
 
 def provide_secrets_china():
     result = provide_secrets_via_service_principal()
-    result["azure_cloud"] = cloud.AZURE_CHINA_CLOUD
+    result["azure_cloud"] = "AZURE_CHINA_CLOUD"
     return result
 
 
 def provide_secrets_germany():
     result = provide_secrets_via_service_principal()
-    result["azure_cloud"] = cloud.AZURE_GERMAN_CLOUD
+    result["azure_cloud"] = "AZURE_GERMAN_CLOUD"
     return result
 
 
@@ -25,13 +22,13 @@ def provide_secrets_germany_small_letters():
 
 def provide_secrets_us_gov():
     result = provide_secrets_via_service_principal()
-    result["azure_cloud"] = cloud.AZURE_US_GOV_CLOUD
+    result["azure_cloud"] = "AZURE_US_GOV_CLOUD"
     return result
 
 
 def provide_secrets_public():
     result = provide_secrets_via_service_principal()
-    result["azure_cloud"] = cloud.AZURE_PUBLIC_CLOUD
+    result["azure_cloud"] = "AZURE_PUBLIC_CLOUD"
     return result