Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 11 insertions, 60 deletions

diff --git a/app/controllers/clusters/base_controller.rb b/app/controllers/clusters/base_controller.rb
index f88d381b3bf..2401d8b1044 100644
--- a/app/controllers/clusters/base_controller.rb
+++ b/app/controllers/clusters/base_controller.rb
@@ -9,6 +9,10 @@ class Clusters::BaseController < ApplicationController
   helper_method :clusterable
 
   feature_category :kubernetes_management
+  urgency :low, [
+    :index, :show, :environments, :cluster_status, :prometheus_proxy,
+    :destroy, :new_cluster_docs, :connect, :new, :create_user
+  ]
 
   private
 
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb
index 939c0ef220c..ae3b6125bde 100644
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@@ -6,12 +6,9 @@ class Clusters::ClustersController < Clusters::BaseController
   include MetricsDashboard
 
   before_action :cluster, only: [:cluster_status, :show, :update, :destroy, :clear_cache]
-  before_action :generate_gcp_authorize_url, only: [:new]
-  before_action :validate_gcp_token, only: [:new]
-  before_action :gcp_cluster, only: [:new]
-  before_action :user_cluster, only: [:new, :connect]
+  before_action :user_cluster, only: [:connect]
   before_action :authorize_read_cluster!, only: [:show, :index]
-  before_action :authorize_create_cluster!, only: [:new, :connect, :authorize_aws_role]
+  before_action :authorize_create_cluster!, only: [:connect, :authorize_aws_role]
   before_action :authorize_update_cluster!, only: [:update]
   before_action :update_applications_status, only: [:cluster_status]
   before_action :ensure_feature_enabled!, except: [:index, :new_cluster_docs]
@@ -46,16 +43,6 @@ class Clusters::ClustersController < Clusters::BaseController
     end
   end
 
-  def new
-    if params[:provider] == 'aws'
-      @aws_role = Aws::Role.create_or_find_by!(user: current_user)
-      @instance_types = load_instance_types.to_json
-
-    elsif params[:provider] == 'gcp'
-      redirect_to @authorize_url if @authorize_url && !@valid_gcp_token
-    end
-  end
-
   # Overridding ActionController::Metal#status is NOT a good idea
   def cluster_status
     respond_to do |format|
@@ -108,24 +95,6 @@ class Clusters::ClustersController < Clusters::BaseController
     redirect_to clusterable.index_path, status: :found
   end
 
-  def create_gcp
-    @gcp_cluster = ::Clusters::CreateService
-      .new(current_user, create_gcp_cluster_params)
-      .execute(access_token: token_in_session)
-      .present(current_user: current_user)
-
-    if @gcp_cluster.persisted?
-      redirect_to @gcp_cluster.show_path
-    else
-      generate_gcp_authorize_url
-      validate_gcp_token
-      user_cluster
-      params[:provider] = 'gcp'
-
-      render :new, locals: { active_tab: 'create' }
-    end
-  end
-
   def create_aws
     @aws_cluster = ::Clusters::CreateService
       .new(current_user, create_aws_cluster_params)
@@ -173,16 +142,12 @@ class Clusters::ClustersController < Clusters::BaseController
 
   private
 
-  def certificate_based_clusters_enabled?
-    Feature.enabled?(:certificate_based_clusters, clusterable, default_enabled: :yaml, type: :ops)
-  end
-
   def ensure_feature_enabled!
-    render_404 unless certificate_based_clusters_enabled?
+    render_404 unless clusterable.certificate_based_clusters_enabled?
   end
 
   def cluster_list
-    return [] unless certificate_based_clusters_enabled?
+    return [] unless clusterable.certificate_based_clusters_enabled?
 
     finder = ClusterAncestorsFinder.new(clusterable.__subject__, current_user)
     clusters = finder.execute
@@ -239,24 +204,6 @@ class Clusters::ClustersController < Clusters::BaseController
     end
   end
 
-  def create_gcp_cluster_params
-    params.require(:cluster).permit(
-      *base_permitted_cluster_params,
-      :name,
-      provider_gcp_attributes: [
-        :gcp_project_id,
-        :zone,
-        :num_nodes,
-        :machine_type,
-        :cloud_run,
-        :legacy_abac
-      ]).merge(
-        provider_type: :gcp,
-        platform_type: :kubernetes,
-        clusterable: clusterable.__subject__
-      )
-  end
-
   def create_aws_cluster_params
     params.require(:cluster).permit(
       *base_permitted_cluster_params,
@@ -300,10 +247,10 @@ class Clusters::ClustersController < Clusters::BaseController
   end
 
   def generate_gcp_authorize_url
-    new_path = clusterable.new_path(provider: :gcp).to_s
-    error_path = @project ? project_clusters_path(@project) : new_path
+    connect_path = clusterable.connect_path().to_s
+    error_path = @project ? project_clusters_path(@project) : connect_path
 
-    state = generate_session_key_redirect(new_path, error_path)
+    state = generate_session_key_redirect(connect_path, error_path)
 
     @authorize_url = GoogleApi::CloudPlatform::Client.new(
       nil, callback_google_api_auth_url,