summaryrefslogtreecommitdiff
path: root/app/controllers/projects/clusters
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-10-15 16:37:51 +1300
committerThong Kuah <tkuah@gitlab.com>2018-11-01 18:38:36 +1300
commit5b3c096c9e0c9e8e7e1cb35c1b9e347995b948f5 (patch)
treef0e4934cd4bbf59d670ff8911e64d94602907259 /app/controllers/projects/clusters
parent5a953741820b78492333e1543062a5c222694d8c (diff)
downloadgitlab-ce-5b3c096c9e0c9e8e7e1cb35c1b9e347995b948f5.tar.gz
Convert clusters to use a top-level controller
In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
Diffstat (limited to 'app/controllers/projects/clusters')
-rw-r--r--app/controllers/projects/clusters/applications_controller.rb29
1 files changed, 0 insertions, 29 deletions
diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
deleted file mode 100644
index bcea96bce94..00000000000
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class Projects::Clusters::ApplicationsController < Projects::ApplicationController
- before_action :cluster
- before_action :authorize_read_cluster!
- before_action :authorize_create_cluster!, only: [:create]
-
- def create
- Clusters::Applications::CreateService
- .new(@cluster, current_user, create_cluster_application_params)
- .execute(request)
-
- head :no_content
- rescue Clusters::Applications::CreateService::InvalidApplicationError
- render_404
- rescue StandardError
- head :bad_request
- end
-
- private
-
- def cluster
- @cluster ||= project.clusters.find(params[:id]) || render_404
- end
-
- def create_cluster_application_params
- params.permit(:application, :hostname)
- end
-end