Merge branch '11759-move-dependencies-controller' into 'master'

Move DependenciesController to Security namespace

See merge request gitlab-org/gitlab-ee!13897

ee/app/controllers/projects/dependencies_controller.rb

-# frozen_string_literal: true
-
-module Projects
-  class DependenciesController < Projects::ApplicationController
-    SORT_BY_PERMITTED_VALUES = %w(name type).freeze
-    SORT_PERMITTED_VALUES = %w(asc desc).freeze
-
-    before_action :ensure_bill_of_materials_feature_flag_enabled
-
-    def index
-      respond_to do |format|
-        format.json do
-          render json: paginated_dependecies
-        end
-      end
-    end
-
-    private
-
-    def ensure_bill_of_materials_feature_flag_enabled
-      render_404 unless Feature.enabled?(:bill_of_materials, default_enabled: false)
-    end
-
-    def found_dependencies
-      ::Security::DependenciesFinder.new(project: @project, params: query_params).execute
-    end
-
-    def query_params
-      params.permit(:sort, :sort_by).delete_if do |key, value|
-        key == :sort_by && !value.in?(::Security::DependenciesFinder::SORT_BY_VALUES) ||
-          key == :sort && !value.in?(::Security::DependenciesFinder::SORT_VALUES)
-      end
-    end
-
-    # TODO: add proper implementation of edge cases handling
-    # format: { report: 'failed' }
-    # after we'll have more then just mock data
-    # reference: https://gitlab.com/gitlab-org/gitlab-ee/issues/10075#note_164915787
-    def paginated_dependecies
-      Kaminari.paginate_array(found_dependencies).page(params[:page])
-    end
-  end
-end

ee/app/controllers/projects/security/dependencies_controller.rb

+# frozen_string_literal: true
+
+module Projects
+  module Security
+    class DependenciesController < Projects::ApplicationController
+      SORT_BY_PERMITTED_VALUES = %w(name type).freeze
+      SORT_PERMITTED_VALUES    = %w(asc desc).freeze
+
+      before_action :ensure_bill_of_materials_feature_flag_enabled
+
+      def index
+        respond_to do |format|
+          format.json do
+            render json: paginated_dependecies
+          end
+        end
+      end
+
+      private
+
+      def ensure_bill_of_materials_feature_flag_enabled
+        render_404 unless Feature.enabled?(:bill_of_materials, default_enabled: false)
+      end
+
+      def found_dependencies
+        ::Security::DependenciesFinder.new(project: @project, params: query_params).execute
+      end
+
+      def query_params
+        params.permit(:sort, :sort_by).delete_if do |key, value|
+          key == :sort_by && !value.in?(::Security::DependenciesFinder::SORT_BY_VALUES) ||
+            key == :sort && !value.in?(::Security::DependenciesFinder::SORT_VALUES)
+        end
+      end
+
+      # TODO: add proper implementation of edge cases handling
+      # format: { report: 'failed' }
+      # after we'll have more then just mock data
+      # reference: https://gitlab.com/gitlab-org/gitlab-ee/issues/10075#note_164915787
+      def paginated_dependecies
+        Kaminari.paginate_array(found_dependencies).page(params[:page])
+      end
+    end
+  end
+end

ee/changelogs/unreleased/11759-move-dependencies-controller.yml

+---
+title: Move dependencies API endpoint to "security" namespace
+merge_request: 13897
+author:
+type: changed

ee/config/routes/project.rb

@@ -83,7 +83,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :dependencies, only: [:index]
+      namespace :security do
+        resources :dependencies, only: [:index]
+      end
     end
   end
 end

ee/spec/controllers/projects/dependencies_controller_spec.rb → ee/spec/controllers/projects/security/dependencies_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DependenciesController do
+describe Projects::Security::DependenciesController do
   describe 'GET index.json' do
     set(:project) { create(:project, :repository, :public) }
     set(:user) { create(:user) }