summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDennis Tang <dtang@gitlab.com>2018-05-26 01:37:39 +0200
committerDennis Tang <dtang@gitlab.com>2018-05-26 10:02:44 +0200
commit319ebaefbec6c07053df2d4dd12a528937e5e638 (patch)
treeccebb4cdf4d63986fb3d15dae74cb2d0e08624e9 /app/controllers
parent70c65e827b7974529409e5f9af5c1d094c08ed19 (diff)
downloadgitlab-ce-319ebaefbec6c07053df2d4dd12a528937e5e638.tar.gz
update view name for gke dropdown check
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/clusters_controller.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index 74e1a78360d..03a1fe5aaec 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -2,6 +2,7 @@ class Projects::ClustersController < Projects::ApplicationController
before_action :cluster, except: [:index, :new, :create]
before_action :authorize_read_cluster!
before_action :generate_gcp_authorize_url, only: [:new]
+ before_action :validate_gcp_token, only: [:new]
before_action :new_cluster, only: [:new]
before_action :existing_cluster, only: [:new]
before_action :authorize_create_cluster!, only: [:new]
@@ -83,6 +84,7 @@ class Projects::ClustersController < Projects::ApplicationController
redirect_to project_cluster_path(project, @cluster)
else
generate_gcp_authorize_url
+ validate_gcp_token
case params[:type]
when 'new'
@@ -171,10 +173,8 @@ class Projects::ClustersController < Projects::ApplicationController
end
def new_cluster
- if valid_gcp_token
- @new_cluster = ::Clusters::Cluster.new.tap do |cluster|
- cluster.build_provider_gcp
- end
+ @new_cluster = ::Clusters::Cluster.new.tap do |cluster|
+ cluster.build_provider_gcp
end
end
@@ -184,7 +184,7 @@ class Projects::ClustersController < Projects::ApplicationController
end
end
- def valid_gcp_token
+ def validate_gcp_token
@valid_gcp_token = GoogleApi::CloudPlatform::Client.new(token_in_session, nil)
.validate_token(expires_at_in_session)
end