fix any type issue

Author: Seppli11

src/pysonar_scanner/__main__.py

@@ -18,6 +18,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
+from typing import Any
 from pysonar_scanner import app_logging
 from pysonar_scanner import cache
 from pysonar_scanner.api import get_base_urls, SonarQubeApi, BaseUrls, MIN_SUPPORTED_SQ_VERSION
@@ -58,7 +59,7 @@ def set_logging_options(config):
     app_logging.configure_logging_level(verbose=config.get(SONAR_VERBOSE, False))
 
 
-def build_api(config: dict[str, any]) -> SonarQubeApi:
+def build_api(config: dict[str, Any]) -> SonarQubeApi:
     token = configuration_loader.get_token(config)
     base_urls = get_base_urls(config)
     return SonarQubeApi(base_urls, token)
@@ -90,7 +91,7 @@ def create_scanner_engine(api, cache_manager, config):
     return scanner
 
 
-def create_jre(api, cache, config: dict[str, any]) -> JREResolvedPath:
+def create_jre(api, cache, config: dict[str, Any]) -> JREResolvedPath:
     jre_provisioner = JREProvisioner(api, cache, config[SONAR_SCANNER_OS], config[SONAR_SCANNER_ARCH])
     jre_resolver = JREResolver(JREResolverConfiguration.from_dict(config), jre_provisioner)
     return jre_resolver.resolve_jre()

src/pysonar_scanner/api.py

@@ -19,7 +19,7 @@
 #
 import typing
 from dataclasses import dataclass
-from typing import Optional, TypedDict
+from typing import Any, Optional, TypedDict
 
 import requests
 import requests.auth
@@ -118,7 +118,7 @@ def from_dict(dict: dict) -> "JRE":
 )
 
 
-def to_api_configuration(config_dict: dict[Key, any]) -> ApiConfiguration:
+def to_api_configuration(config_dict: dict[Key, Any]) -> ApiConfiguration:
     return {
         SONAR_HOST_URL: config_dict.get(SONAR_HOST_URL, ""),
         SONAR_SCANNER_SONARCLOUD_URL: config_dict.get(SONAR_SCANNER_SONARCLOUD_URL, ""),
@@ -127,7 +127,7 @@ def to_api_configuration(config_dict: dict[Key, any]) -> ApiConfiguration:
     }
 
 
-def get_base_urls(config_dict: dict[Key, any]) -> BaseUrls:
+def get_base_urls(config_dict: dict[Key, Any]) -> BaseUrls:
     def is_sq_cloud_url(api_config: ApiConfiguration, sonar_host_url: str) -> bool:
         sq_cloud_url = api_config[SONAR_SCANNER_SONARCLOUD_URL] or GLOBAL_SONARCLOUD_URL
         return remove_trailing_slash(sonar_host_url) in [remove_trailing_slash(sq_cloud_url), US_SONARCLOUD_URL]

src/pysonar_scanner/configuration/cli.py

@@ -18,6 +18,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 import argparse
+from typing import Any
 
 from pysonar_scanner.configuration import properties
 from pysonar_scanner.exceptions import UnexpectedCliArgument
@@ -26,7 +27,7 @@
 class CliConfigurationLoader:
 
     @classmethod
-    def load(cls) -> dict[str, any]:
+    def load(cls) -> dict[str, Any]:
         args, unknown_args = cls.__parse_cli_args()
         config = {}
         for prop in properties.PROPERTIES:

src/pysonar_scanner/configuration/configuration_loader.py

@@ -18,6 +18,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 from pathlib import Path
+from typing import Any
 
 from pysonar_scanner.configuration.cli import CliConfigurationLoader
 from pysonar_scanner.configuration.pyproject_toml import TomlConfigurationLoader
@@ -28,13 +29,13 @@
 from pysonar_scanner.exceptions import MissingKeyException
 
 
-def get_static_default_properties() -> dict[Key, any]:
+def get_static_default_properties() -> dict[Key, Any]:
     return {prop.name: prop.default_value for prop in PROPERTIES if prop.default_value is not None}
 
 
 class ConfigurationLoader:
     @staticmethod
-    def load() -> dict[Key, any]:
+    def load() -> dict[Key, Any]:
         # each property loader is required to return NO default values.
         # E.g. if no property has been set, an empty dict must be returned.
         # Default values should be set through the get_static_default_properties() method
@@ -57,7 +58,7 @@ def load() -> dict[Key, any]:
         return resolved_properties
 
 
-def get_token(config: dict[Key, any]) -> str:
+def get_token(config: dict[Key, Any]) -> str:
     if SONAR_TOKEN not in config:
         raise MissingKeyException(f'Missing property "{SONAR_TOKEN}"')
     return config[SONAR_TOKEN]

src/pysonar_scanner/configuration/dynamic_defaults_loader.py

