From 5b3c096c9e0c9e8e7e1cb35c1b9e347995b948f5 Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Mon, 15 Oct 2018 16:37:51 +1300
Subject: 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/
---
 .../clusters/applications_controller.rb            | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 app/controllers/clusters/applications_controller.rb

(limited to 'app/controllers/clusters/applications_controller.rb')

diff --git a/app/controllers/clusters/applications_controller.rb b/app/controllers/clusters/applications_controller.rb
new file mode 100644
index 00000000000..a5ac5fe3f8e
--- /dev/null
+++ b/app/controllers/clusters/applications_controller.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Clusters::ApplicationsController < Clusters::BaseController
+  before_action :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
-- 
cgit v1.2.1


From 88800abcd8741b07114c2850e00b74fbecfbf90e Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Fri, 19 Oct 2018 14:42:30 +1300
Subject: Abstract out project out of ClustersController

To the extent possible swap out `project` with `clusterable`

- Abstract paths for showing cluster or clusters. This will allow us to
swap in alternative paths for group level cluster

- Push :project_id and :namespace_id params from the URL to the POST
body.

- Create a nice helper for to generate links for the destroy
action

For some reason, spec :project_id and :namespace_id param are not going
through `to_param` for a JSON format. Manually call `to_param` to fix
specs.

- Move :layout to BaseController
---
 app/controllers/clusters/applications_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/clusters/applications_controller.rb')

diff --git a/app/controllers/clusters/applications_controller.rb b/app/controllers/clusters/applications_controller.rb
index a5ac5fe3f8e..250f42f3096 100644
--- a/app/controllers/clusters/applications_controller.rb
+++ b/app/controllers/clusters/applications_controller.rb
@@ -19,7 +19,7 @@ class Clusters::ApplicationsController < Clusters::BaseController
   private
 
   def cluster
-    @cluster ||= project.clusters.find(params[:id]) || render_404
+    @cluster ||= clusterable.clusters.find(params[:id]) || render_404
   end
 
   def create_cluster_application_params
-- 
cgit v1.2.1