From 259282ed852e60b3133028ef6db9dd1630f57e60 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 14:29:55 +0200 Subject: [PATCH 1/8] feat:#35 added sonarqube --- .gitlab-ci.yml | 42 ++++++++++++++++++++++++++++++++++++++++ sonar-project.properties | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 sonar-project.properties diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9350acd..619021e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,8 @@ stages: - lint - build - test + - sonarqube-check + - sonarqube-vulnerability-report - oci-build - deploy - deploy-dev # New stage for development deployment @@ -61,6 +63,46 @@ build-backend: - backend/go.sum - backend/go.mod +sonarqube-check-backend: + stage: sonarqube-check + image: + name: sonarsource/sonar-scanner-cli:5.0 + entrypoint: [""] + variables: + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache + GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task + cache: + key: "${CI_JOB_NAME}" + paths: + - .sonar/cache + script: + - cd backend + - sonar-scanner + allow_failure: true + only: + - merge_requests + - master + - main + - develop + +sonarqube-vulnerability-report-backend: + stage: sonarqube-vulnerability-report + script: + - cd backend + - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=HTWKalender&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json' + allow_failure: true + only: + - merge_requests + - master + - main + - develop + artifacts: + expire_in: 1 day + reports: + sast: gl-sast-sonar-report.json + dependencies: + - sonarqube-check + build-frontend: image: node:lts stage: build diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..a0ad568 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,2 @@ +sonar.projectKey=HTWKalender +sonar.qualitygate.wait=true From a4d4980c4e4a1846a906bf10c7aa2ad58427abcd Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 14:31:00 +0200 Subject: [PATCH 2/8] feat:#35 updated sonarqube --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 619021e..fecbd6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ sonarqube-vulnerability-report-backend: reports: sast: gl-sast-sonar-report.json dependencies: - - sonarqube-check + - sonarqube-check-backend build-frontend: image: node:lts From 168a1212be201e7ef0bf8b627af49c7b214cf181 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 15:11:59 +0200 Subject: [PATCH 3/8] feat:#35 moved prop file --- sonar-project.properties => backend/sonar-project.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sonar-project.properties => backend/sonar-project.properties (100%) diff --git a/sonar-project.properties b/backend/sonar-project.properties similarity index 100% rename from sonar-project.properties rename to backend/sonar-project.properties From 1e347aadf730fd8b71c3446914652f5e558d2334 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 19:56:24 +0200 Subject: [PATCH 4/8] feat:#35 updated sonarqube props --- backend/sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sonar-project.properties b/backend/sonar-project.properties index a0ad568..5de18b7 100644 --- a/backend/sonar-project.properties +++ b/backend/sonar-project.properties @@ -1,2 +1,2 @@ -sonar.projectKey=HTWKalender +sonar.projectKey=htwk-software_htwkalender_57f05352-f163-462f-b844-18c74b8c70fd sonar.qualitygate.wait=true From d05ac301ceb41731b02f778dcc65ca2c31c71213 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 19:57:35 +0200 Subject: [PATCH 5/8] feat:#35 updated sonarqube pipe --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fecbd6f..504388f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ sonarqube-vulnerability-report-backend: stage: sonarqube-vulnerability-report script: - cd backend - - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=HTWKalender&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json' + - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=htwk-software_htwkalender_57f05352-f163-462f-b844-18c74b8c70fd&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json' allow_failure: true only: - merge_requests From ac2a633462c5917bb5442ef69c5226aa03a1b93d Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 20:18:43 +0200 Subject: [PATCH 6/8] feat:#35 updated sonarqube pipe --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 504388f..586cb73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,24 +85,6 @@ sonarqube-check-backend: - main - develop -sonarqube-vulnerability-report-backend: - stage: sonarqube-vulnerability-report - script: - - cd backend - - 'curl -u "${SONAR_TOKEN}:" "${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=htwk-software_htwkalender_57f05352-f163-462f-b844-18c74b8c70fd&branch=${CI_COMMIT_BRANCH}&pullRequest=${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json' - allow_failure: true - only: - - merge_requests - - master - - main - - develop - artifacts: - expire_in: 1 day - reports: - sast: gl-sast-sonar-report.json - dependencies: - - sonarqube-check-backend - build-frontend: image: node:lts stage: build From 7779d96af5dd77191a6607db0e725b49e18fa40a Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 20:43:45 +0200 Subject: [PATCH 7/8] feat:#35 updated sonarqube props --- backend/sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sonar-project.properties b/backend/sonar-project.properties index 5de18b7..a0ad568 100644 --- a/backend/sonar-project.properties +++ b/backend/sonar-project.properties @@ -1,2 +1,2 @@ -sonar.projectKey=htwk-software_htwkalender_57f05352-f163-462f-b844-18c74b8c70fd +sonar.projectKey=HTWKalender sonar.qualitygate.wait=true From 396196e0c8ae9cb2acbe2c8c42f6b6f7254a2a0a Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Thu, 13 Jun 2024 20:52:21 +0200 Subject: [PATCH 8/8] feat:#35 updated sonarqube pipe path --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0a74d8..3f0822b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ build-ical: - data-manager/go.sum - data-manager/go.mod -sonarqube-check-backend: +sonarqube-data-manager: stage: sonarqube-check image: name: sonarsource/sonar-scanner-cli:5.0 @@ -103,7 +103,7 @@ sonarqube-check-backend: paths: - .sonar/cache script: - - cd backend + - cd services/data-manager - sonar-scanner allow_failure: true only: