Don't use key-service if it does not exist (#453)

* Don't use key-service if it does not exist

* Disable API key if not using SSEv2

Author: t-persson

cli/pyproject.toml

@@ -33,6 +33,9 @@ Documentation = "https://etos.readthedocs.io/"
 Homepage = "https://github.com/eiffel-community/etos"
 Repository = "https://github.com/eiffel-community/etos"
 
+[tool.black]
+line-length = 100
+
 [tool.build]
 # Use this option if your package is pure-python
 universal = true
@@ -57,4 +60,4 @@ testpaths = ["tests"]
 find = { where = ["src"], exclude = ["tests"] }
 
 [tool.setuptools_scm]
-root = ".."
+root = ".."

cli/src/etos_client/etos/v1alpha/etos.py

@@ -15,33 +15,32 @@
 # limitations under the License.
 """ETOS v1alpha."""
 
-import os
 import logging
-import time
+import os
 import shutil
-from pathlib import Path
+import time
 from json import JSONDecodeError
+from pathlib import Path
 from typing import Optional, Union
 
-from requests.exceptions import HTTPError
-from etos_lib.lib.http import Http
 from etos_lib import ETOS as ETOSLibrary
+from etos_lib.lib.http import Http
+from requests.exceptions import HTTPError
 from urllib3.util import Retry
 
-from etos_client.types.result import Result, Verdict, Conclusion
-from etos_client.shared.downloader import Downloader
-from etos_client.shared.utilities import directories
-from etos_client.sse.v2alpha.client import SSEClient as SSEV2AlphaClient, TokenExpired
-from etos_client.sse.v1.client import SSEClient as SSEV1Client
-
-from etos_client.etos.v0.test_run import TestRun as V0TestRun
 from etos_client.etos.v0.event_repository import graphql
 from etos_client.etos.v0.events.collector import Collector
 from etos_client.etos.v0.test_results import TestResults
-from etos_client.etos.v1alpha.test_run import TestRun as V1AlphaTestRun
-from etos_client.etos.v1alpha.schema.response import ResponseSchema
+from etos_client.etos.v0.test_run import TestRun as V0TestRun
 from etos_client.etos.v1alpha.schema.request import RequestSchema
-
+from etos_client.etos.v1alpha.schema.response import ResponseSchema
+from etos_client.etos.v1alpha.test_run import TestRun as V1AlphaTestRun
+from etos_client.shared.downloader import Downloader
+from etos_client.shared.utilities import directories
+from etos_client.sse.v1.client import SSEClient as SSEV1Client
+from etos_client.sse.v2alpha.client import SSEClient as SSEV2AlphaClient
+from etos_client.sse.v2alpha.client import TokenExpired
+from etos_client.types.result import Conclusion, Result, Verdict
 
 # Max total time for a ping request including delays with backoff factor 0.5 will be:
 # 0.5 + 1.5 + 3.5 + 7.5 + 15.5 = 28.5 (seconds)
@@ -80,8 +79,8 @@ def __init__(self, args: dict, sse_client: Union[SSEV1Client, SSEV2AlphaClient])
     @property
     def apikey(self) -> str:
         """Generate and return an API key."""
+        http = Http(retry=HTTP_RETRY_PARAMETERS, timeout=10)
         if self.__apikey is None:
-            http = Http(retry=HTTP_RETRY_PARAMETERS, timeout=10)
             url = f"{self.cluster}/keys/v1alpha/generate"
             response = http.post(
                 url,
@@ -115,9 +114,12 @@ def __start(self) -> tuple[Optional[ResponseSchema], Optional[str]]:
 
         response_json = {}
         http = Http(retry=HTTP_RETRY_PARAMETERS, timeout=10)
-        response = http.post(
-            url, json=request.model_dump(), headers={"Authorization": f"Bearer {self.apikey}"}
-        )
+        if isinstance(self.sse_client, SSEV2AlphaClient):
+            response = http.post(
+                url, json=request.model_dump(), headers={"Authorization": f"Bearer {self.apikey}"}
+            )
+        else:
+            response = http.post(url, json=request.model_dump())
         try:
             response.raise_for_status()
             response_json = response.json()