SCANPY-140 Properties should be stored in a dictionary (#146)

Author: Seppli11

src/pysonar_scanner/__main__.py

@@ -19,21 +19,21 @@
 #
 
 from pysonar_scanner import cache
-from pysonar_scanner.configuration import Configuration, ConfigurationLoader
+from pysonar_scanner import configuration
 from pysonar_scanner.api import get_base_urls, SonarQubeApi
+from pysonar_scanner.configuration import ConfigurationLoader
 from pysonar_scanner.scannerengine import ScannerEngine
-from pysonar_scanner.cache import Cache
-from pysonar_scanner.jre import JREProvisioner, JREResolvedPath, JREResolver
 
 
 def scan():
-    configuration = ConfigurationLoader().initialize_configuration()
+    config = ConfigurationLoader.load()
     cache_manager = cache.get_default()
-    api = __build_api(configuration)
+    api = __build_api(config)
     scanner = ScannerEngine(api, cache_manager)
-    return scanner.run(configuration)
+    return scanner.run(config)
 
 
-def __build_api(configuration) -> SonarQubeApi:
-    base_urls = get_base_urls(configuration)
-    return SonarQubeApi(base_urls, configuration.sonar.token)
+def __build_api(config: dict[str, any]) -> SonarQubeApi:
+    token = configuration.get_token(config)
+    base_urls = get_base_urls(config)
+    return SonarQubeApi(base_urls, token)

src/pysonar_scanner/api.py

@@ -19,12 +19,11 @@
 #
 import typing
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, TypedDict
 
 import requests
 import requests.auth
 
-from pysonar_scanner.configuration import Configuration
 from pysonar_scanner.exceptions import MissingKeyException, SonarQubeApiException
 from pysonar_scanner.utils import Arch, Os, remove_trailing_slash
 
@@ -103,9 +102,24 @@ def from_dict(dict: dict) -> "JRE":
             raise MissingKeyException(f"Missing key in dictionary {dict}") from e
 
 
-def get_base_urls(config: Configuration) -> BaseUrls:
-    def is_sq_cloud_url(sonar_host_url: str) -> bool:
-        sq_cloud_url = config.sonar.scanner.sonarcloud_url.strip() or "https://sonarcloud.io"
+ApiConfiguration = TypedDict(
+    "ApiConfiguration",
+    {"sonar.host.url": str, "sonar.scanner.sonarcloudUrl": str, "sonar.scanner.apiBaseUrl": str, "sonar.region": str},
+)
+
+
+def to_api_configuration(config_dict: dict[str, any]) -> ApiConfiguration:
+    return {
+        "sonar.host.url": config_dict.get("sonar.host.url", ""),
+        "sonar.scanner.sonarcloudUrl": config_dict.get("sonar.scanner.sonarcloudUrl", ""),
+        "sonar.scanner.apiBaseUrl": config_dict.get("sonar.scanner.apiBaseUrl", ""),
+        "sonar.region": config_dict.get("sonar.region", ""),
+    }
+
+
+def get_base_urls(config_dict: dict[str, any]) -> BaseUrls:
+    def is_sq_cloud_url(api_config: ApiConfiguration, sonar_host_url: str) -> bool:
+        sq_cloud_url = api_config["sonar.scanner.sonarcloudUrl"] or "https://sonarcloud.io"
         return remove_trailing_slash(sonar_host_url) == remove_trailing_slash(sq_cloud_url)
 
     def is_blank(str) -> bool:
@@ -114,14 +128,16 @@ def is_blank(str) -> bool:
     def region_with_dot(region: str) -> str:
         return region + "." if not is_blank(region) else ""
 
-    sonar_host_url = remove_trailing_slash(config.sonar.host_url)
-    if is_blank(sonar_host_url) or is_sq_cloud_url(sonar_host_url):
-        region = region_with_dot(config.sonar.region)
-        sonar_host_url = config.sonar.scanner.sonarcloud_url or f"https://{region}sonarcloud.io"
-        api_base_url = config.sonar.scanner.api_base_url or f"https://api.{region}sonarcloud.io"
+    api_config: ApiConfiguration = to_api_configuration(config_dict)
+
+    sonar_host_url = remove_trailing_slash(api_config["sonar.host.url"])
+    if is_blank(sonar_host_url) or is_sq_cloud_url(api_config, sonar_host_url):
+        region = region_with_dot(api_config["sonar.region"])
+        sonar_host_url = api_config["sonar.scanner.sonarcloudUrl"] or f"https://{region}sonarcloud.io"
+        api_base_url = api_config["sonar.scanner.apiBaseUrl"] or f"https://api.{region}sonarcloud.io"
         return BaseUrls(base_url=sonar_host_url, api_base_url=api_base_url, is_sonar_qube_cloud=True)
     else:
-        api_base_url = config.sonar.scanner.api_base_url or f"{sonar_host_url}/api/v2"
+        api_base_url = api_config["sonar.scanner.apiBaseUrl"] or f"{sonar_host_url}/api/v2"
         return BaseUrls(base_url=sonar_host_url, api_base_url=api_base_url, is_sonar_qube_cloud=False)