Fix enum behavior

interuss · Dec 1, 2023 · 20e1d2b · 20e1d2b
1 parent c70b8d6
commit 20e1d2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/monitoring/monitorlib/infrastructure.py b/monitoring/monitorlib/infrastructure.py
@@ -1,6 +1,7 @@
 import asyncio
 import datetime
 import functools
+from enum import Enum
 from typing import Dict, List, Optional
 import urllib.parse
 from aiohttp import ClientSession, ClientResponse
@@ -39,6 +40,7 @@ def issue_token(self, intended_audience: str, scopes: List[str]) -> str:
     def get_headers(self, url: str, scopes: List[str] = None) -> Dict[str, str]:
         if scopes is None:
             scopes = ALL_SCOPES
+        scopes = [s.value if isinstance(s, Enum) else s for s in scopes]
         intended_audience = urllib.parse.urlparse(url).hostname
         scope_string = " ".join(scopes)
         if intended_audience not in self._tokens:

diff --git a/monitoring/prober/scd/test_constraints_with_subscriptions.py b/monitoring/prober/scd/test_constraints_with_subscriptions.py
@@ -67,7 +67,7 @@ def _make_sub_req(base_url: str, notify_ops: bool, notify_constraints: bool) ->
 
 def _read_both_scope(scd_api: str) -> str:
     if scd_api == scd.API_0_3_17:
-        return "{} {}".format(SCOPE_SC, SCOPE_CP)
+        return "{} {}".format(SCOPE_SC.value, SCOPE_CP.value)
     else:
         raise NotImplementedError("Unsupported API version {}".format(scd_api))