Merge branch 'ashmckenzie/fix-scanner-findings-error' into 'main'

Fix scanner findings error

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/948



Merged-by: Patrick Bajao <ebajao@gitlab.com>
Approved-by: Patrick Bajao <ebajao@gitlab.com>
Approved-by: Ahmed Hemdan <ahemdan@gitlab.com>
Reviewed-by: Ahmed Hemdan <ahemdan@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

.gitignore

@@ -12,15 +12,16 @@
 /bin/gitlab-shell-authorized-keys-check
 /bin/gitlab-shell-authorized-principals-check
 /bin/gitlab-sshd
+/gl-code-quality-report.json
 /go_build
+/support/bin/golangci-*
+/support/bin/gotestsum-*
 authorized_keys.lock
 config.yml
 cover.out
 cover.xml
 custom_hooks
 hooks/*.d
-/support/bin/golangci-*
-/support/bin/gotestsum-*
 tags
 tmp/*
 vendor

.gitlab-ci.yml

@@ -243,7 +243,10 @@ lint:
     # Write the code coverage report to gl-code-quality-report.json
     # and print linting issues to stdout in the format: path/to/file:line description
     # remove `--issues-exit-code 0` or set to non-zero to fail the job if linting issues are detected
-    - make lint GOLANGCI_LINT_ARGS="--out-format code-climate:gl-code-quality-report.json,line-number"
+    - apt update && apt install -y jq
+    - make lint GOLANGCI_LINT_ARGS="--out-format code-climate:gl-code-quality-report-temp.json,line-number"
+    - cat gl-code-quality-report-temp.json | jq '[ .[] | select(.severity == "warning").severity |= "minor" ]' > gl-code-quality-report.json
+    - rm -f gl-code-quality-report-temp.json
   artifacts:
     reports:
       codequality: gl-code-quality-report.json