From 393ebdc0cd67d3eccec42caba062b6289111f832 Mon Sep 17 00:00:00 2001
From: Dimitris Kavvathas <dimitris.kavvathas@sonarsource.com>
Date: Fri, 14 Jul 2023 12:16:48 +0200
Subject: [PATCH] Rename 'vulnerability-report' to
 'sonarqube-vulnerability-report'

---
 .../GitLabCITutorial-it.tsx.snap              | 24 +++++++++----------
 .../gitlabci/commands/PipeCommand.tsx         |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap
index e70bf7303d5..6d812c80298 100644
--- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/GitLabCITutorial-it.tsx.snap
@@ -3,7 +3,7 @@
 exports[`should follow and complete all steps: .NET: gitlab-ci.yml 1`] = `
 "stages:
     - sonarqube-check
-    - vulnerability-report
+    - sonarqube-vulnerability-report
 
 sonarqube-check:
   stage: sonarqube-check
@@ -30,8 +30,8 @@ sonarqube-check:
     - main
     - develop
 
-vulnerability-report:
-  stage: vulnerability-report
+sonarqube-vulnerability-report:
+  stage: sonarqube-vulnerability-report
   script:
     - 'curl -u "\${SONAR_TOKEN}:" "\${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=my-project&branch=\${CI_COMMIT_BRANCH}&pullRequest=\${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
@@ -52,7 +52,7 @@ vulnerability-report:
 exports[`should follow and complete all steps: Gradle: gitlab-ci.yml 1`] = `
 "stages:
     - sonarqube-check
-    - vulnerability-report
+    - sonarqube-vulnerability-report
 
 sonarqube-check:
   stage: sonarqube-check
@@ -72,8 +72,8 @@ sonarqube-check:
     - main
     - develop
 
-vulnerability-report:
-  stage: vulnerability-report
+sonarqube-vulnerability-report:
+  stage: sonarqube-vulnerability-report
   script:
     - 'curl -u "\${SONAR_TOKEN}:" "\${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=my-project&branch=\${CI_COMMIT_BRANCH}&pullRequest=\${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
@@ -122,7 +122,7 @@ sonar {
 exports[`should follow and complete all steps: Maven: gitlab-ci.yml 1`] = `
 "stages:
     - sonarqube-check
-    - vulnerability-report
+    - sonarqube-vulnerability-report
 
 sonarqube-check:
   stage: sonarqube-check
@@ -143,8 +143,8 @@ sonarqube-check:
     - main
     - develop
 
-vulnerability-report:
-  stage: vulnerability-report
+sonarqube-vulnerability-report:
+  stage: sonarqube-vulnerability-report
   script:
     - 'curl -u "\${SONAR_TOKEN}:" "\${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=my-project&branch=\${CI_COMMIT_BRANCH}&pullRequest=\${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
@@ -173,7 +173,7 @@ exports[`should follow and complete all steps: Maven: pom.xml 1`] = `
 exports[`should follow and complete all steps: Other: gitlab-ci.yml 1`] = `
 "stages:
     - sonarqube-check
-    - vulnerability-report
+    - sonarqube-vulnerability-report
 
 sonarqube-check:
   stage: sonarqube-check
@@ -196,8 +196,8 @@ sonarqube-check:
     - main
     - develop
 
-vulnerability-report:
-  stage: vulnerability-report
+sonarqube-vulnerability-report:
+  stage: sonarqube-vulnerability-report
   script:
     - 'curl -u "\${SONAR_TOKEN}:" "\${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=my-project&branch=\${CI_COMMIT_BRANCH}&pullRequest=\${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
index b47321d779b..542818a2f35 100644
--- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
@@ -64,7 +64,7 @@ export default function PipeCommand(props: PipeCommandProps) {
 
   const command = `stages:
     - sonarqube-check
-    - vulnerability-report
+    - sonarqube-vulnerability-report
 
 sonarqube-check:
   stage: sonarqube-check
@@ -84,8 +84,8 @@ sonarqube-check:
     - main
     - develop
 
-vulnerability-report:
-  stage: vulnerability-report
+sonarqube-vulnerability-report:
+  stage: sonarqube-vulnerability-report
   script:
     - 'curl -u "\${SONAR_TOKEN}:" "\${SONAR_HOST_URL}/api/issues/gitlab_sast_export?projectKey=${projectKey}&branch=\${CI_COMMIT_BRANCH}&pullRequest=\${CI_MERGE_REQUEST_IID}" -o gl-sast-sonar-report.json'
   allow_failure: true
-- 
2.39.5