PYSCAN-72 Replace sonar-scanner by pysonar-scanner in CI pipeline (#74)

Author: ghislainpiot

.cirrus.yml

@@ -84,7 +84,8 @@ analysis_task:
   name: "SC Analysis"
   analysis_script:
     - poetry run pytest --cov-report=xml:coverage.xml --cov-config=pyproject.toml --cov=src --cov-branch tests
-    - sonar-scanner -Dsonar.organization=sonarsource -DbuildNumber=${CI_BUILD_NUMBER}
+    - poetry install
+    - poetry run pysonar-scanner -Dsonar.organization=sonarsource -DbuildNumber=${CI_BUILD_NUMBER}
   always:
     pytest_artifacts:
       path: "coverage.xml"

.cirrus/poetry.Dockerfile

@@ -3,7 +3,6 @@ FROM ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
 
 USER root
 
-ARG SCANNER_VERSION=5.0.1.3006
 ARG PYTHON_VERSION=3.12.1
 
 # install required dependencies to build Python from source see: https://devguide.python.org/getting-started/setup-building/#install-dependencies
@@ -17,15 +16,9 @@ RUN cd /usr/local/bin \
     && ln -s pip${PYTHON_VERSION%.*} pip \
     && ln -s pip${PYTHON_VERSION%.*} pip3
 
-RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SCANNER_VERSION}.zip" -o /tmp/sonar-scanner.zip \
-  && unzip -d /opt /tmp/sonar-scanner.zip \
-  && mv /opt/sonar-scanner-${SCANNER_VERSION} /opt/sonar-scanner \
-  && rm /tmp/sonar-scanner.zip
-
 USER sonarsource
 
 RUN curl -sSL https://install.python-poetry.org | python3 -
-ENV PATH="${PATH}:/opt/sonar-scanner/bin"
 ENV PATH="${PATH}:/home/sonarsource/.local/bin"
 
 ENV SONARCLOUD_ANALYSIS true

its/tests/test_analysis.py

@@ -46,7 +46,7 @@ def test_minimal_project_read_poetry_data(sonarqube_client: SonarQubeClient):
 def test_minimal_project_unexpected_arg(sonarqube_client: SonarQubeClient):
     process = CliClient().run_analysis(sonarqube_client, params=["-unexpected"], sources_dir="minimal")
     assert process.returncode == 0
-    assert "ERROR: Unrecognized option: -unexpected" in process.stdout
+    assert "ERROR Unrecognized option: -unexpected" in process.stdout
 
 
 def test_minimal_project_wrong_home(sonarqube_client: SonarQubeClient):

its/utils/cli_client.py

@@ -29,9 +29,10 @@ class CliClient():
     SOURCES_FOLDER_PATH: str = os.path.join(
         os.path.dirname(__file__), "../sources")
 
-    def run_analysis(self, client: SonarQubeClient, params: list[str] = None, sources_dir: str = None) -> CompletedProcess:
+    def run_analysis(self, client: SonarQubeClient, params: list[str] = [], sources_dir: str = None) -> CompletedProcess:
         if params is None:
             params = []
+        params.append("-Dsonar.host.url=http://localhost:9000")
         workdir = os.path.join(self.SOURCES_FOLDER_PATH, sources_dir)
         command = [self.SCANNER_CMD] + params
         process = subprocess.run(command, stdout=subprocess.PIPE,

src/pysonar_scanner/configuration.py

@@ -41,7 +41,7 @@ class Configuration:
     def __init__(self):
         self.log = ApplicationLogger.get_logger()
         self.sonar_scanner_path = ".scanner"
-        self.sonar_scanner_version = "6.1.0.4477"
+        self.sonar_scanner_version = "6.0.0.4432"
         self.sonar_scanner_executable_path = ""
         self.scan_arguments = []
         self.wrapper_arguments = argparse.Namespace(debug=False, read_project_config=False)