@@ -18,13 +18,13 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 import os
-from typing import Dict
+from typing import Any, Dict
 
 from pysonar_scanner.configuration.properties import Key, SONAR_SCANNER_OS, SONAR_SCANNER_ARCH, SONAR_PROJECT_BASE_DIR
 from pysonar_scanner import utils
 
 
-def load() -> Dict[Key, any]:
+def load() -> Dict[Key, Any]:
     """
     Load dynamically computed default properties
     """

src/pysonar_scanner/configuration/properties.py

@@ -20,7 +20,7 @@
 import time
 import argparse
 from dataclasses import dataclass
-from typing import Callable, Optional
+from typing import Any, Callable, Optional
 
 Key = str
 
@@ -101,10 +101,10 @@ class Property:
     name: Key
     """name in the format of `sonar.scanner.appVersion`"""
 
-    default_value: Optional[any]
+    default_value: Optional[Any]
     """default value for the property; if None, no default value is set"""
 
-    cli_getter: Optional[Callable[[argparse.Namespace], any]] = None
+    cli_getter: Optional[Callable[[argparse.Namespace], Any]] = None
     """function to get the value from the CLI arguments namespace. If None, the property is not settable via CLI"""
 
     def python_name(self) -> str:

src/pysonar_scanner/configuration/pyproject_toml.py

@@ -18,7 +18,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 from pathlib import Path
-from typing import Dict
+from typing import Any, Dict
 import os
 import tomli
 
@@ -84,7 +84,7 @@ def __read_project_properties(toml_dict) -> Dict[str, str]:
         return project_properties
 
     @staticmethod
-    def __flatten_config_dict(config: dict[str, any], prefix: str) -> dict[str, any]:
+    def __flatten_config_dict(config: dict[str, Any], prefix: str) -> dict[str, Any]:
         """Flatten nested dictionaries into dot notation keys"""
         result = {}
         for key, value in config.items():

src/pysonar_scanner/jre.py

@@ -22,7 +22,7 @@
 import tarfile
 import zipfile
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 
 from pysonar_scanner import utils
 from pysonar_scanner.api import JRE, SonarQubeApi
@@ -139,7 +139,7 @@ class JREResolverConfiguration:
     sonar_scanner_os: Optional[str]
 
     @staticmethod
-    def from_dict(config_dict: dict[Key, any]) -> "JREResolverConfiguration":
+    def from_dict(config_dict: dict[Key, Any]) -> "JREResolverConfiguration":
         return JREResolverConfiguration(
             sonar_scanner_java_exe_path=config_dict.get(SONAR_SCANNER_JAVA_EXE_PATH, None),
             sonar_scanner_skip_jre_provisioning=config_dict.get(SONAR_SCANNER_SKIP_JRE_PROVISIONING, False),

src/pysonar_scanner/scannerengine.py

@@ -23,7 +23,7 @@
 from dataclasses import dataclass
 from subprocess import Popen, PIPE
 from threading import Thread
-from typing import IO, Callable, Optional
+from typing import IO, Any, Callable, Optional
 
 from pysonar_scanner.api import SonarQubeApi
 from pysonar_scanner.cache import Cache, CacheFile
@@ -138,7 +138,7 @@ def __init__(self, jre_path: JREResolvedPath, scanner_engine_path: pathlib.Path)
         self.jre_path = jre_path
         self.scanner_engine_path = scanner_engine_path
 
-    def run(self, config: dict[str, any]):
+    def run(self, config: dict[str, Any]):
         cmd = self.__build_command(self.jre_path, self.scanner_engine_path)
         properties_str = self.__config_to_json(config)
         return CmdExecutor(cmd, properties_str).execute()
@@ -150,6 +150,6 @@ def __build_command(self, jre_path: JREResolvedPath, scanner_engine_path: pathli
         cmd.append(scanner_engine_path)
         return cmd
 
-    def __config_to_json(self, config: dict[str, any]) -> str:
+    def __config_to_json(self, config: dict[str, Any]) -> str:
         scanner_properties = [{"key": k, "value": v} for k, v in config.items()]
         return json.dumps({"scannerProperties": scanner_properties})

tests/unit/test_api.py

@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-from typing import TypedDict
+from typing import Any, TypedDict
 
 import io
 
@@ -73,7 +73,7 @@ def test_BaseUrls_normalization(self):
     def test_get_base_urls(self):
         class TestCaseDict(TypedDict):
             name: str
-            config: dict[Key, any]
+            config: dict[Key, Any]
             expected: BaseUrls
 
         cases: list[TestCaseDict] = [
@@ -204,7 +204,7 @@ class TestCaseDict(TypedDict):
     def test_inconsistent_urls_raises_exception(self):
         class TestCaseDict(TypedDict):
             name: str
-            config: dict[Key, any]
+            config: dict[Key, Any]
             expected: str
 
         cases: list[TestCaseDict] = [