Add latest changes from gitlab-org/gitlab@master

4 files changed, 116 insertions, 29 deletions

diff --git a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
index c8930bc6263..53ba9792bd0 100644
--- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
@@ -4,6 +4,12 @@
 # List of the variables: https://gitlab.com/gitlab-org/security-products/dependency-scanning#settings
 # How to set: https://docs.gitlab.com/ee/ci/yaml/#variables
 
+variables:
+  DS_ANALYZER_IMAGE_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
+  DS_DEFAULT_ANALYZERS: "gemnasium, retire.js, gemnasium-python, gemnasium-maven, bundler-audit"
+  DS_MAJOR_VERSION: 2
+  DS_DISABLE_DIND: "false"
+
 dependency_scanning:
   stage: test
   image: docker:stable
@@ -61,3 +67,63 @@ dependency_scanning:
   except:
     variables:
       - $DEPENDENCY_SCANNING_DISABLED
+      - $DS_DISABLE_DIND == 'true'
+
+.analyzer:
+  extends: dependency_scanning
+  services: []
+  except:
+    variables:
+      - $DS_DISABLE_DIND == 'false'
+  script:
+    - /analyzer run
+
+gemnasium-dependency_scanning:
+  extends: .analyzer
+  image:
+    name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium:$DS_MAJOR_VERSION"
+  only:
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
+        $DS_DEFAULT_ANALYZERS =~ /gemnasium/ &&
+        $CI_PROJECT_REPOSITORY_LANGUAGES =~ /ruby|javascript|php/
+
+gemnasium-maven-dependency_scanning:
+  extends: .analyzer
+  image:
+    name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium-maven:$DS_MAJOR_VERSION"
+  only:
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
+        $DS_DEFAULT_ANALYZERS =~ /gemnasium-maven/ &&
+        $CI_PROJECT_REPOSITORY_LANGUAGES =~ /\bjava\b/
+
+gemnasium-python-dependency_scanning:
+  extends: .analyzer
+  image:
+    name: "$DS_ANALYZER_IMAGE_PREFIX/gemnasium-python:$DS_MAJOR_VERSION"
+  only:
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
+        $DS_DEFAULT_ANALYZERS =~ /gemnasium-python/ &&
+        $CI_PROJECT_REPOSITORY_LANGUAGES =~ /python/
+
+bundler-audit-dependency_scanning:
+  extends: .analyzer
+  image:
+    name: "$DS_ANALYZER_IMAGE_PREFIX/bundler-audit:$DS_MAJOR_VERSION"
+  only:
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
+        $DS_DEFAULT_ANALYZERS =~ /bundler-audit/ &&
+        $CI_PROJECT_REPOSITORY_LANGUAGES =~ /ruby/
+
+retire-js-dependency_scanning:
+  extends: .analyzer
+  image:
+    name: "$DS_ANALYZER_IMAGE_PREFIX/retire.js:$DS_MAJOR_VERSION"
+  only:
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/ &&
+        $DS_DEFAULT_ANALYZERS =~ /retire.js/ &&
+        $CI_PROJECT_REPOSITORY_LANGUAGES =~ /javascript/
diff --git a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
index dfef158cc1d..4677e984305 100644
--- a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
+++ b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
@@ -176,19 +176,11 @@ module Gitlab
           end
 
           def prometheus_enabled?
-            Gitlab.config.prometheus.enable if Gitlab.config.prometheus
-          rescue Settingslogic::MissingSetting
-            log_error('prometheus.enable is not present in config/gitlab.yml')
-
-            false
+            ::Gitlab::Prometheus::Internal.prometheus_enabled?
           end
 
           def prometheus_listen_address
-            Gitlab.config.prometheus.listen_address.to_s if Gitlab.config.prometheus
-          rescue Settingslogic::MissingSetting
-            log_error('Prometheus listen_address is not present in config/gitlab.yml')
-
-            nil
+            ::Gitlab::Prometheus::Internal.listen_address
           end
 
           def instance_admins
@@ -231,23 +223,7 @@ module Gitlab
           end
 
           def internal_prometheus_listen_address_uri
-            if prometheus_listen_address.starts_with?('0.0.0.0:')
-              # 0.0.0.0:9090
-              port = ':' + prometheus_listen_address.split(':').second
-              'http://localhost' + port
-
-            elsif prometheus_listen_address.starts_with?(':')
-              # :9090
-              'http://localhost' + prometheus_listen_address
-
-            elsif prometheus_listen_address.starts_with?('http')
-              # https://localhost:9090
-              prometheus_listen_address
-
-            else
-              # localhost:9090
-              'http://' + prometheus_listen_address
-            end
+            ::Gitlab::Prometheus::Internal.uri
           end
 
           def prometheus_service_attributes
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb
index 3d14a8dde8d..efddda0ec65 100644
--- a/lib/gitlab/etag_caching/router.rb
+++ b/lib/gitlab/etag_caching/router.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module EtagCaching
     class Router
-      prepend_if_ee('EE::Gitlab::EtagCaching::Router') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       Route = Struct.new(:regexp, :name)
       # We enable an ETag for every request matching the regex.
       # To match a regex the path needs to match the following:
@@ -80,3 +78,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::EtagCaching::Router.prepend_if_ee('EE::Gitlab::EtagCaching::Router')
diff --git a/lib/gitlab/prometheus/internal.rb b/lib/gitlab/prometheus/internal.rb
new file mode 100644
index 00000000000..d59352119ba
--- /dev/null
+++ b/lib/gitlab/prometheus/internal.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Prometheus
+    class Internal
+      def self.uri
+        return if listen_address.blank?
+
+        if listen_address.starts_with?('0.0.0.0:')
+          # 0.0.0.0:9090
+          port = ':' + listen_address.split(':').second
+          'http://localhost' + port
+
+        elsif listen_address.starts_with?(':')
+          # :9090
+          'http://localhost' + listen_address
+
+        elsif listen_address.starts_with?('http')
+          # https://localhost:9090
+          listen_address
+
+        else
+          # localhost:9090
+          'http://' + listen_address
+        end
+      end
+
+      def self.listen_address
+        Gitlab.config.prometheus.listen_address.to_s if Gitlab.config.prometheus
+      rescue Settingslogic::MissingSetting
+        Gitlab::AppLogger.error('Prometheus listen_address is not present in config/gitlab.yml')
+
+        nil
+      end
+
+      def self.prometheus_enabled?
+        Gitlab.config.prometheus.enable if Gitlab.config.prometheus
+      rescue Settingslogic::MissingSetting
+        Gitlab::AppLogger.error('prometheus.enable is not present in config/gitlab.yml')
+
+        false
+      end
+    end
+  end
+end