Merge branch 'add-conan-lock-file-to-gemnasium-job' into 'master'

Add Dependency Scanning support for Conan lock files

See merge request gitlab-org/gitlab!39811

changelogs/unreleased/add-conan-lock-file-to-gemnasium-job.yml

+---
+title: Add Conan lock file support to Dependency Scanning
+merge_request: 39811
+author:
+type: added

ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb

@@ -68,6 +68,7 @@ RSpec.describe 'Dependency-Scanning.gitlab-ci.yml' do
             'Javascript npm-shrinkwrap.json' | { 'npm-shrinkwrap.json' => '' }           | %w(gemnasium-dependency_scanning)
             'Multiple languages'             | { 'pom.xml' => '', 'package.json' => '' } | %w(gemnasium-maven-dependency_scanning retire-js-dependency_scanning)
             'NuGet'                          | { 'packages.lock.json' => '' }            | %w(gemnasium-dependency_scanning)
+            'Conan'                          | { 'conan.lock' => '' }                    | %w(gemnasium-dependency_scanning)
             'PHP'                            | { 'composer.lock' => '' }                 | %w(gemnasium-dependency_scanning)
             'Python requirements.txt'        | { 'requirements.txt' => '' }              | %w(gemnasium-python-dependency_scanning)
             'Python requirements.pip'        | { 'requirements.pip' => '' }              | %w(gemnasium-python-dependency_scanning)

lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml

@@ -114,6 +114,7 @@ gemnasium-dependency_scanning:
         - '{package-lock.json,*/package-lock.json,*/*/package-lock.json}'
         - '{yarn.lock,*/yarn.lock,*/*/yarn.lock}'
         - '{packages.lock.json,*/packages.lock.json,*/*/packages.lock.json}'
+        - '{conan.lock,*/conan.lock,*/*/conan.lock}'
 
 gemnasium-maven-dependency_scanning:
   extends: .ds-analyzer