Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 32 deletions

diff --git a/lib/gitlab/metrics/dashboard/service_selector.rb b/lib/gitlab/metrics/dashboard/service_selector.rb
index 5b6f25420e0..5a3007e4814 100644
--- a/lib/gitlab/metrics/dashboard/service_selector.rb
+++ b/lib/gitlab/metrics/dashboard/service_selector.rb
@@ -8,50 +8,39 @@ module Gitlab
   module Metrics
     module Dashboard
       class ServiceSelector
-        SERVICES = ::Metrics::Dashboard
-
         class << self
           include Gitlab::Utils::StrongMemoize
 
+          SERVICES = [
+            ::Metrics::Dashboard::CustomMetricEmbedService,
+            ::Metrics::Dashboard::GrafanaMetricEmbedService,
+            ::Metrics::Dashboard::DynamicEmbedService,
+            ::Metrics::Dashboard::DefaultEmbedService,
+            ::Metrics::Dashboard::SystemDashboardService,
+            ::Metrics::Dashboard::PodDashboardService,
+            ::Metrics::Dashboard::ProjectDashboardService
+          ].freeze
+
           # Returns a class which inherits from the BaseService
-          # class that can be used to obtain a dashboard.
+          # class that can be used to obtain a dashboard for
+          # the provided params.
           # @return [Gitlab::Metrics::Dashboard::Services::BaseService]
           def call(params)
-            return SERVICES::CustomMetricEmbedService if custom_metric_embed?(params)
-            return SERVICES::GrafanaMetricEmbedService if grafana_metric_embed?(params)
-            return SERVICES::DynamicEmbedService if dynamic_embed?(params)
-            return SERVICES::DefaultEmbedService if params[:embedded]
-            return SERVICES::SystemDashboardService if system_dashboard?(params[:dashboard_path])
-            return SERVICES::PodDashboardService if pod_dashboard?(params[:dashboard_path])
-            return SERVICES::ProjectDashboardService if params[:dashboard_path]
-
-            default_service
-          end
+            service = services.find do |service_class|
+              service_class.valid_params?(params)
+            end
 
-          private
-
-          def default_service
-            SERVICES::SystemDashboardService
+            service || default_service
           end
 
-          def system_dashboard?(filepath)
-            SERVICES::SystemDashboardService.matching_dashboard?(filepath)
-          end
-
-          def pod_dashboard?(filepath)
-            SERVICES::PodDashboardService.matching_dashboard?(filepath)
-          end
-
-          def custom_metric_embed?(params)
-            SERVICES::CustomMetricEmbedService.valid_params?(params)
-          end
+          private
 
-          def grafana_metric_embed?(params)
-            SERVICES::GrafanaMetricEmbedService.valid_params?(params)
+          def services
+            SERVICES
           end
 
-          def dynamic_embed?(params)
-            SERVICES::DynamicEmbedService.valid_params?(params)
+          def default_service
+            ::Metrics::Dashboard::SystemDashboardService
           end
         end
       end