From 45b3bcc39631729ce573210ef6201c2cc59d7cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 16 Mar 2018 17:50:48 +0100 Subject: Add zones_list and machine_types_list to Google Cloud API client --- lib/google_api/cloud_platform/client.rb | 19 ++++++++++++++++++ spec/lib/google_api/cloud_platform/client_spec.rb | 24 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index f30dd995695..f7a00974efc 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -1,3 +1,4 @@ +require 'google/apis/compute_v1' require 'google/apis/container_v1' require 'google/apis/cloudbilling_v1' require 'google/apis/cloudresourcemanager_v1' @@ -58,6 +59,24 @@ module GoogleApi service.get_project_billing_info("projects/#{project_id}", options: user_agent_header) end + def projects_zones_list(project_id) + service = Google::Apis::ComputeV1::ComputeService.new + service.authorization = access_token + + service.fetch_all do |token| + service.list_zones(project_id, page_token: token, options: user_agent_header) + end + end + + def projects_zones_machine_types_list(project_id, zone) + service = Google::Apis::ComputeV1::ComputeService.new + service.authorization = access_token + + service.fetch_all do |token| + service.list_machine_types(project_id, zone, page_token: token, options: user_agent_header) + end + end + def projects_zones_clusters_get(project_id, zone, cluster_id) service = Google::Apis::ContainerV1::ContainerService.new service.authorization = access_token diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb index db9d9158b29..040cbda9468 100644 --- a/spec/lib/google_api/cloud_platform/client_spec.rb +++ b/spec/lib/google_api/cloud_platform/client_spec.rb @@ -74,6 +74,30 @@ describe GoogleApi::CloudPlatform::Client do it { is_expected.to eq(billing_info) } end + describe '#projects_zones_list' do + subject { client.projects_zones_list('project') } + let(:zones) { double } + + before do + allow_any_instance_of(Google::Apis::ComputeV1::ComputeService) + .to receive(:fetch_all).and_return(zones) + end + + it { is_expected.to eq(zones) } + end + + describe '#projects_zones_machine_types_list' do + subject { client.projects_zones_machine_types_list('project', 'zone') } + let(:machine_types) { double } + + before do + allow_any_instance_of(Google::Apis::ComputeV1::ComputeService) + .to receive(:fetch_all).and_return(machine_types) + end + + it { is_expected.to eq(machine_types) } + end + describe '#projects_zones_clusters_get' do subject { client.projects_zones_clusters_get(spy, spy, spy) } let(:gke_cluster) { double } -- cgit v1.2.1 From e911a0f896c3699c69b27509b1b38d173f96c81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 16 Mar 2018 18:41:51 +0100 Subject: Expose CloudPlatform::Client#projects_list as GcpController#list_projects --- .../projects/clusters/gcp_controller.rb | 9 ++++++- config/routes/project.rb | 1 + .../projects/clusters/gcp_controller_spec.rb | 30 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 6b0b22f8e73..7dfe819525f 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -1,6 +1,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController before_action :authorize_read_cluster! - before_action :authorize_google_api, except: [:login] + before_action :authorize_google_api, except: [:login, :list_projects] before_action :authorize_google_project_billing, only: [:new, :create] before_action :authorize_create_cluster!, only: [:new, :create] before_action :verify_billing, only: [:create] @@ -35,6 +35,13 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end end + def list_projects + projects = GoogleApi::CloudPlatform::Client.new(token_in_session, nil).projects_list + respond_to do |format| + format.json { render status: :ok, json: { projects: projects } } + end + end + private def verify_billing diff --git a/config/routes/project.rb b/config/routes/project.rb index c803737d40b..4cd11fe76e8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -200,6 +200,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get '/gcp/new', to: 'clusters/gcp#new' get '/gcp/login', to: 'clusters/gcp#login' + get '/gcp/list_projects', to: 'clusters/gcp#list_projects' post '/gcp', to: 'clusters/gcp#create' end end diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index e14ba29fa70..98158e081f8 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -199,4 +199,34 @@ describe Projects::Clusters::GcpController do post :create, params.merge(namespace_id: project.namespace, project_id: project) end end + + describe 'GET list_projects' do + describe 'functionality' do + let(:user) { create(:user) } + let(:api_response) { [project_id: 'test-project-1234'] } + + before do + project.add_master(user) + sign_in(user) + + allow_any_instance_of(GoogleApi::CloudPlatform::Client).to receive(:projects_list).and_return(api_response) + end + + it 'calls the Google Cloud Platform projects_list' do + expect_any_instance_of(GoogleApi::CloudPlatform::Client).to receive(:projects_list) + + go + end + + it 'renders the response as json' do + go + + expect(response.body).to eq({ projects: api_response }.to_json) + end + end + + def go + get :list_projects, namespace_id: project.namespace, project_id: project, format: :json + end + end end -- cgit v1.2.1 From cffc8899b75b018c0b2b619e25450c8e81507035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 20 Apr 2018 16:33:20 +0200 Subject: Rename CheckGcpProjectBillingService to ListGcpProjectsService --- app/services/check_gcp_project_billing_service.rb | 11 -------- app/services/list_gcp_projects_service.rb | 12 ++++++++ app/workers/check_gcp_project_billing_worker.rb | 2 +- .../check_gcp_project_billing_service_spec.rb | 32 ---------------------- spec/services/list_gcp_projects_service_spec.rb | 32 ++++++++++++++++++++++ .../check_gcp_project_billing_worker_spec.rb | 14 +++++----- 6 files changed, 52 insertions(+), 51 deletions(-) delete mode 100644 app/services/check_gcp_project_billing_service.rb create mode 100644 app/services/list_gcp_projects_service.rb delete mode 100644 spec/services/check_gcp_project_billing_service_spec.rb create mode 100644 spec/services/list_gcp_projects_service_spec.rb diff --git a/app/services/check_gcp_project_billing_service.rb b/app/services/check_gcp_project_billing_service.rb deleted file mode 100644 index ea82b61b279..00000000000 --- a/app/services/check_gcp_project_billing_service.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CheckGcpProjectBillingService - def execute(token) - client = GoogleApi::CloudPlatform::Client.new(token, nil) - client.projects_list.select do |project| - begin - client.projects_get_billing_info(project.project_id).billing_enabled - rescue - end - end - end -end diff --git a/app/services/list_gcp_projects_service.rb b/app/services/list_gcp_projects_service.rb new file mode 100644 index 00000000000..7f7b35fd48a --- /dev/null +++ b/app/services/list_gcp_projects_service.rb @@ -0,0 +1,12 @@ +class ListGcpProjectsService + def execute(token) + client = GoogleApi::CloudPlatform::Client.new(token, nil) + # Lists only projects with billing enabled + client.projects_list.select do |project| + begin + client.projects_get_billing_info(project.project_id).billing_enabled + rescue + end + end + end +end diff --git a/app/workers/check_gcp_project_billing_worker.rb b/app/workers/check_gcp_project_billing_worker.rb index 363f81590ab..dd35b2de50d 100644 --- a/app/workers/check_gcp_project_billing_worker.rb +++ b/app/workers/check_gcp_project_billing_worker.rb @@ -37,7 +37,7 @@ class CheckGcpProjectBillingWorker return unless token return unless try_obtain_lease_for(token) - billing_enabled_state = !CheckGcpProjectBillingService.new.execute(token).empty? + billing_enabled_state = !ListGcpProjectsService.new.execute(token).empty? update_billing_change_counter(self.class.get_billing_state(token), billing_enabled_state) self.class.set_billing_state(token, billing_enabled_state) end diff --git a/spec/services/check_gcp_project_billing_service_spec.rb b/spec/services/check_gcp_project_billing_service_spec.rb deleted file mode 100644 index 3e68d906e71..00000000000 --- a/spec/services/check_gcp_project_billing_service_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper' - -describe CheckGcpProjectBillingService do - include GoogleApi::CloudPlatformHelpers - - let(:service) { described_class.new } - let(:project_id) { 'test-project-1234' } - - describe '#execute' do - before do - stub_cloud_platform_projects_list(project_id: project_id) - end - - subject { service.execute('bogustoken') } - - context 'google account has a billing enabled gcp project' do - before do - stub_cloud_platform_projects_get_billing_info(project_id, true) - end - - it { is_expected.to all(satisfy { |project| project.project_id == project_id }) } - end - - context 'google account does not have a billing enabled gcp project' do - before do - stub_cloud_platform_projects_get_billing_info(project_id, false) - end - - it { is_expected.to eq([]) } - end - end -end diff --git a/spec/services/list_gcp_projects_service_spec.rb b/spec/services/list_gcp_projects_service_spec.rb new file mode 100644 index 00000000000..f1957b155e7 --- /dev/null +++ b/spec/services/list_gcp_projects_service_spec.rb @@ -0,0 +1,32 @@ +require 'spec_helper' + +describe ListGcpProjectsService do + include GoogleApi::CloudPlatformHelpers + + let(:service) { described_class.new } + let(:project_id) { 'test-project-1234' } + + describe '#execute' do + before do + stub_cloud_platform_projects_list(project_id: project_id) + end + + subject { service.execute('bogustoken') } + + context 'google account has a billing enabled gcp project' do + before do + stub_cloud_platform_projects_get_billing_info(project_id, true) + end + + it { is_expected.to all(satisfy { |project| project.project_id == project_id }) } + end + + context 'google account does not have a billing enabled gcp project' do + before do + stub_cloud_platform_projects_get_billing_info(project_id, false) + end + + it { is_expected.to eq([]) } + end + end +end diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 526ecf75921..ea929fd5b01 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -22,13 +22,13 @@ describe CheckGcpProjectBillingWorker do end it 'calls the service' do - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) subject end it 'stores billing status in redis' do - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) expect(described_class).to receive(:set_billing_state).with(token, true) subject @@ -41,7 +41,7 @@ describe CheckGcpProjectBillingWorker do end it 'does not call the service' do - expect(CheckGcpProjectBillingService).not_to receive(:new) + expect(ListGcpProjectsService).not_to receive(:new) subject end @@ -54,7 +54,7 @@ describe CheckGcpProjectBillingWorker do end it 'does not call the service' do - expect(CheckGcpProjectBillingService).not_to receive(:new) + expect(ListGcpProjectsService).not_to receive(:new) subject end @@ -77,7 +77,7 @@ describe CheckGcpProjectBillingWorker do context 'when the current state is false' do before do - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([]) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([]) end it 'increments the billing change counter' do @@ -89,7 +89,7 @@ describe CheckGcpProjectBillingWorker do context 'when the current state is true' do before do - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) end it 'increments the billing change counter' do @@ -103,7 +103,7 @@ describe CheckGcpProjectBillingWorker do context 'when previous state was true' do before do expect(described_class).to receive(:get_billing_state).and_return(true) - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) end it 'increment the billing change counter' do -- cgit v1.2.1 From 3b1612515ff291b6a97657dd53a8fed6d681d7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 20 Apr 2018 17:02:48 +0200 Subject: Rename CheckGcpProjectBillingWorker to ListGcpProjectsWorker --- .../projects/clusters/gcp_controller.rb | 6 +- app/workers/all_queues.yml | 2 +- app/workers/check_gcp_project_billing_worker.rb | 92 ---------------- app/workers/list_gcp_projects_worker.rb | 92 ++++++++++++++++ .../projects/clusters/gcp_controller_spec.rb | 2 +- .../check_gcp_project_billing_worker_spec.rb | 116 --------------------- spec/workers/list_gcp_projects_worker_spec.rb | 116 +++++++++++++++++++++ 7 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 app/workers/check_gcp_project_billing_worker.rb create mode 100644 app/workers/list_gcp_projects_worker.rb delete mode 100644 spec/workers/check_gcp_project_billing_worker_spec.rb create mode 100644 spec/workers/list_gcp_projects_worker_spec.rb diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 7dfe819525f..5409432e1ab 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -83,12 +83,12 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end def authorize_google_project_billing - redis_token_key = CheckGcpProjectBillingWorker.store_session_token(token_in_session) - CheckGcpProjectBillingWorker.perform_async(redis_token_key) + redis_token_key = ListGcpProjectsWorker.store_session_token(token_in_session) + ListGcpProjectsWorker.perform_async(redis_token_key) end def google_project_billing_status - CheckGcpProjectBillingWorker.get_billing_state(token_in_session) + ListGcpProjectsWorker.get_billing_state(token_in_session) end def token_in_session diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 9aea3bad27b..1edfaa1691a 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -24,7 +24,7 @@ - gcp_cluster:cluster_provision - gcp_cluster:cluster_wait_for_app_installation - gcp_cluster:wait_for_cluster_creation -- gcp_cluster:check_gcp_project_billing +- gcp_cluster:list_gcp_projects - gcp_cluster:cluster_wait_for_ingress_ip_address - github_import_advance_stage diff --git a/app/workers/check_gcp_project_billing_worker.rb b/app/workers/check_gcp_project_billing_worker.rb deleted file mode 100644 index dd35b2de50d..00000000000 --- a/app/workers/check_gcp_project_billing_worker.rb +++ /dev/null @@ -1,92 +0,0 @@ -require 'securerandom' - -class CheckGcpProjectBillingWorker - include ApplicationWorker - include ClusterQueue - - LEASE_TIMEOUT = 3.seconds.to_i - SESSION_KEY_TIMEOUT = 5.minutes - BILLING_TIMEOUT = 1.hour - BILLING_CHANGED_LABELS = { state_transition: nil }.freeze - - def self.get_session_token(token_key) - Gitlab::Redis::SharedState.with do |redis| - redis.get(get_redis_session_key(token_key)) - end - end - - def self.store_session_token(token) - generate_token_key.tap do |token_key| - Gitlab::Redis::SharedState.with do |redis| - redis.set(get_redis_session_key(token_key), token, ex: SESSION_KEY_TIMEOUT) - end - end - end - - def self.get_billing_state(token) - Gitlab::Redis::SharedState.with do |redis| - value = redis.get(redis_shared_state_key_for(token)) - ActiveRecord::Type::Boolean.new.type_cast_from_user(value) - end - end - - def perform(token_key) - return unless token_key - - token = self.class.get_session_token(token_key) - return unless token - return unless try_obtain_lease_for(token) - - billing_enabled_state = !ListGcpProjectsService.new.execute(token).empty? - update_billing_change_counter(self.class.get_billing_state(token), billing_enabled_state) - self.class.set_billing_state(token, billing_enabled_state) - end - - private - - def self.generate_token_key - SecureRandom.uuid - end - - def self.get_redis_session_key(token_key) - "gitlab:gcp:session:#{token_key}" - end - - def self.redis_shared_state_key_for(token) - "gitlab:gcp:#{Digest::SHA1.hexdigest(token)}:billing_enabled" - end - - def self.set_billing_state(token, value) - Gitlab::Redis::SharedState.with do |redis| - redis.set(redis_shared_state_key_for(token), value, ex: BILLING_TIMEOUT) - end - end - - def try_obtain_lease_for(token) - Gitlab::ExclusiveLease - .new("check_gcp_project_billing_worker:#{token.hash}", timeout: LEASE_TIMEOUT) - .try_obtain - end - - def billing_changed_counter - @billing_changed_counter ||= Gitlab::Metrics.counter( - :gcp_billing_change_count, - "Counts the number of times a GCP project changed billing_enabled state from false to true", - BILLING_CHANGED_LABELS - ) - end - - def state_transition(previous_state, current_state) - if previous_state.nil? && !current_state - 'no_billing' - elsif previous_state.nil? && current_state - 'with_billing' - elsif !previous_state && current_state - 'billing_configured' - end - end - - def update_billing_change_counter(previous_state, current_state) - billing_changed_counter.increment(state_transition: state_transition(previous_state, current_state)) - end -end diff --git a/app/workers/list_gcp_projects_worker.rb b/app/workers/list_gcp_projects_worker.rb new file mode 100644 index 00000000000..12cb5f738e4 --- /dev/null +++ b/app/workers/list_gcp_projects_worker.rb @@ -0,0 +1,92 @@ +require 'securerandom' + +class ListGcpProjectsWorker + include ApplicationWorker + include ClusterQueue + + LEASE_TIMEOUT = 3.seconds.to_i + SESSION_KEY_TIMEOUT = 5.minutes + BILLING_TIMEOUT = 1.hour + BILLING_CHANGED_LABELS = { state_transition: nil }.freeze + + def self.get_session_token(token_key) + Gitlab::Redis::SharedState.with do |redis| + redis.get(get_redis_session_key(token_key)) + end + end + + def self.store_session_token(token) + generate_token_key.tap do |token_key| + Gitlab::Redis::SharedState.with do |redis| + redis.set(get_redis_session_key(token_key), token, ex: SESSION_KEY_TIMEOUT) + end + end + end + + def self.get_billing_state(token) + Gitlab::Redis::SharedState.with do |redis| + value = redis.get(redis_shared_state_key_for(token)) + ActiveRecord::Type::Boolean.new.type_cast_from_user(value) + end + end + + def perform(token_key) + return unless token_key + + token = self.class.get_session_token(token_key) + return unless token + return unless try_obtain_lease_for(token) + + billing_enabled_state = !ListGcpProjectsService.new.execute(token).empty? + update_billing_change_counter(self.class.get_billing_state(token), billing_enabled_state) + self.class.set_billing_state(token, billing_enabled_state) + end + + private + + def self.generate_token_key + SecureRandom.uuid + end + + def self.get_redis_session_key(token_key) + "gitlab:gcp:session:#{token_key}" + end + + def self.redis_shared_state_key_for(token) + "gitlab:gcp:#{Digest::SHA1.hexdigest(token)}:billing_enabled" + end + + def self.set_billing_state(token, value) + Gitlab::Redis::SharedState.with do |redis| + redis.set(redis_shared_state_key_for(token), value, ex: BILLING_TIMEOUT) + end + end + + def try_obtain_lease_for(token) + Gitlab::ExclusiveLease + .new("list_gcp_projects_worker:#{token.hash}", timeout: LEASE_TIMEOUT) + .try_obtain + end + + def billing_changed_counter + @billing_changed_counter ||= Gitlab::Metrics.counter( + :gcp_billing_change_count, + "Counts the number of times a GCP project changed billing_enabled state from false to true", + BILLING_CHANGED_LABELS + ) + end + + def state_transition(previous_state, current_state) + if previous_state.nil? && !current_state + 'no_billing' + elsif previous_state.nil? && current_state + 'with_billing' + elsif !previous_state && current_state + 'billing_configured' + end + end + + def update_billing_change_counter(previous_state, current_state) + billing_changed_counter.increment(state_transition: state_transition(previous_state, current_state)) + end +end diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index 98158e081f8..3051f9cfde4 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -144,7 +144,7 @@ describe Projects::Clusters::GcpController do before do redis_double = double allow(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis_double) - allow(redis_double).to receive(:get).with(CheckGcpProjectBillingWorker.redis_shared_state_key_for('token')).and_return('true') + allow(redis_double).to receive(:get).with(ListGcpProjectsWorker.redis_shared_state_key_for('token')).and_return('true') end it 'creates a new cluster' do diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb deleted file mode 100644 index ea929fd5b01..00000000000 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ /dev/null @@ -1,116 +0,0 @@ -require 'spec_helper' - -describe CheckGcpProjectBillingWorker do - describe '.perform' do - let(:token) { 'bogustoken' } - - subject { described_class.new.perform('token_key') } - - before do - allow(described_class).to receive(:get_billing_state) - allow_any_instance_of(described_class).to receive(:update_billing_change_counter) - end - - context 'when there is a token in redis' do - before do - allow(described_class).to receive(:get_session_token).and_return(token) - end - - context 'when there is no lease' do - before do - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - end - - it 'calls the service' do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - - subject - end - - it 'stores billing status in redis' do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - expect(described_class).to receive(:set_billing_state).with(token, true) - - subject - end - end - - context 'when there is a lease' do - before do - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return(false) - end - - it 'does not call the service' do - expect(ListGcpProjectsService).not_to receive(:new) - - subject - end - end - end - - context 'when there is no token in redis' do - before do - allow(described_class).to receive(:get_session_token).and_return(nil) - end - - it 'does not call the service' do - expect(ListGcpProjectsService).not_to receive(:new) - - subject - end - end - end - - describe 'billing change counter' do - subject { described_class.new.perform('token_key') } - - before do - allow(described_class).to receive(:get_session_token).and_return('bogustoken') - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - allow(described_class).to receive(:set_billing_state) - end - - context 'when previous state was false' do - before do - expect(described_class).to receive(:get_billing_state).and_return(false) - end - - context 'when the current state is false' do - before do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([]) - end - - it 'increments the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - - context 'when the current state is true' do - before do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - end - - it 'increments the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - end - - context 'when previous state was true' do - before do - expect(described_class).to receive(:get_billing_state).and_return(true) - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - end - - it 'increment the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - end -end diff --git a/spec/workers/list_gcp_projects_worker_spec.rb b/spec/workers/list_gcp_projects_worker_spec.rb new file mode 100644 index 00000000000..ea94883b9a0 --- /dev/null +++ b/spec/workers/list_gcp_projects_worker_spec.rb @@ -0,0 +1,116 @@ +require 'spec_helper' + +describe ListGcpProjectsWorker do + describe '.perform' do + let(:token) { 'bogustoken' } + + subject { described_class.new.perform('token_key') } + + before do + allow(described_class).to receive(:get_billing_state) + allow_any_instance_of(described_class).to receive(:update_billing_change_counter) + end + + context 'when there is a token in redis' do + before do + allow(described_class).to receive(:get_session_token).and_return(token) + end + + context 'when there is no lease' do + before do + allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') + end + + it 'calls the service' do + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) + + subject + end + + it 'stores billing status in redis' do + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) + expect(described_class).to receive(:set_billing_state).with(token, true) + + subject + end + end + + context 'when there is a lease' do + before do + allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return(false) + end + + it 'does not call the service' do + expect(ListGcpProjectsService).not_to receive(:new) + + subject + end + end + end + + context 'when there is no token in redis' do + before do + allow(described_class).to receive(:get_session_token).and_return(nil) + end + + it 'does not call the service' do + expect(ListGcpProjectsService).not_to receive(:new) + + subject + end + end + end + + describe 'billing change counter' do + subject { described_class.new.perform('token_key') } + + before do + allow(described_class).to receive(:get_session_token).and_return('bogustoken') + allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') + allow(described_class).to receive(:set_billing_state) + end + + context 'when previous state was false' do + before do + expect(described_class).to receive(:get_billing_state).and_return(false) + end + + context 'when the current state is false' do + before do + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([]) + end + + it 'increments the billing change counter' do + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) + + subject + end + end + + context 'when the current state is true' do + before do + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) + end + + it 'increments the billing change counter' do + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) + + subject + end + end + end + + context 'when previous state was true' do + before do + expect(described_class).to receive(:get_billing_state).and_return(true) + expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) + end + + it 'increment the billing change counter' do + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) + + subject + end + end + end +end -- cgit v1.2.1 From e3176c201420560ba5e2d1963bc28d08e1637b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 20 Apr 2018 19:08:38 +0200 Subject: Store projects in ListGcpProjectsWorker --- .../projects/clusters/gcp_controller.rb | 19 ++++++++--------- app/workers/list_gcp_projects_worker.rb | 18 ++++++++-------- .../projects/clusters/gcp_controller_spec.rb | 24 +++++++++------------- spec/features/projects/clusters/gcp_spec.rb | 12 +++++------ spec/workers/list_gcp_projects_worker_spec.rb | 22 ++++++++++---------- 5 files changed, 45 insertions(+), 50 deletions(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 5409432e1ab..2d03c1f9f85 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -1,8 +1,8 @@ class Projects::Clusters::GcpController < Projects::ApplicationController before_action :authorize_read_cluster! - before_action :authorize_google_api, except: [:login, :list_projects] - before_action :authorize_google_project_billing, only: [:new, :create] before_action :authorize_create_cluster!, only: [:new, :create] + before_action :authorize_google_api, except: [:login, :list_projects] + before_action :get_gcp_projects, only: [:new, :create] before_action :verify_billing, only: [:create] def login @@ -36,21 +36,20 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end def list_projects - projects = GoogleApi::CloudPlatform::Client.new(token_in_session, nil).projects_list respond_to do |format| - format.json { render status: :ok, json: { projects: projects } } + format.json { render status: :ok, json: { projects: gcp_projects } } end end private def verify_billing - case google_project_billing_status + case gcp_projects&.empty? when nil flash.now[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.') - when false - flash.now[:alert] = _('Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" } when true + flash.now[:alert] = _('Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" } + when false return end @@ -82,13 +81,13 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end end - def authorize_google_project_billing + def get_gcp_projects redis_token_key = ListGcpProjectsWorker.store_session_token(token_in_session) ListGcpProjectsWorker.perform_async(redis_token_key) end - def google_project_billing_status - ListGcpProjectsWorker.get_billing_state(token_in_session) + def gcp_projects + ListGcpProjectsWorker.get_projects(token_in_session) end def token_in_session diff --git a/app/workers/list_gcp_projects_worker.rb b/app/workers/list_gcp_projects_worker.rb index 12cb5f738e4..690980a4c4e 100644 --- a/app/workers/list_gcp_projects_worker.rb +++ b/app/workers/list_gcp_projects_worker.rb @@ -6,7 +6,7 @@ class ListGcpProjectsWorker LEASE_TIMEOUT = 3.seconds.to_i SESSION_KEY_TIMEOUT = 5.minutes - BILLING_TIMEOUT = 1.hour + PROJECT_TIMEOUT = 1.hour BILLING_CHANGED_LABELS = { state_transition: nil }.freeze def self.get_session_token(token_key) @@ -23,10 +23,10 @@ class ListGcpProjectsWorker end end - def self.get_billing_state(token) + def self.read_projects(token) Gitlab::Redis::SharedState.with do |redis| value = redis.get(redis_shared_state_key_for(token)) - ActiveRecord::Type::Boolean.new.type_cast_from_user(value) + JSON.parse(value) end end @@ -37,9 +37,9 @@ class ListGcpProjectsWorker return unless token return unless try_obtain_lease_for(token) - billing_enabled_state = !ListGcpProjectsService.new.execute(token).empty? - update_billing_change_counter(self.class.get_billing_state(token), billing_enabled_state) - self.class.set_billing_state(token, billing_enabled_state) + billing_enabled_projects = ListGcpProjectsService.new.execute(token) + update_billing_change_counter(!self.class.read_projects(token).empty?, !billing_enabled_projects.empty?) + self.class.store_projects(token, billing_enabled_projects.to_json) end private @@ -53,12 +53,12 @@ class ListGcpProjectsWorker end def self.redis_shared_state_key_for(token) - "gitlab:gcp:#{Digest::SHA1.hexdigest(token)}:billing_enabled" + "gitlab:gcp:#{Digest::SHA1.hexdigest(token)}:projects" end - def self.set_billing_state(token, value) + def self.store_projects(token, value) Gitlab::Redis::SharedState.with do |redis| - redis.set(redis_shared_state_key_for(token), value, ex: BILLING_TIMEOUT) + redis.set(redis_shared_state_key_for(token), value, ex: PROJECT_TIMEOUT) end end diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index 3051f9cfde4..8b72c1a8cd9 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -77,7 +77,7 @@ describe Projects::Clusters::GcpController do end it 'has new object' do - expect(controller).to receive(:authorize_google_project_billing) + expect(controller).to receive(:get_gcp_projects) go @@ -137,14 +137,12 @@ describe Projects::Clusters::GcpController do context 'when access token is valid' do before do stub_google_api_validate_token - allow_any_instance_of(described_class).to receive(:authorize_google_project_billing) + allow_any_instance_of(described_class).to receive(:get_gcp_projects) end context 'when google project billing is enabled' do before do - redis_double = double - allow(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis_double) - allow(redis_double).to receive(:get).with(ListGcpProjectsWorker.redis_shared_state_key_for('token')).and_return('true') + allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([double]) end it 'creates a new cluster' do @@ -158,6 +156,10 @@ describe Projects::Clusters::GcpController do end context 'when google project billing is not enabled' do + before do + allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([]) + end + it 'renders the cluster form with an error' do go @@ -203,25 +205,19 @@ describe Projects::Clusters::GcpController do describe 'GET list_projects' do describe 'functionality' do let(:user) { create(:user) } - let(:api_response) { [project_id: 'test-project-1234'] } + let(:gcp_projects) { [project_id: 'test-project-1234'] } before do project.add_master(user) sign_in(user) - allow_any_instance_of(GoogleApi::CloudPlatform::Client).to receive(:projects_list).and_return(api_response) - end - - it 'calls the Google Cloud Platform projects_list' do - expect_any_instance_of(GoogleApi::CloudPlatform::Client).to receive(:projects_list) - - go + allow_any_instance_of(described_class).to receive(:gcp_projects).and_return(gcp_projects) end it 'renders the response as json' do go - expect(response.body).to eq({ projects: api_response }.to_json) + expect(response.body).to eq({ projects: gcp_projects }.to_json) end end diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index dfe8e02dce0..3937fed490c 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -24,8 +24,8 @@ feature 'Gcp Cluster', :js do context 'when user has a GCP project with billing enabled' do before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(true) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return([double]) end context 'when user does not have a cluster and visits cluster index page' do @@ -133,8 +133,8 @@ feature 'Gcp Cluster', :js do context 'when user does not have a GCP project with billing enabled' do before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(false) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return([]) visit project_clusters_path(project) @@ -153,8 +153,8 @@ feature 'Gcp Cluster', :js do context 'when gcp billing status is not in redis' do before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(nil) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return(nil) visit project_clusters_path(project) diff --git a/spec/workers/list_gcp_projects_worker_spec.rb b/spec/workers/list_gcp_projects_worker_spec.rb index ea94883b9a0..c415caf78f0 100644 --- a/spec/workers/list_gcp_projects_worker_spec.rb +++ b/spec/workers/list_gcp_projects_worker_spec.rb @@ -7,7 +7,7 @@ describe ListGcpProjectsWorker do subject { described_class.new.perform('token_key') } before do - allow(described_class).to receive(:get_billing_state) + allow(described_class).to receive(:read_projects).and_return([double]) allow_any_instance_of(described_class).to receive(:update_billing_change_counter) end @@ -27,9 +27,9 @@ describe ListGcpProjectsWorker do subject end - it 'stores billing status in redis' do + it 'stores projects in redis' do expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - expect(described_class).to receive(:set_billing_state).with(token, true) + expect(described_class).to receive(:store_projects).with(token, anything) subject end @@ -67,15 +67,15 @@ describe ListGcpProjectsWorker do before do allow(described_class).to receive(:get_session_token).and_return('bogustoken') allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - allow(described_class).to receive(:set_billing_state) + allow(described_class).to receive(:store_projects) end - context 'when previous state was false' do + context 'when there are no projects in redis' do before do - expect(described_class).to receive(:get_billing_state).and_return(false) + expect(described_class).to receive(:read_projects).and_return([]) end - context 'when the current state is false' do + context 'when the service does not return projects' do before do expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([]) end @@ -87,7 +87,7 @@ describe ListGcpProjectsWorker do end end - context 'when the current state is true' do + context 'when the service returns projects' do before do expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) end @@ -100,13 +100,13 @@ describe ListGcpProjectsWorker do end end - context 'when previous state was true' do + context 'when there are projects in redis' do before do - expect(described_class).to receive(:get_billing_state).and_return(true) + expect(described_class).to receive(:read_projects).and_return([double]) expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) end - it 'increment the billing change counter' do + it 'increments the billing change counter' do expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) subject -- cgit v1.2.1 From 45dadeec7d9f7b527cf4bc25800dcdbd13366ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 20 Apr 2018 21:58:53 +0200 Subject: Remove the GCP billing verification step --- .../projects/clusters/gcp_controller.rb | 18 +-- .../projects/clusters/gcp_controller_spec.rb | 33 ++-- spec/features/projects/clusters/gcp_spec.rb | 180 ++++++++------------- 3 files changed, 77 insertions(+), 154 deletions(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 2d03c1f9f85..585f30cd7f8 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -2,8 +2,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController before_action :authorize_read_cluster! before_action :authorize_create_cluster!, only: [:new, :create] before_action :authorize_google_api, except: [:login, :list_projects] - before_action :get_gcp_projects, only: [:new, :create] - before_action :verify_billing, only: [:create] + before_action :get_gcp_projects, only: [:new] def login begin @@ -43,21 +42,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController private - def verify_billing - case gcp_projects&.empty? - when nil - flash.now[:alert] = _('We could not verify that one of your projects on GCP has billing enabled. Please try again.') - when true - flash.now[:alert] = _('Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.').html_safe % { link_to_billing: "https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral" } - when false - return - end - - @cluster = ::Clusters::Cluster.new(create_params) - - render :new - end - def create_params params.require(:cluster).permit( :enabled, diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index 8b72c1a8cd9..b57366d3ac8 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -140,32 +140,17 @@ describe Projects::Clusters::GcpController do allow_any_instance_of(described_class).to receive(:get_gcp_projects) end - context 'when google project billing is enabled' do - before do - allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([double]) - end - - it 'creates a new cluster' do - expect(ClusterProvisionWorker).to receive(:perform_async) - expect { go }.to change { Clusters::Cluster.count } - .and change { Clusters::Providers::Gcp.count } - expect(response).to redirect_to(project_cluster_path(project, project.clusters.first)) - expect(project.clusters.first).to be_gcp - expect(project.clusters.first).to be_kubernetes - end + before do + allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([double]) end - context 'when google project billing is not enabled' do - before do - allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([]) - end - - it 'renders the cluster form with an error' do - go - - expect(response).to set_flash.now[:alert] - expect(response).to render_template('new') - end + it 'creates a new cluster' do + expect(ClusterProvisionWorker).to receive(:perform_async) + expect { go }.to change { Clusters::Cluster.count } + .and change { Clusters::Providers::Gcp.count } + expect(response).to redirect_to(project_cluster_path(project, project.clusters.first)) + expect(project.clusters.first).to be_gcp + expect(project.clusters.first).to be_kubernetes end end diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 3937fed490c..c8b418d39bc 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -20,154 +20,108 @@ feature 'Gcp Cluster', :js do .to receive(:token_in_session).and_return('token') allow_any_instance_of(Projects::Clusters::GcpController) .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) end - context 'when user has a GCP project with billing enabled' do + context 'when user does not have a cluster and visits cluster index page' do before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return([double]) + visit project_clusters_path(project) + + click_link 'Add Kubernetes cluster' + click_link 'Create on Google Kubernetes Engine' end - context 'when user does not have a cluster and visits cluster index page' do + context 'when user filled form with valid parameters' do before do - visit project_clusters_path(project) - - click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' - end - - context 'when user filled form with valid parameters' do - before do - allow_any_instance_of(GoogleApi::CloudPlatform::Client) - .to receive(:projects_zones_clusters_create) do - OpenStruct.new( - self_link: 'projects/gcp-project-12345/zones/us-central1-a/operations/ope-123', - status: 'RUNNING' - ) - end - - allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil) - - fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123' - fill_in 'cluster_name', with: 'dev-cluster' - click_button 'Create Kubernetes cluster' + allow_any_instance_of(GoogleApi::CloudPlatform::Client) + .to receive(:projects_zones_clusters_create) do + OpenStruct.new( + self_link: 'projects/gcp-project-12345/zones/us-central1-a/operations/ope-123', + status: 'RUNNING' + ) end - it 'user sees a cluster details page and creation status' do - expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...') + allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil) - Clusters::Cluster.last.provider.make_created! - - expect(page).to have_content('Kubernetes cluster was successfully created on Google Kubernetes Engine') - end - - it 'user sees a error if something worng during creation' do - expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...') - - Clusters::Cluster.last.provider.make_errored!('Something wrong!') - - expect(page).to have_content('Something wrong!') - end + fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123' + fill_in 'cluster_name', with: 'dev-cluster' + click_button 'Create Kubernetes cluster' end - context 'when user filled form with invalid parameters' do - before do - click_button 'Create Kubernetes cluster' - end + it 'user sees a cluster details page and creation status' do + expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...') - it 'user sees a validation error' do - expect(page).to have_css('#error_explanation') - end - end - end - - context 'when user does have a cluster and visits cluster page' do - let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } + Clusters::Cluster.last.provider.make_created! - before do - visit project_cluster_path(project, cluster) + expect(page).to have_content('Kubernetes cluster was successfully created on Google Kubernetes Engine') end - it 'user sees a cluster details page' do - expect(page).to have_button('Save changes') - expect(page.find(:css, '.cluster-name').value).to eq(cluster.name) - end + it 'user sees a error if something worng during creation' do + expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...') - context 'when user disables the cluster' do - before do - page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click - page.within('#cluster-integration') { click_button 'Save changes' } - end + Clusters::Cluster.last.provider.make_errored!('Something wrong!') - it 'user sees the successful message' do - expect(page).to have_content('Kubernetes cluster was successfully updated.') - end + expect(page).to have_content('Something wrong!') end + end - context 'when user changes cluster parameters' do - before do - fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace' - page.within('#js-cluster-details') { click_button 'Save changes' } - end - - it 'user sees the successful message' do - expect(page).to have_content('Kubernetes cluster was successfully updated.') - expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace') - end + context 'when user filled form with invalid parameters' do + before do + click_button 'Create Kubernetes cluster' end - context 'when user destroy the cluster' do - before do - page.accept_confirm do - click_link 'Remove integration' - end - end - - it 'user sees creation form with the successful message' do - expect(page).to have_content('Kubernetes cluster integration was successfully removed.') - expect(page).to have_link('Add Kubernetes cluster') - end + it 'user sees a validation error' do + expect(page).to have_css('#error_explanation') end end end - context 'when user does not have a GCP project with billing enabled' do - before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return([]) - - visit project_clusters_path(project) - - click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' + context 'when user does have a cluster and visits cluster page' do + let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123' - fill_in 'cluster_name', with: 'dev-cluster' - click_button 'Create Kubernetes cluster' + before do + visit project_cluster_path(project, cluster) end - it 'user sees form with error' do - expect(page).to have_content('Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.') + it 'user sees a cluster details page' do + expect(page).to have_button('Save changes') + expect(page.find(:css, '.cluster-name').value).to eq(cluster.name) end - end - context 'when gcp billing status is not in redis' do - before do - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:gcp_projects).and_return(nil) + context 'when user disables the cluster' do + before do + page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click + page.within('#cluster-integration') { click_button 'Save changes' } + end - visit project_clusters_path(project) + it 'user sees the successful message' do + expect(page).to have_content('Kubernetes cluster was successfully updated.') + end + end - click_link 'Add Kubernetes cluster' - click_link 'Create on Google Kubernetes Engine' + context 'when user changes cluster parameters' do + before do + fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace' + page.within('#js-cluster-details') { click_button 'Save changes' } + end - fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123' - fill_in 'cluster_name', with: 'dev-cluster' - click_button 'Create Kubernetes cluster' + it 'user sees the successful message' do + expect(page).to have_content('Kubernetes cluster was successfully updated.') + expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace') + end end - it 'user sees form with error' do - expect(page).to have_content('We could not verify that one of your projects on GCP has billing enabled. Please try again.') + context 'when user destroy the cluster' do + before do + page.accept_confirm do + click_link 'Remove integration' + end + end + + it 'user sees creation form with the successful message' do + expect(page).to have_content('Kubernetes cluster integration was successfully removed.') + expect(page).to have_link('Add Kubernetes cluster') + end end end end -- cgit v1.2.1 From e9f31c9ed824e45059c4b8002e259f98c2a6dec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Fri, 20 Apr 2018 23:44:00 +0200 Subject: Remove double before block from GcpController spec --- spec/controllers/projects/clusters/gcp_controller_spec.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index b57366d3ac8..095d1093a22 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -138,9 +138,6 @@ describe Projects::Clusters::GcpController do before do stub_google_api_validate_token allow_any_instance_of(described_class).to receive(:get_gcp_projects) - end - - before do allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([double]) end -- cgit v1.2.1 From 444cee56cb63bb22be27ff783ec501f24523fda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Mon, 23 Apr 2018 17:08:44 +0200 Subject: Use ListGcpProjectsWorker#read_projects instead of get_projects --- app/controllers/projects/clusters/gcp_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 585f30cd7f8..0f041e70958 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -71,7 +71,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end def gcp_projects - ListGcpProjectsWorker.get_projects(token_in_session) + ListGcpProjectsWorker.read_projects(token_in_session) end def token_in_session -- cgit v1.2.1 From 7a1ce56ffacbc1135fae888e76fe56a92d90a304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Tue, 24 Apr 2018 20:45:34 +0200 Subject: Handle nil state in ListGcpProjectsWorker#read_projects --- app/workers/list_gcp_projects_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/list_gcp_projects_worker.rb b/app/workers/list_gcp_projects_worker.rb index 690980a4c4e..3e656424bf2 100644 --- a/app/workers/list_gcp_projects_worker.rb +++ b/app/workers/list_gcp_projects_worker.rb @@ -26,7 +26,7 @@ class ListGcpProjectsWorker def self.read_projects(token) Gitlab::Redis::SharedState.with do |redis| value = redis.get(redis_shared_state_key_for(token)) - JSON.parse(value) + value ? JSON.parse(value) : [] end end -- cgit v1.2.1 From 45f52235d9da063bdb190b211d30c13d8b30c711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:19:50 +0200 Subject: Remove ListGcpProjectsWorker --- app/workers/list_gcp_projects_worker.rb | 92 -------------------- spec/workers/list_gcp_projects_worker_spec.rb | 116 -------------------------- 2 files changed, 208 deletions(-) delete mode 100644 app/workers/list_gcp_projects_worker.rb delete mode 100644 spec/workers/list_gcp_projects_worker_spec.rb diff --git a/app/workers/list_gcp_projects_worker.rb b/app/workers/list_gcp_projects_worker.rb deleted file mode 100644 index 3e656424bf2..00000000000 --- a/app/workers/list_gcp_projects_worker.rb +++ /dev/null @@ -1,92 +0,0 @@ -require 'securerandom' - -class ListGcpProjectsWorker - include ApplicationWorker - include ClusterQueue - - LEASE_TIMEOUT = 3.seconds.to_i - SESSION_KEY_TIMEOUT = 5.minutes - PROJECT_TIMEOUT = 1.hour - BILLING_CHANGED_LABELS = { state_transition: nil }.freeze - - def self.get_session_token(token_key) - Gitlab::Redis::SharedState.with do |redis| - redis.get(get_redis_session_key(token_key)) - end - end - - def self.store_session_token(token) - generate_token_key.tap do |token_key| - Gitlab::Redis::SharedState.with do |redis| - redis.set(get_redis_session_key(token_key), token, ex: SESSION_KEY_TIMEOUT) - end - end - end - - def self.read_projects(token) - Gitlab::Redis::SharedState.with do |redis| - value = redis.get(redis_shared_state_key_for(token)) - value ? JSON.parse(value) : [] - end - end - - def perform(token_key) - return unless token_key - - token = self.class.get_session_token(token_key) - return unless token - return unless try_obtain_lease_for(token) - - billing_enabled_projects = ListGcpProjectsService.new.execute(token) - update_billing_change_counter(!self.class.read_projects(token).empty?, !billing_enabled_projects.empty?) - self.class.store_projects(token, billing_enabled_projects.to_json) - end - - private - - def self.generate_token_key - SecureRandom.uuid - end - - def self.get_redis_session_key(token_key) - "gitlab:gcp:session:#{token_key}" - end - - def self.redis_shared_state_key_for(token) - "gitlab:gcp:#{Digest::SHA1.hexdigest(token)}:projects" - end - - def self.store_projects(token, value) - Gitlab::Redis::SharedState.with do |redis| - redis.set(redis_shared_state_key_for(token), value, ex: PROJECT_TIMEOUT) - end - end - - def try_obtain_lease_for(token) - Gitlab::ExclusiveLease - .new("list_gcp_projects_worker:#{token.hash}", timeout: LEASE_TIMEOUT) - .try_obtain - end - - def billing_changed_counter - @billing_changed_counter ||= Gitlab::Metrics.counter( - :gcp_billing_change_count, - "Counts the number of times a GCP project changed billing_enabled state from false to true", - BILLING_CHANGED_LABELS - ) - end - - def state_transition(previous_state, current_state) - if previous_state.nil? && !current_state - 'no_billing' - elsif previous_state.nil? && current_state - 'with_billing' - elsif !previous_state && current_state - 'billing_configured' - end - end - - def update_billing_change_counter(previous_state, current_state) - billing_changed_counter.increment(state_transition: state_transition(previous_state, current_state)) - end -end diff --git a/spec/workers/list_gcp_projects_worker_spec.rb b/spec/workers/list_gcp_projects_worker_spec.rb deleted file mode 100644 index c415caf78f0..00000000000 --- a/spec/workers/list_gcp_projects_worker_spec.rb +++ /dev/null @@ -1,116 +0,0 @@ -require 'spec_helper' - -describe ListGcpProjectsWorker do - describe '.perform' do - let(:token) { 'bogustoken' } - - subject { described_class.new.perform('token_key') } - - before do - allow(described_class).to receive(:read_projects).and_return([double]) - allow_any_instance_of(described_class).to receive(:update_billing_change_counter) - end - - context 'when there is a token in redis' do - before do - allow(described_class).to receive(:get_session_token).and_return(token) - end - - context 'when there is no lease' do - before do - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - end - - it 'calls the service' do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - - subject - end - - it 'stores projects in redis' do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - expect(described_class).to receive(:store_projects).with(token, anything) - - subject - end - end - - context 'when there is a lease' do - before do - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return(false) - end - - it 'does not call the service' do - expect(ListGcpProjectsService).not_to receive(:new) - - subject - end - end - end - - context 'when there is no token in redis' do - before do - allow(described_class).to receive(:get_session_token).and_return(nil) - end - - it 'does not call the service' do - expect(ListGcpProjectsService).not_to receive(:new) - - subject - end - end - end - - describe 'billing change counter' do - subject { described_class.new.perform('token_key') } - - before do - allow(described_class).to receive(:get_session_token).and_return('bogustoken') - allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - allow(described_class).to receive(:store_projects) - end - - context 'when there are no projects in redis' do - before do - expect(described_class).to receive(:read_projects).and_return([]) - end - - context 'when the service does not return projects' do - before do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([]) - end - - it 'increments the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - - context 'when the service returns projects' do - before do - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - end - - it 'increments the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - end - - context 'when there are projects in redis' do - before do - expect(described_class).to receive(:read_projects).and_return([double]) - expect(ListGcpProjectsService).to receive_message_chain(:new, :execute).and_return([double]) - end - - it 'increments the billing change counter' do - expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) - - subject - end - end - end -end -- cgit v1.2.1 From 1e8dbd52f09c792a724c0a0e91427f966a03c550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:20:19 +0200 Subject: Remove ListGcpProjectsService --- app/services/list_gcp_projects_service.rb | 12 ---------- spec/services/list_gcp_projects_service_spec.rb | 32 ------------------------- 2 files changed, 44 deletions(-) delete mode 100644 app/services/list_gcp_projects_service.rb delete mode 100644 spec/services/list_gcp_projects_service_spec.rb diff --git a/app/services/list_gcp_projects_service.rb b/app/services/list_gcp_projects_service.rb deleted file mode 100644 index 7f7b35fd48a..00000000000 --- a/app/services/list_gcp_projects_service.rb +++ /dev/null @@ -1,12 +0,0 @@ -class ListGcpProjectsService - def execute(token) - client = GoogleApi::CloudPlatform::Client.new(token, nil) - # Lists only projects with billing enabled - client.projects_list.select do |project| - begin - client.projects_get_billing_info(project.project_id).billing_enabled - rescue - end - end - end -end diff --git a/spec/services/list_gcp_projects_service_spec.rb b/spec/services/list_gcp_projects_service_spec.rb deleted file mode 100644 index f1957b155e7..00000000000 --- a/spec/services/list_gcp_projects_service_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper' - -describe ListGcpProjectsService do - include GoogleApi::CloudPlatformHelpers - - let(:service) { described_class.new } - let(:project_id) { 'test-project-1234' } - - describe '#execute' do - before do - stub_cloud_platform_projects_list(project_id: project_id) - end - - subject { service.execute('bogustoken') } - - context 'google account has a billing enabled gcp project' do - before do - stub_cloud_platform_projects_get_billing_info(project_id, true) - end - - it { is_expected.to all(satisfy { |project| project.project_id == project_id }) } - end - - context 'google account does not have a billing enabled gcp project' do - before do - stub_cloud_platform_projects_get_billing_info(project_id, false) - end - - it { is_expected.to eq([]) } - end - end -end -- cgit v1.2.1 From 6472025ea3762667da308d046fca84b14426a644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:24:55 +0200 Subject: Remove Projects::Clusters::GcpController#list_projects --- .../projects/clusters/gcp_controller.rb | 16 ------------- config/routes/project.rb | 1 - .../projects/clusters/gcp_controller_spec.rb | 28 ---------------------- 3 files changed, 45 deletions(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 0f041e70958..6b1a483e28d 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -2,7 +2,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController before_action :authorize_read_cluster! before_action :authorize_create_cluster!, only: [:new, :create] before_action :authorize_google_api, except: [:login, :list_projects] - before_action :get_gcp_projects, only: [:new] def login begin @@ -34,12 +33,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end end - def list_projects - respond_to do |format| - format.json { render status: :ok, json: { projects: gcp_projects } } - end - end - private def create_params @@ -65,15 +58,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController end end - def get_gcp_projects - redis_token_key = ListGcpProjectsWorker.store_session_token(token_in_session) - ListGcpProjectsWorker.perform_async(redis_token_key) - end - - def gcp_projects - ListGcpProjectsWorker.read_projects(token_in_session) - end - def token_in_session @token_in_session ||= session[GoogleApi::CloudPlatform::Client.session_key_for_token] diff --git a/config/routes/project.rb b/config/routes/project.rb index 8d77863c58b..2a1bcb8cde2 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -206,7 +206,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get '/gcp/new', to: 'clusters/gcp#new' get '/gcp/login', to: 'clusters/gcp#login' - get '/gcp/list_projects', to: 'clusters/gcp#list_projects' post '/gcp', to: 'clusters/gcp#create' end end diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index 095d1093a22..271ba37aed4 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -77,8 +77,6 @@ describe Projects::Clusters::GcpController do end it 'has new object' do - expect(controller).to receive(:get_gcp_projects) - go expect(assigns(:cluster)).to be_an_instance_of(Clusters::Cluster) @@ -137,8 +135,6 @@ describe Projects::Clusters::GcpController do context 'when access token is valid' do before do stub_google_api_validate_token - allow_any_instance_of(described_class).to receive(:get_gcp_projects) - allow_any_instance_of(described_class).to receive(:gcp_projects).and_return([double]) end it 'creates a new cluster' do @@ -183,28 +179,4 @@ describe Projects::Clusters::GcpController do post :create, params.merge(namespace_id: project.namespace, project_id: project) end end - - describe 'GET list_projects' do - describe 'functionality' do - let(:user) { create(:user) } - let(:gcp_projects) { [project_id: 'test-project-1234'] } - - before do - project.add_master(user) - sign_in(user) - - allow_any_instance_of(described_class).to receive(:gcp_projects).and_return(gcp_projects) - end - - it 'renders the response as json' do - go - - expect(response.body).to eq({ projects: gcp_projects }.to_json) - end - end - - def go - get :list_projects, namespace_id: project.namespace, project_id: project, format: :json - end - end end -- cgit v1.2.1 From ae6a37d70d885e75d8ef5967c4267092af37e893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:25:33 +0200 Subject: Remove list_gcp_projects queue --- app/workers/all_queues.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 1edfaa1691a..cf05deaef9c 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -24,7 +24,6 @@ - gcp_cluster:cluster_provision - gcp_cluster:cluster_wait_for_app_installation - gcp_cluster:wait_for_cluster_creation -- gcp_cluster:list_gcp_projects - gcp_cluster:cluster_wait_for_ingress_ip_address - github_import_advance_stage -- cgit v1.2.1 From 534bb0b617b6a5b8ca97176e6c7c874056c4c67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:28:21 +0200 Subject: Remove list_projects action from Google API check --- app/controllers/projects/clusters/gcp_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index 6b1a483e28d..6a017c2010b 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -1,7 +1,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController before_action :authorize_read_cluster! before_action :authorize_create_cluster!, only: [:new, :create] - before_action :authorize_google_api, except: [:login, :list_projects] + before_action :authorize_google_api, except: :login def login begin -- cgit v1.2.1 From 3c81b62d9af9b135e28b0567420e37273a6e3176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 17:32:57 +0200 Subject: Remove GCP Project list stub from GCP feature spec --- spec/features/projects/clusters/gcp_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index c8b418d39bc..dbf8a22b5ac 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -20,7 +20,6 @@ feature 'Gcp Cluster', :js do .to receive(:token_in_session).and_return('token') allow_any_instance_of(Projects::Clusters::GcpController) .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:get_gcp_projects) end context 'when user does not have a cluster and visits cluster index page' do -- cgit v1.2.1 From a5f43b3d0a6ece692123e3521e8e159dd77bb346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 2 May 2018 20:44:17 +0200 Subject: Remove project billing context from controller spec --- .../projects/clusters/gcp_controller_spec.rb | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb index 10ca2af1995..271ba37aed4 100644 --- a/spec/controllers/projects/clusters/gcp_controller_spec.rb +++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb @@ -137,21 +137,13 @@ describe Projects::Clusters::GcpController do stub_google_api_validate_token end - context 'when google project billing is enabled' do - before do - redis_double = double.as_null_object - allow(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis_double) - allow(redis_double).to receive(:get).with(CheckGcpProjectBillingWorker.redis_shared_state_key_for('token')).and_return('true') - end - - it 'creates a new cluster' do - expect(ClusterProvisionWorker).to receive(:perform_async) - expect { go }.to change { Clusters::Cluster.count } - .and change { Clusters::Providers::Gcp.count } - expect(response).to redirect_to(project_cluster_path(project, project.clusters.first)) - expect(project.clusters.first).to be_gcp - expect(project.clusters.first).to be_kubernetes - end + it 'creates a new cluster' do + expect(ClusterProvisionWorker).to receive(:perform_async) + expect { go }.to change { Clusters::Cluster.count } + .and change { Clusters::Providers::Gcp.count } + expect(response).to redirect_to(project_cluster_path(project, project.clusters.first)) + expect(project.clusters.first).to be_gcp + expect(project.clusters.first).to be_kubernetes end end -- cgit v1.2.1 From 7db2ef366566f1105f0dd936f8f7090e1e93b0b2 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 2 May 2018 16:18:32 +0200 Subject: fetch gke parameters from frontend --- .../pages/projects/clusters/gcp/new/index.js | 117 +++++++++++++ .../components/dropdown_button.vue | 51 ++++++ .../components/gke_machine_type_dropdown.vue | 177 +++++++++++++++++++ .../components/gke_project_id_dropdown.vue | 190 +++++++++++++++++++++ .../components/gke_zone_dropdown.vue | 163 ++++++++++++++++++ .../projects/gke_cluster_dropdowns/eventhub.js | 3 + .../gke_cluster_dropdowns/stores/actions.js | 20 +++ .../gke_cluster_dropdowns/stores/getters.js | 0 .../projects/gke_cluster_dropdowns/stores/index.js | 18 ++ .../gke_cluster_dropdowns/stores/mutation_types.js | 3 + .../gke_cluster_dropdowns/stores/mutations.js | 13 ++ .../components/dropdown/dropdown_hidden_input.vue | 22 +++ .../components/dropdown/dropdown_search_input.vue | 44 +++++ app/assets/stylesheets/pages/clusters.scss | 13 ++ app/views/projects/clusters/gcp/_form.html.haml | 17 +- 15 files changed, 844 insertions(+), 7 deletions(-) create mode 100644 app/assets/javascripts/pages/projects/clusters/gcp/new/index.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js create mode 100644 app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue create mode 100644 app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue diff --git a/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js b/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js new file mode 100644 index 00000000000..d3f22538068 --- /dev/null +++ b/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js @@ -0,0 +1,117 @@ +/* global gapi */ +import Vue from 'vue'; +import Flash from '~/flash'; +import { s__ } from '~/locale'; +import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; +import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; +import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue'; + +const GCP_API_ERROR = + 'ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later.'; + +function mountGkeProjectIdDropdown() { + const el = document.getElementById('js-gcp-project-id-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return; + // debugger; + + // eslint-disable-next-line no-new + new Vue({ + el, + components: { + GkeProjectIdDropdown, + }, + render: createElement => + createElement('gke-project-id-dropdown', { + props: { + docsUrl: el.dataset.docsurl, + service: gapi.client.cloudresourcemanager, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +} + +function mountGkeZoneDropdown() { + const el = document.getElementById('js-gcp-zone-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return; + // debugger; + + // eslint-disable-next-line no-new + new Vue({ + el, + components: { + GkeZoneDropdown, + }, + render: createElement => + createElement('gke-zone-dropdown', { + props: { + service: gapi.client.compute, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +} + +function mountGkeMachineTypeDropdown() { + const el = document.getElementById('js-gcp-machine-type-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return; + // debugger; + + // eslint-disable-next-line no-new + new Vue({ + el, + components: { + GkeMachineTypeDropdown, + }, + render: createElement => + createElement('gke-machine-type-dropdown', { + props: { + service: gapi.client.compute, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +} + +function initializeGapiClient() { + const el = document.getElementById('new_cluster'); + + gapi.client.setToken({ access_token: el.dataset.token }); + + gapi.client + .load('https://www.googleapis.com/discovery/v1/apis/cloudresourcemanager/v1/rest') + .then(() => { + mountGkeProjectIdDropdown(); + }) + .catch(() => { + Flash(s__(GCP_API_ERROR)); + }); + + gapi.client + .load('https://www.googleapis.com/discovery/v1/apis/compute/v1/rest') + .then(() => { + mountGkeZoneDropdown(); + mountGkeMachineTypeDropdown(); + }) + .catch(() => { + Flash(s__(GCP_API_ERROR)); + }); +} + +document.addEventListener('DOMContentLoaded', () => { + if (typeof gapi === 'undefined') { + Flash(s__(GCP_API_ERROR)); + return false; + } + + gapi.load('client', initializeGapiClient); +}); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue new file mode 100644 index 00000000000..48819f8aa4c --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue @@ -0,0 +1,51 @@ + + + diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue new file mode 100644 index 00000000000..9f05b1ab01f --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -0,0 +1,177 @@ + + + diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue new file mode 100644 index 00000000000..c37b49441ac --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -0,0 +1,190 @@ + + + diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue new file mode 100644 index 00000000000..9b1dfe00f02 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -0,0 +1,163 @@ + + + diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js new file mode 100644 index 00000000000..0948c2e5352 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js @@ -0,0 +1,3 @@ +import Vue from 'vue'; + +export default new Vue(); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js new file mode 100644 index 00000000000..45a8c19e638 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js @@ -0,0 +1,20 @@ +import * as types from './mutation_types'; +import eventHub from '../eventhub'; + +export const setProject = ({ commit }, selectedProject) => { + commit(types.SET_PROJECT, selectedProject); + + eventHub.$emit('projectSelected'); +}; + +export const setZone = ({ commit }, selectedZone) => { + commit(types.SET_ZONE, selectedZone); + + eventHub.$emit('zoneSelected'); +}; + +export const setMachineType = ({ commit }, selectedMachineType) => { + commit(types.SET_MACHINE_TYPE, selectedMachineType); + + eventHub.$emit('machineTypeSelected'); +}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/getters.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js new file mode 100644 index 00000000000..76e839efa88 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js @@ -0,0 +1,18 @@ +import Vue from 'vue'; +import Vuex from 'vuex'; +import * as actions from './actions'; +import * as getters from './getters'; +import mutations from './mutations'; + +Vue.use(Vuex); + +export default new Vuex.Store({ + actions, + getters, + mutations, + state: { + selectedProject: '', + selectedZone: '', + selectedMachineType: '', + }, +}); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js new file mode 100644 index 00000000000..865dc918f82 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js @@ -0,0 +1,3 @@ +export const SET_PROJECT = 'SET_PROJECT'; +export const SET_ZONE = 'SET_ZONE'; +export const SET_MACHINE_TYPE = 'SET_MACHINE_TYPE'; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js new file mode 100644 index 00000000000..e00645b2005 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js @@ -0,0 +1,13 @@ +import * as types from './mutation_types'; + +export default { + [types.SET_PROJECT](state, selectedProject) { + Object.assign(state, { selectedProject }); + }, + [types.SET_ZONE](state, selectedZone) { + Object.assign(state, { selectedZone }); + }, + [types.SET_MACHINE_TYPE](state, selectedMachineType) { + Object.assign(state, { selectedMachineType }); + }, +}; diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue new file mode 100644 index 00000000000..7f3e88a9a40 --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue @@ -0,0 +1,22 @@ + + + diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue new file mode 100644 index 00000000000..aa46e47e84a --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue @@ -0,0 +1,44 @@ + + + diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 7b8ee026357..2d1fd074e2b 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -26,3 +26,16 @@ margin-right: 0; } } + +#new_cluster { + .dropdown-menu-toggle { + .loading-container { + .fa { + position: relative; + margin-top: 2px; + top: initial; + right: initial; + } + } + } +} diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index 5739a57dcfe..4a175c081c1 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -1,8 +1,10 @@ += javascript_include_tag 'https://apis.google.com/js/api.js' + %p - link_to_help_page = link_to(s_('ClusterIntegration|help page'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer') = s_('ClusterIntegration|Read our %{link_to_help_page} on Kubernetes cluster integration.').html_safe % { link_to_help_page: link_to_help_page} -= form_for @cluster, html: { class: 'prepend-top-20' }, url: gcp_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field| += form_for @cluster, html: { class: 'prepend-top-20', data: { token: @token_in_session } }, url: gcp_namespace_project_clusters_path(@project.namespace, @project), as: :cluster do |field| = form_errors(@cluster) .form-group = field.label :name, s_('ClusterIntegration|Kubernetes cluster name') @@ -14,13 +16,14 @@ = field.fields_for :provider_gcp, @cluster.provider_gcp do |provider_gcp_field| .form-group = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project ID') - = link_to(s_('ClusterIntegration|See your projects'), 'https://console.cloud.google.com/home/dashboard', target: '_blank', rel: 'noopener noreferrer') - = provider_gcp_field.text_field :gcp_project_id, class: 'form-control', placeholder: s_('ClusterIntegration|Project ID') + #js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } + = provider_gcp_field.hidden_field :gcp_project_id, class: 'form-control', placeholder: 'Select project' .form-group = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone') = link_to(s_('ClusterIntegration|See zones'), 'https://cloud.google.com/compute/docs/regions-zones/regions-zones', target: '_blank', rel: 'noopener noreferrer') - = provider_gcp_field.text_field :zone, class: 'form-control', placeholder: 'us-central1-a' + #js-gcp-zone-dropdown-entry-point + = provider_gcp_field.hidden_field :zone, class: 'form-control', placeholder: 'us-central1-a' .form-group = provider_gcp_field.label :num_nodes, s_('ClusterIntegration|Number of nodes') @@ -28,8 +31,8 @@ .form-group = provider_gcp_field.label :machine_type, s_('ClusterIntegration|Machine type') - = link_to(s_('ClusterIntegration|See machine types'), 'https://cloud.google.com/compute/docs/machine-types', target: '_blank', rel: 'noopener noreferrer') - = provider_gcp_field.text_field :machine_type, class: 'form-control', placeholder: 'n1-standard-4' + #js-gcp-machine-type-dropdown-entry-point + = provider_gcp_field.hidden_field :machine_type, class: 'form-control', placeholder: 'us-central1-a' .form-group - = field.submit s_('ClusterIntegration|Create Kubernetes cluster'), class: 'btn btn-success' + = field.submit s_('ClusterIntegration|Create Kubernetes cluster'), class: 'btn btn-success', disabled: true -- cgit v1.2.1 From 739029bb0f03ff2bf70d67b3d2a09ddd196143a6 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 4 May 2018 12:40:37 +0200 Subject: Fix API to remove deploy key from project instead of deleting it entirely --- .../unreleased/security-dm-delete-deploy-key.yml | 5 +++ lib/api/deploy_keys.rb | 6 ++-- spec/requests/api/deploy_keys_spec.rb | 40 +++++++++++++++++++++- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/security-dm-delete-deploy-key.yml diff --git a/changelogs/unreleased/security-dm-delete-deploy-key.yml b/changelogs/unreleased/security-dm-delete-deploy-key.yml new file mode 100644 index 00000000000..aa94e7b6072 --- /dev/null +++ b/changelogs/unreleased/security-dm-delete-deploy-key.yml @@ -0,0 +1,5 @@ +--- +title: Fix API to remove deploy key from project instead of deleting it entirely +merge_request: +author: +type: security diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb index 70d43ac1d79..b7aadc27e71 100644 --- a/lib/api/deploy_keys.rb +++ b/lib/api/deploy_keys.rb @@ -148,10 +148,10 @@ module API requires :key_id, type: Integer, desc: 'The ID of the deploy key' end delete ":id/deploy_keys/:key_id" do - key = user_project.deploy_keys.find(params[:key_id]) - not_found!('Deploy Key') unless key + deploy_key_project = user_project.deploy_keys_projects.find_by(deploy_key_id: params[:key_id]) + not_found!('Deploy Key') unless deploy_key_project - destroy_conditionally!(key) + destroy_conditionally!(deploy_key_project) end end end diff --git a/spec/requests/api/deploy_keys_spec.rb b/spec/requests/api/deploy_keys_spec.rb index ae9c0e9c304..32fc704a79b 100644 --- a/spec/requests/api/deploy_keys_spec.rb +++ b/spec/requests/api/deploy_keys_spec.rb @@ -171,7 +171,7 @@ describe API::DeployKeys do deploy_key end - it 'deletes existing key' do + it 'removes existing key from project' do expect do delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) @@ -179,6 +179,44 @@ describe API::DeployKeys do end.to change { project.deploy_keys.count }.by(-1) end + context 'when the deploy key is public' do + it 'does not delete the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.not_to change { DeployKey.count } + end + end + + context 'when the deploy key is not public' do + let!(:deploy_key) { create(:deploy_key, public: false) } + + context 'when the deploy key is only used by this project' do + it 'deletes the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.to change { DeployKey.count }.by(-1) + end + end + + context 'when the deploy key is used by other projects' do + before do + create(:deploy_keys_project, project: project2, deploy_key: deploy_key) + end + + it 'does not delete the deploy key' do + expect do + delete api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin) + + expect(response).to have_gitlab_http_status(204) + end.not_to change { DeployKey.count } + end + end + end + it 'returns 404 Not Found with invalid ID' do delete api("/projects/#{project.id}/deploy_keys/404", admin) -- cgit v1.2.1 From 11e9339d9cd1931d2481f19cfe327af7d14bae44 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 4 May 2018 13:51:37 +0200 Subject: fix number of form value bugs --- .../components/gke_machine_type_dropdown.vue | 4 +- .../components/gke_project_id_dropdown.vue | 43 ++++++++-------------- .../components/gke_zone_dropdown.vue | 6 ++- .../projects/gke_cluster_dropdowns/stores/index.js | 5 ++- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 9f05b1ab01f..ff67cf848d2 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -85,7 +85,7 @@ export default { fetchItems() { this.isLoading = true; const request = this.service.machineTypes.list({ - project: this.$store.state.selectedProject, + project: this.$store.state.selectedProject.projectId, zone: this.$store.state.selectedZone, }); @@ -143,7 +143,7 @@ export default { > item.name.toLowerCase().indexOf(this.searchQuery) > -1); }, toggleText() { - if (this.$store.state.selectedProject) { - return this.$store.state.selectedProject; + if (this.$store.state.selectedProject.name) { + return this.$store.state.selectedProject.name; + } + + if (this.isLoading) { + return s__('ClusterIntegration|Fetching projects'); } - return this.isLoading - ? s__('ClusterIntegration|Fetching projects') - : s__('ClusterIntegration|Select project'); + return this.items.length + ? s__('ClusterIntegration|Select project') + : s__('ClusterIntegration|No projects found'); }, placeholderText() { return s__('ClusterIntegration|Search projects'); @@ -102,26 +107,10 @@ export default { resp => { this.items = resp.result.projects; - // Cause error - // this.items = data; - - // Single state - // this.items = [ - // { - // create_time: '2018-01-16T15:55:02.992Z', - // lifecycle_state: 'ACTIVE', - // name: 'NaturalInterface', - // item_id: 'naturalinterface-192315', - // item_number: 840816084083, - // }, - // ]; - + this.isLoading = false; if (this.items.length === 1) { - this.isDisabled = true; - this.setProject(this.items[0].name); + this.setProject(this.items[0]); } - - this.isLoading = false; }, resp => { this.isLoading = false; @@ -150,7 +139,7 @@ export default { > {{ result.name }} diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 9b1dfe00f02..b8f3f0fd8ca 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -76,7 +76,9 @@ export default { ...mapActions(['setZone']), fetchItems() { this.isLoading = true; - const request = this.service.zones.list({ project: this.$store.state.selectedProject }); + const request = this.service.zones.list({ + project: this.$store.state.selectedProject.projectId, + }); return request.then( resp => { @@ -129,7 +131,7 @@ export default { > Date: Fri, 4 May 2018 14:43:16 +0200 Subject: fix validation for zone dropdowns --- .../projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index b8f3f0fd8ca..fdfdfb20046 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -47,7 +47,7 @@ export default { }, computed: { isDisabled() { - return this.$store.state.selectedProject.length === 0; + return this.$store.state.selectedProject.projectId.length === 0; }, results() { return this.items.filter(item => item.name.toLowerCase().indexOf(this.searchQuery) > -1); -- cgit v1.2.1 From eece2a1c6f735d757fdd11eed04cd661fee125fc Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Sun, 6 May 2018 14:42:47 +0200 Subject: change entrypoints + dummy loading elements --- app/views/projects/clusters/gcp/_form.html.haml | 27 +++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index 4a175c081c1..1f2fb445d78 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -16,14 +16,24 @@ = field.fields_for :provider_gcp, @cluster.provider_gcp do |provider_gcp_field| .form-group = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project ID') - #js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } - = provider_gcp_field.hidden_field :gcp_project_id, class: 'form-control', placeholder: 'Select project' + .js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } + = provider_gcp_field.hidden_field :gcp_project_id + .dropdown + %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } + %span.dropdown-toggle-text + = _('Select project') + = icon('chevron-down') .form-group = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone') = link_to(s_('ClusterIntegration|See zones'), 'https://cloud.google.com/compute/docs/regions-zones/regions-zones', target: '_blank', rel: 'noopener noreferrer') - #js-gcp-zone-dropdown-entry-point - = provider_gcp_field.hidden_field :zone, class: 'form-control', placeholder: 'us-central1-a' + .js-gcp-zone-dropdown-entry-point + = provider_gcp_field.hidden_field :zone + .dropdown + %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } + %span.dropdown-toggle-text + = _('Select project to choose zone') + = icon('chevron-down') .form-group = provider_gcp_field.label :num_nodes, s_('ClusterIntegration|Number of nodes') @@ -31,8 +41,13 @@ .form-group = provider_gcp_field.label :machine_type, s_('ClusterIntegration|Machine type') - #js-gcp-machine-type-dropdown-entry-point - = provider_gcp_field.hidden_field :machine_type, class: 'form-control', placeholder: 'us-central1-a' + .js-gcp-machine-type-dropdown-entry-point + = provider_gcp_field.hidden_field :machine_type + .dropdown + %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } + %span.dropdown-toggle-text + = _('Select project and zone to choose machine type') + = icon('chevron-down') .form-group = field.submit s_('ClusterIntegration|Create Kubernetes cluster'), class: 'btn btn-success', disabled: true -- cgit v1.2.1 From e754fafad6b8faf06c8154cdd8170cb4567b6835 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Sun, 6 May 2018 14:42:51 +0200 Subject: revisions --- .../pages/projects/clusters/gcp/new/index.js | 116 +-------------------- .../components/dropdown_button.vue | 1 - .../projects/gke_cluster_dropdowns/constants.js | 9 ++ .../projects/gke_cluster_dropdowns/index.js | 110 +++++++++++++++++++ 4 files changed, 121 insertions(+), 115 deletions(-) create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/index.js diff --git a/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js b/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js index d3f22538068..d4f34e32a48 100644 --- a/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js +++ b/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js @@ -1,117 +1,5 @@ -/* global gapi */ -import Vue from 'vue'; -import Flash from '~/flash'; -import { s__ } from '~/locale'; -import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; -import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; -import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue'; - -const GCP_API_ERROR = - 'ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later.'; - -function mountGkeProjectIdDropdown() { - const el = document.getElementById('js-gcp-project-id-dropdown-entry-point'); - const hiddenInput = el.querySelector('input'); - - if (!el) return; - // debugger; - - // eslint-disable-next-line no-new - new Vue({ - el, - components: { - GkeProjectIdDropdown, - }, - render: createElement => - createElement('gke-project-id-dropdown', { - props: { - docsUrl: el.dataset.docsurl, - service: gapi.client.cloudresourcemanager, - fieldName: hiddenInput.getAttribute('name'), - fieldId: hiddenInput.getAttribute('id'), - }, - }), - }); -} - -function mountGkeZoneDropdown() { - const el = document.getElementById('js-gcp-zone-dropdown-entry-point'); - const hiddenInput = el.querySelector('input'); - - if (!el) return; - // debugger; - - // eslint-disable-next-line no-new - new Vue({ - el, - components: { - GkeZoneDropdown, - }, - render: createElement => - createElement('gke-zone-dropdown', { - props: { - service: gapi.client.compute, - fieldName: hiddenInput.getAttribute('name'), - fieldId: hiddenInput.getAttribute('id'), - }, - }), - }); -} - -function mountGkeMachineTypeDropdown() { - const el = document.getElementById('js-gcp-machine-type-dropdown-entry-point'); - const hiddenInput = el.querySelector('input'); - - if (!el) return; - // debugger; - - // eslint-disable-next-line no-new - new Vue({ - el, - components: { - GkeMachineTypeDropdown, - }, - render: createElement => - createElement('gke-machine-type-dropdown', { - props: { - service: gapi.client.compute, - fieldName: hiddenInput.getAttribute('name'), - fieldId: hiddenInput.getAttribute('id'), - }, - }), - }); -} - -function initializeGapiClient() { - const el = document.getElementById('new_cluster'); - - gapi.client.setToken({ access_token: el.dataset.token }); - - gapi.client - .load('https://www.googleapis.com/discovery/v1/apis/cloudresourcemanager/v1/rest') - .then(() => { - mountGkeProjectIdDropdown(); - }) - .catch(() => { - Flash(s__(GCP_API_ERROR)); - }); - - gapi.client - .load('https://www.googleapis.com/discovery/v1/apis/compute/v1/rest') - .then(() => { - mountGkeZoneDropdown(); - mountGkeMachineTypeDropdown(); - }) - .catch(() => { - Flash(s__(GCP_API_ERROR)); - }); -} +import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; document.addEventListener('DOMContentLoaded', () => { - if (typeof gapi === 'undefined') { - Flash(s__(GCP_API_ERROR)); - return false; - } - - gapi.load('client', initializeGapiClient); + initGkeDropdowns(); }); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue index 48819f8aa4c..ff0aba89d20 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue @@ -23,7 +23,6 @@ export default { default: __('Select'), }, }, - computed: {}, }; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js new file mode 100644 index 00000000000..100331df819 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js @@ -0,0 +1,9 @@ +import { s__ } from '~/locale'; + +export const GCP_API_ERROR = s__( + 'ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later.', +); +export const GCP_API_CLOUD_RESOURCE_MANAGER_ENDPOINT = + 'https://www.googleapis.com/discovery/v1/apis/cloudresourcemanager/v1/rest'; +export const GCP_API_COMPUTE_ENDPOINT = + 'https://www.googleapis.com/discovery/v1/apis/compute/v1/rest'; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js new file mode 100644 index 00000000000..0ff705b0879 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js @@ -0,0 +1,110 @@ +/* global gapi */ +import Vue from 'vue'; +import Flash from '~/flash'; +import GkeProjectIdDropdown from './components/gke_project_id_dropdown.vue'; +import GkeZoneDropdown from './components/gke_zone_dropdown.vue'; +import GkeMachineTypeDropdown from './components/gke_machine_type_dropdown.vue'; +import * as CONSTANTS from './constants'; + +const mountGkeProjectIdDropdown = () => { + const el = document.querySelector('.js-gcp-project-id-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return false; + + return new Vue({ + el, + components: { + GkeProjectIdDropdown, + }, + render: createElement => + createElement('gke-project-id-dropdown', { + props: { + docsUrl: el.dataset.docsurl, + service: gapi.client.cloudresourcemanager, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +}; + +const mountGkeZoneDropdown = () => { + const el = document.querySelector('.js-gcp-zone-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return false; + + return new Vue({ + el, + components: { + GkeZoneDropdown, + }, + render: createElement => + createElement('gke-zone-dropdown', { + props: { + service: gapi.client.compute, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +}; + +const mountGkeMachineTypeDropdown = () => { + const el = document.querySelector('.js-gcp-machine-type-dropdown-entry-point'); + const hiddenInput = el.querySelector('input'); + + if (!el) return false; + + return new Vue({ + el, + components: { + GkeMachineTypeDropdown, + }, + render: createElement => + createElement('gke-machine-type-dropdown', { + props: { + service: gapi.client.compute, + fieldName: hiddenInput.getAttribute('name'), + fieldId: hiddenInput.getAttribute('id'), + }, + }), + }); +}; + +const gkeDropdownErrorHandler = () => { + Flash(CONSTANTS.GCP_API_ERROR); +}; + +const initializeGapiClient = () => { + const el = document.getElementById('new_cluster'); + + gapi.client.setToken({ access_token: el.dataset.token }); + + gapi.client + .load(CONSTANTS.GCP_API_CLOUD_RESOURCE_MANAGER_ENDPOINT) + .then(() => { + mountGkeProjectIdDropdown(); + }) + .catch(gkeDropdownErrorHandler); + + gapi.client + .load(CONSTANTS.GCP_API_COMPUTE_ENDPOINT) + .then(() => { + mountGkeZoneDropdown(); + mountGkeMachineTypeDropdown(); + }) + .catch(gkeDropdownErrorHandler); +}; + +const initGkeDropdowns = () => { + if (typeof gapi === 'undefined') { + gkeDropdownErrorHandler(); + return false; + } + + return gapi.load('client', initializeGapiClient); +}; + +export default initGkeDropdowns; -- cgit v1.2.1 From 28a45b02180370cce30aa2e4fe05babc59e3e23b Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Sun, 6 May 2018 14:49:05 +0200 Subject: reduce UI jumping with fake help-block element --- app/views/projects/clusters/gcp/_form.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index 1f2fb445d78..9544089fbde 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -23,6 +23,7 @@ %span.dropdown-toggle-text = _('Select project') = icon('chevron-down') + %span.help-block   .form-group = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone') -- cgit v1.2.1 From 2ea263ea437b98ffb4d61cf9ceb63473c9e6212f Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Sun, 6 May 2018 17:40:48 +0200 Subject: refactoring! --- .../components/gke_machine_type_dropdown.vue | 72 ++++++++++------------ .../components/gke_project_id_dropdown.vue | 52 ++++++++++------ .../components/gke_zone_dropdown.vue | 63 +++++++++---------- .../projects/gke_cluster_dropdowns/index.js | 6 +- .../gke_cluster_dropdowns/stores/getters.js | 3 + app/assets/stylesheets/pages/clusters.scss | 2 +- app/views/projects/clusters/gcp/_form.html.haml | 4 +- 7 files changed, 106 insertions(+), 96 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index ff67cf848d2..b55e7bb2d5d 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -1,7 +1,8 @@ -- cgit v1.2.1 From cf65abd8408da8a3c25f711cb5eac34bbc0adb2e Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Tue, 8 May 2018 23:42:58 +0200 Subject: no search results state --- .../gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue | 6 ++++++ .../gke_cluster_dropdowns/components/gke_project_id_dropdown.vue | 6 ++++++ .../projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 42183a04484..1b9bc5d2cff 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -73,6 +73,9 @@ export default { searchPlaceholderText() { return s__('ClusterIntegration|Search machine types'); }, + noSearchResultsText() { + return s__('ClusterIntegration|No machine types matched your search'); + }, }, created() { eventHub.$on('zoneSelected', this.fetchMachineTypes); @@ -135,6 +138,9 @@ export default { />
    +
  • + {{ noSearchResultsText }} +
  • item.name.toLowerCase().indexOf(this.searchQuery) > -1); }, + noSearchResultsText() { + return s__('ClusterIntegration|No projects matched your search'); + }, toggleText() { if (this.isLoading) { return s__('ClusterIntegration|Fetching projects'); @@ -155,6 +158,9 @@ export default { />
      +
    • + {{ noSearchResultsText }} +
      • +
      • + {{ noSearchResultsText }} +
      • Date: Wed, 9 May 2018 09:04:06 +0200 Subject: Deprecate the Kubernetes service docs --- doc/administration/integration/terminal.md | 16 ++- doc/ci/autodeploy/index.md | 130 +------------------ doc/ci/environments.md | 7 +- doc/ci/variables/README.md | 4 +- .../integrations/img/kubernetes_configuration.png | Bin 14407 -> 0 bytes doc/user/project/integrations/kubernetes.md | 138 +-------------------- doc/user/project/integrations/project_services.md | 1 - 7 files changed, 14 insertions(+), 282 deletions(-) delete mode 100644 doc/user/project/integrations/img/kubernetes_configuration.png diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 91e844c7b42..32ad63c3706 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -1,12 +1,13 @@ # Web terminals -> [Introduced][ce-7690] in GitLab 8.15. Only project masters and owners can - access web terminals. +> +[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690) +in GitLab 8.15. Only project masters and owners can access web terminals. -With the introduction of the [Kubernetes project service][kubservice], GitLab -gained the ability to store and use credentials for a Kubernetes cluster. One -of the things it uses these credentials for is providing access to -[web terminals](../../ci/environments.html#web-terminals) for environments. +With the introduction of the [Kubernetes integration](../../user/project/clusters/index.md), +GitLab gained the ability to store and use credentials for a Kubernetes cluster. +One of the things it uses these credentials for is providing access to +[web terminals](../../ci/environments.md#web-terminals) for environments. ## How it works @@ -80,6 +81,3 @@ Terminal sessions use long-lived connections; by default, these may last forever. You can configure a maximum session time in the Admin area of your GitLab instance if you find this undesirable from a scalability or security point of view. - -[ce-7690]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690 -[kubservice]: ../../user/project/integrations/kubernetes.md diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md index 7102af5c529..985ec4b972c 100644 --- a/doc/ci/autodeploy/index.md +++ b/doc/ci/autodeploy/index.md @@ -1,129 +1 @@ -# Auto Deploy - -> [Introduced][mr-8135] in GitLab 8.15. -> Auto deploy is an experimental feature and is **not recommended for Production use** at this time. - -> As of GitLab 9.1, access to the container registry is only available while the -Pipeline is running. Restarting a pod, scaling a service, or other actions which -require on-going access **will fail**. On-going secure access is planned for a -subsequent release. - -> As of GitLab 10.0, Auto Deploy templates are **deprecated** and the -functionality has been included in [Auto -DevOps](../../topics/autodevops/index.md). - -Auto deploy is an easy way to configure GitLab CI for the deployment of your -application. GitLab Community maintains a list of `.gitlab-ci.yml` -templates for various infrastructure providers and deployment scripts -powering them. These scripts are responsible for packaging your application, -setting up the infrastructure and spinning up necessary services (for -example a database). - -## How it works - -The Autodeploy templates are based on the [kubernetes-deploy][kube-deploy] -project which is used to simplify the deployment process to Kubernetes by -providing intelligent `build`, `deploy`, and `destroy` commands which you can -use in your `.gitlab-ci.yml` as is. It uses [Herokuish](https://github.com/gliderlabs/herokuish), -which uses [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) -to do some of the work, plus some of GitLab's own tools to package it all up. For -your convenience, a [Docker image][kube-image] is also provided. - -You can use the [Kubernetes project service](../../user/project/integrations/kubernetes.md) -to store credentials to your infrastructure provider and they will be available -during the deployment. - -## Quick start - -We made a [simple guide](quick_start_guide.md) to using Auto Deploy with GitLab.com. - -For a demonstration of GitLab Auto Deploy, read the blog post [Auto Deploy from GitLab to an OpenShift Container Cluster](https://about.gitlab.com/2017/05/16/devops-containers-gitlab-openshift/) - -## Supported templates - -The list of supported auto deploy templates is available in the -[gitlab-ci-yml project][auto-deploy-templates]. - -## Configuration - ->**Note:** -In order to understand why the following steps are required, read the -[how it works](#how-it-works) section. - -To configure Autodeploy, you will need to: - -1. Enable a deployment [project service][project-services] to store your - credentials. For example, if you want to deploy to OpenShift you have to - enable [Kubernetes service][kubernetes-service]. -1. Configure GitLab Runner to use the - [Docker or Kubernetes executor](https://docs.gitlab.com/runner/executors/) with - [privileged mode enabled][docker-in-docker]. -1. Navigate to the "Project" tab and click "Set up auto deploy" button. - ![Auto deploy button](img/auto_deploy_button.png) -1. Select a template. - ![Dropdown with auto deploy templates](img/auto_deploy_dropdown.png) -1. Commit your changes and create a merge request. -1. Test your deployment configuration using a [Review App][review-app] that was - created automatically for you. - -## Private project support - -> Experimental support [introduced][mr-2] in GitLab 9.1. - -When a project has been marked as private, GitLab's [Container Registry][container-registry] requires authentication when downloading containers. Auto deploy will automatically provide the required authentication information to Kubernetes, allowing temporary access to the registry. Authentication credentials will be valid while the pipeline is running, allowing for a successful initial deployment. - -After the pipeline completes, Kubernetes will no longer be able to access the container registry. Restarting a pod, scaling a service, or other actions which require on-going access to the registry will fail. On-going secure access is planned for a subsequent release. - -## PostgreSQL database support - -> Experimental support [introduced][mr-8] in GitLab 9.1. - -In order to support applications that require a database, [PostgreSQL][postgresql] is provisioned by default. Credentials to access the database are preconfigured, but can be customized by setting the associated [variables](#postgresql-variables). These credentials can be used for defining a `DATABASE_URL` of the format: `postgres://user:password@postgres-host:postgres-port/postgres-database`. It is important to note that the database itself is temporary, and contents will be not be saved. - -PostgreSQL provisioning can be disabled by setting the variable `DISABLE_POSTGRES` to `"yes"`. - -The following PostgreSQL variables are supported: - -1. `DISABLE_POSTGRES: "yes"`: disable automatic deployment of PostgreSQL -1. `POSTGRES_USER: "my-user"`: use custom username for PostgreSQL -1. `POSTGRES_PASSWORD: "password"`: use custom password for PostgreSQL -1. `POSTGRES_DB: "my database"`: use custom database name for PostgreSQL - -## Auto Monitoring - -> Introduced in [GitLab 9.5](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13438). - -Apps auto-deployed using one the [Kubernetes templates](#supported-templates) can also be automatically monitored for: - -* Response Metrics: latency, throughput, error rate -* System Metrics: CPU utilization, memory utilization - -Metrics are gathered from [nginx-ingress](../../user/project/integrations/prometheus_library/nginx_ingress.md) and [Kubernetes](../../user/project/integrations/prometheus_library/kubernetes.md). - -To view the metrics, open the [Monitoring dashboard for a deployed environment](../environments.md#monitoring-environments). - -![Auto Metrics](img/auto_monitoring.png) - -### Configuring Auto Monitoring - -If GitLab has been deployed using the [omnibus-gitlab](../../install/kubernetes/gitlab_omnibus.md) Helm chart, no configuration is required. - -If you have installed GitLab using a different method: - -1. [Deploy Prometheus](../../user/project/integrations/prometheus.md#configuring-your-own-prometheus-server-within-kubernetes) into your Kubernetes cluster -1. If you would like response metrics, ensure you are running at least version 0.9.0 of NGINX Ingress and [enable Prometheus metrics](https://github.com/kubernetes/ingress/blob/master/examples/customization/custom-vts-metrics/nginx/nginx-vts-metrics-conf.yaml). -1. Finally, [annotate](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) the NGINX Ingress deployment to be scraped by Prometheus using `prometheus.io/scrape: "true"` and `prometheus.io/port: "10254"`. - -[mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135 -[mr-2]: https://gitlab.com/gitlab-examples/kubernetes-deploy/merge_requests/2 -[mr-8]: https://gitlab.com/gitlab-examples/kubernetes-deploy/merge_requests/8 -[project-settings]: https://docs.gitlab.com/ce/public_access/public_access.html -[project-services]: ../../user/project/integrations/project_services.md -[auto-deploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy -[kubernetes-service]: ../../user/project/integrations/kubernetes.md -[docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor -[review-app]: ../review_apps/index.md -[kube-image]: https://gitlab.com/gitlab-examples/kubernetes-deploy/container_registry "Kubernetes deploy Container Registry" -[kube-deploy]: https://gitlab.com/gitlab-examples/kubernetes-deploy "Kubernetes deploy example project" -[container-registry]: https://docs.gitlab.com/ce/user/project/container_registry.html -[postgresql]: https://www.postgresql.org/ +This document was moved to [another location](../../topics/autodevops/index.md#auto-deploy). diff --git a/doc/ci/environments.md b/doc/ci/environments.md index 517e25f00f7..526a194856b 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -24,7 +24,7 @@ Environments are like tags for your CI jobs, describing where code gets deployed Deployments are created when [jobs] deploy versions of code to environments, so every environment can have one or more deployments. GitLab keeps track of your deployments, so you always know what is currently being deployed on your -servers. If you have a deployment service such as [Kubernetes][kubernetes-service] +servers. If you have a deployment service such as [Kubernetes][kube] enabled for your project, you can use it to assist with your deployments, and can even access a [web terminal](#web-terminals) for your environment from within GitLab! @@ -604,7 +604,7 @@ Web terminals were added in GitLab 8.15 and are only available to project masters and owners. If you deploy to your environments with the help of a deployment service (e.g., -the [Kubernetes service][kubernetes-service]), GitLab can open +the [Kubernetes integration][kube]), GitLab can open a terminal session to your environment! This is a very powerful feature that allows you to debug issues without leaving the comfort of your web browser. To enable it, just follow the instructions given in the service integration @@ -670,7 +670,6 @@ Below are some links you may find interesting: [Pipelines]: pipelines.md [jobs]: yaml/README.md#jobs [yaml]: yaml/README.md -[kubernetes-service]: ../user/project/integrations/kubernetes.md [environments]: #environments [deployments]: #deployments [permissions]: ../user/permissions.md @@ -682,5 +681,5 @@ Below are some links you may find interesting: [gitlab-flow]: ../workflow/gitlab_flow.md [gitlab runner]: https://docs.gitlab.com/runner/ [git-strategy]: yaml/README.md#git-strategy -[kube]: ../user/project/integrations/kubernetes.md +[kube]: ../user/project/clusters/index.md [prom]: ../user/project/integrations/prometheus.md diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 42367bf13f7..8489a91e7f3 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -215,8 +215,8 @@ are set in the build environment. These variables are only defined for [deployment jobs](../environments.md). Please consult the documentation of the project services that you are using to learn which variables they define. -An example project service that defines deployment variables is -[Kubernetes Service](../../user/project/integrations/kubernetes.md#deployment-variables). +An example project service that defines deployment variables is the +[Kubernetes integration](../../user/project/clusters/index.md#deployment-variables). ## Debug tracing diff --git a/doc/user/project/integrations/img/kubernetes_configuration.png b/doc/user/project/integrations/img/kubernetes_configuration.png deleted file mode 100644 index e535e2b8d46..00000000000 Binary files a/doc/user/project/integrations/img/kubernetes_configuration.png and /dev/null differ diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index f502d1c9821..9342a2cbb00 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -1,137 +1 @@ ---- -last_updated: 2017-12-28 ---- - -# GitLab Kubernetes / OpenShift integration - -CAUTION: **Warning:** -The Kubernetes service integration has been deprecated in GitLab 10.3. If the -service is active, the cluster information will still be editable, however we -advise to disable and reconfigure the clusters using the new -[Clusters](../clusters/index.md) page. If the service is inactive, the fields -will not be editable. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information. - -GitLab can be configured to interact with Kubernetes, or other systems using the -Kubernetes API (such as OpenShift). - -Each project can be configured to connect to a different Kubernetes cluster, see -the [configuration](#configuration) section. - -## Configuration - -Navigate to the [Integrations page](project_services.md#accessing-the-project-services) -of your project and select the **Kubernetes** service to configure it. Fill in -all the needed parameters, check the "Active" checkbox and hit **Save changes** -for the changes to take effect. - -![Kubernetes configuration settings](img/kubernetes_configuration.png) - -The Kubernetes service takes the following parameters: - -- **API URL** - - It's the URL that GitLab uses to access the Kubernetes API. Kubernetes - exposes several APIs, we want the "base" URL that is common to all of them, - e.g., `https://kubernetes.example.com` rather than `https://kubernetes.example.com/api/v1`. -- **CA certificate** (optional) - - If the API is using a self-signed TLS certificate, you'll also need to include - the `ca.crt` contents here. -- **Project namespace** (optional) - The following apply: - - By default you don't have to fill it in; by leaving it blank, GitLab will - create one for you. - - Each project should have a unique namespace. - - The project namespace is not necessarily the namespace of the secret, if - you're using a secret with broader permissions, like the secret from `default`. - - You should **not** use `default` as the project namespace. - - If you or someone created a secret specifically for the project, usually - with limited permissions, the secret's namespace and project namespace may - be the same. -- **Token** - - GitLab authenticates against Kubernetes using service tokens, which are - scoped to a particular `namespace`. If you don't have a service token yet, - you can follow the - [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) - to create one. You can also view or create service tokens in the - [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config) - (under **Config > Secrets**). - -TIP: **Tip:** -If you have a single cluster that you want to use for all your projects, -you can pre-fill the settings page with a default template. To configure the -template, see [Services Templates](services_templates.md). - -## Deployment variables - -The Kubernetes service exposes the following -[deployment variables](../../../ci/variables/README.md#deployment-variables) in the -GitLab CI/CD build environment: - -- `KUBE_URL` - Equal to the API URL. -- `KUBE_TOKEN` - The Kubernetes token. -- `KUBE_NAMESPACE` - The Kubernetes namespace is auto-generated if not specified. - The default value is `-`. You can overwrite it to - use different one if needed, otherwise the `KUBE_NAMESPACE` variable will - receive the default value. -- `KUBE_CA_PEM_FILE` - Only present if a custom CA bundle was specified. Path - to a file containing PEM data. -- `KUBE_CA_PEM` (deprecated) - Only if a custom CA bundle was specified. Raw PEM data. -- `KUBECONFIG` - Path to a file containing `kubeconfig` for this deployment. - CA bundle would be embedded if specified. - -## What you can get with the Kubernetes integration - -Here's what you can do with GitLab if you enable the Kubernetes integration. - -### Deploy Boards - -> Available in [GitLab Premium][ee]. - -GitLab's Deploy Boards offer a consolidated view of the current health and -status of each CI [environment](../../../ci/environments.md) running on Kubernetes, -displaying the status of the pods in the deployment. Developers and other -teammates can view the progress and status of a rollout, pod by pod, in the -workflow they already use without any need to access Kubernetes. - -[> Read more about Deploy Boards](https://docs.gitlab.com/ee/user/project/deploy_boards.html) - -### Canary Deployments - -> Available in [GitLab Premium][ee]. - -Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments) -and visualize your canary deployments right inside the Deploy Board, without -the need to leave GitLab. - -[> Read more about Canary Deployments](https://docs.gitlab.com/ee/user/project/canary_deployments.html) - -### Kubernetes monitoring - -Automatically detect and monitor Kubernetes metrics. Automatic monitoring of -[NGINX ingress](./prometheus_library/nginx.md) is also supported. - -[> Read more about Kubernetes monitoring](prometheus_library/kubernetes.md) - -### Auto DevOps - -Auto DevOps automatically detects, builds, tests, deploys, and monitors your -applications. - -To make full use of Auto DevOps(Auto Deploy, Auto Review Apps, and Auto Monitoring) -you will need the Kubernetes project integration enabled. - -[> Read more about Auto DevOps](../../../topics/autodevops/index.md) - -### Web terminals - -NOTE: **Note:** -Introduced in GitLab 8.15. You must be the project owner or have `master` permissions -to use terminals. Support is limited to the first container in the -first pod of your environment. - -When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) -support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in -Docker and Kubernetes, so you get a new shell session within your existing -containers. To use this integration, you should deploy to Kubernetes using -the deployment variables above, ensuring any pods you create are labelled with -`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest! - -[ee]: https://about.gitlab.com/products/ +This document was moved to [another location](../clusters/index.md). diff --git a/doc/user/project/integrations/project_services.md b/doc/user/project/integrations/project_services.md index 9496d6f2ce0..f19fc8ddf20 100644 --- a/doc/user/project/integrations/project_services.md +++ b/doc/user/project/integrations/project_services.md @@ -39,7 +39,6 @@ Click on the service links to see further configuration instructions and details | [Irker (IRC gateway)](irker.md) | Send IRC messages, on update, to a list of recipients through an Irker gateway | | [JIRA](jira.md) | JIRA issue tracker | | JetBrains TeamCity CI | A continuous integration and build server | -| [Kubernetes](kubernetes.md) _(Has been deprecated in GitLab 10.3)_ | A containerized deployment service | | [Mattermost slash commands](mattermost_slash_commands.md) | Mattermost chat and ChatOps slash commands | | [Mattermost Notifications](mattermost.md) | Receive event notifications in Mattermost | | [Microsoft teams](microsoft_teams.md) | Receive notifications for actions that happen on GitLab into a room on Microsoft Teams using Office 365 Connectors | -- cgit v1.2.1 From 84452bfacaac63df5c431084c596ff254216b08e Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 14:30:14 +0200 Subject: check for submitButton fixes issue with tests when only the component is being tested --- .../gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 1b9bc5d2cff..3af7cd07237 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -109,7 +109,11 @@ export default { }, enableSubmit() { if (this.hasProject && this.hasZone && this.hasMachineType) { - document.querySelector('.js-gke-cluster-creation-submit').removeAttribute('disabled'); + const submitButtonEl = document.querySelector('.js-gke-cluster-creation-submit'); + + if (submitButtonEl) { + submitButtonEl.removeAttribute('disabled'); + } } }, }, -- cgit v1.2.1 From 4f001a3abfb903e8e2045907c0f6e1f08ca5ab98 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 14:32:53 +0200 Subject: gcp dropdown component tests --- .../components/gke_machine_type_dropdown_spec.js | 99 ++++++++++++++++++++++ .../components/gke_project_id_dropdown_spec.js | 93 ++++++++++++++++++++ .../components/gke_zone_dropdown_spec.js | 82 ++++++++++++++++++ .../projects/gke_cluster_dropdowns/mock_data.js | 5 ++ 4 files changed, 279 insertions(+) create mode 100644 spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js create mode 100644 spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js create mode 100644 spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js new file mode 100644 index 00000000000..471465528ec --- /dev/null +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -0,0 +1,99 @@ +import Vue from 'vue'; +import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue'; +import { + SET_PROJECT, + SET_ZONE, + SET_FETCHED_ZONES, + SET_FETCHED_MACHINE_TYPES, +} from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; + +import { resetStore } from '../helpers'; +import { + selectedZoneMock, + selectedProjectMock, + selectedMachineTypeMock, + gapiZonesResponseMock, + gapiMachineTypesResponseMock, +} from '../mock_data'; + +const componentConfig = { + fieldId: 'cluster_provider_gcp_attributes_gcp_machine_type', + fieldName: 'cluster[provider_gcp_attributes][gcp_machine_type]', +}; + +const LABELS = { + LOADING: 'Fetching machine types', + DISABLED_NO_PROJECT: 'Select project and zone to choose machine type', + DISABLED_NO_ZONE: 'Select zone to choose machine type', + DEFAULT: 'Select machine type', +}; + +const createComponent = (config = componentConfig) => { + const Component = Vue.extend(GkeMachineTypeDropdown); + + return mountComponent(Component, config); +}; + +describe('GkeMachineTypeDropdown', () => { + let vm; + + beforeEach(() => { + vm = createComponent(); + }); + + afterEach(() => { + vm.$destroy(); + + resetStore(vm.$store); + }); + + describe('shows various toggle text depending on state', () => { + it('returns disabled state toggle text when no project and zone are selected', () => { + expect(vm.toggleText).toBe(LABELS.DISABLED_NO_PROJECT); + }); + + it('returns disabled state toggle text when no zone is selected', () => { + vm.$store.commit(SET_PROJECT, selectedProjectMock); + + expect(vm.toggleText).toBe(LABELS.DISABLED_NO_ZONE); + }); + + it('returns loading toggle text', () => { + vm.isLoading = true; + + expect(vm.toggleText).toBe(LABELS.LOADING); + }); + + it('returns default toggle text', () => { + expect(vm.toggleText).toBe(LABELS.DISABLED_NO_PROJECT); + + vm.$store.commit(SET_PROJECT, selectedProjectMock); + vm.$store.commit(SET_ZONE, selectedZoneMock); + + expect(vm.toggleText).toBe(LABELS.DEFAULT); + }); + + it('returns machine type name if machine type selected', () => { + vm.setMachineType(selectedMachineTypeMock); + + expect(vm.toggleText).toBe(selectedMachineTypeMock); + }); + }); + + describe('form input', () => { + it('reflects new value when dropdown item is clicked', done => { + expect(vm.$el.querySelector('input').value).toBe(''); + vm.$store.commit(SET_FETCHED_MACHINE_TYPES, gapiMachineTypesResponseMock.items); + + vm.$nextTick(() => { + vm.$el.querySelector('.dropdown-content button').click(); + + vm.$nextTick(() => { + expect(vm.$el.querySelector('input').value).toBe(selectedMachineTypeMock); + done(); + }); + }); + }); + }); +}); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js new file mode 100644 index 00000000000..ae2fbb39375 --- /dev/null +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -0,0 +1,93 @@ +import Vue from 'vue'; +import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; +import { SET_FETCHED_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; + +import { resetStore } from '../helpers'; +import { emptyProjectMock, selectedProjectMock } from '../mock_data'; + +const componentConfig = { + docsUrl: 'https://console.cloud.google.com/home/dashboard', + fieldId: 'cluster_provider_gcp_attributes_gcp_project_id', + fieldName: 'cluster[provider_gcp_attributes][gcp_project_id]', +}; + +const LABELS = { + LOADING: 'Fetching projects', + DEFAULT: 'Select project', + EMPTY: 'No projects found', +}; + +const createComponent = (config = componentConfig) => { + const Component = Vue.extend(GkeProjectIdDropdown); + + return mountComponent(Component, config); +}; + +describe('GkeProjectIdDropdown', () => { + let vm; + + beforeEach(() => { + vm = createComponent(); + }); + + afterEach(() => { + vm.$destroy(); + + resetStore(vm.$store); + }); + + describe('toggleText', () => { + it('returns loading toggle text', () => { + expect(vm.toggleText).toBe(LABELS.LOADING); + }); + + it('returns default toggle text', done => { + vm.$nextTick(() => { + vm.$nextTick(() => { + vm.setProject(emptyProjectMock); + + expect(vm.toggleText).toBe(LABELS.DEFAULT); + done(); + }); + }); + }); + + it('returns project name if project selected', done => { + vm.$nextTick(() => { + vm.$nextTick(() => { + expect(vm.toggleText).toBe(selectedProjectMock.name); + done(); + }); + }); + }); + + it('returns empty toggle text', done => { + vm.$nextTick(() => { + vm.$store.commit(SET_FETCHED_PROJECTS, []); + vm.setProject(emptyProjectMock); + + vm.$nextTick(() => { + expect(vm.toggleText).toBe(LABELS.EMPTY); + done(); + }); + }); + }); + }); + + describe('selectItem', () => { + it('reflects new value when dropdown item is clicked', done => { + expect(vm.$el.querySelector('input').value).toBe(''); + + vm.$nextTick(() => { + vm.$nextTick(() => { + vm.$el.querySelector('.dropdown-content button').click(); + vm.$nextTick(() => { + expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId); + done(); + }); + }); + }); + }); + }); +}); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js new file mode 100644 index 00000000000..0b9b7318519 --- /dev/null +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -0,0 +1,82 @@ +import Vue from 'vue'; +import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; +import { + SET_PROJECT, + SET_FETCHED_ZONES, +} from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; + +import { resetStore } from '../helpers'; +import { selectedZoneMock, selectedProjectMock, gapiZonesResponseMock } from '../mock_data'; + +const componentConfig = { + fieldId: 'cluster_provider_gcp_attributes_gcp_zone', + fieldName: 'cluster[provider_gcp_attributes][gcp_zone]', +}; + +const LABELS = { + LOADING: 'Fetching zones', + DISABLED: 'Select project to choose zone', + DEFAULT: 'Select zone', +}; + +const createComponent = (config = componentConfig) => { + const Component = Vue.extend(GkeZoneDropdown); + + return mountComponent(Component, config); +}; + +describe('GkeZoneDropdown', () => { + let vm; + + beforeEach(() => { + vm = createComponent(); + }); + + afterEach(() => { + vm.$destroy(); + + resetStore(vm.$store); + }); + + describe('toggleText', () => { + it('returns disabled state toggle text', () => { + expect(vm.toggleText).toBe(LABELS.DISABLED); + }); + + it('returns loading toggle text', () => { + vm.isLoading = true; + + expect(vm.toggleText).toBe(LABELS.LOADING); + }); + + it('returns default toggle text', () => { + expect(vm.toggleText).toBe(LABELS.DISABLED); + + vm.$store.commit(SET_PROJECT, selectedProjectMock); + expect(vm.toggleText).toBe(LABELS.DEFAULT); + }); + + it('returns project name if project selected', () => { + vm.setZone(selectedZoneMock); + + expect(vm.toggleText).toBe(selectedZoneMock); + }); + }); + + describe('selectItem', () => { + it('reflects new value when dropdown item is clicked', done => { + expect(vm.$el.querySelector('input').value).toBe(''); + vm.$store.commit(SET_FETCHED_ZONES, gapiZonesResponseMock.items); + + vm.$nextTick(() => { + vm.$el.querySelector('.dropdown-content button').click(); + + vm.$nextTick(() => { + expect(vm.$el.querySelector('input').value).toBe(selectedZoneMock); + done(); + }); + }); + }); + }); +}); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/mock_data.js b/spec/javascripts/projects/gke_cluster_dropdowns/mock_data.js index 86ca5d81f15..d9f5dbc636f 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/mock_data.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/mock_data.js @@ -1,3 +1,8 @@ +export const emptyProjectMock = { + projectId: '', + name: '', +}; + export const selectedProjectMock = { projectId: 'gcp-project-123', name: 'gcp-project', -- cgit v1.2.1 From f86f94503b84ca89d09f5ef6cc0404af7394ff65 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 14:52:17 +0200 Subject: =?UTF-8?q?removed=20=E2=80=9Efetched=E2=80=9C=20prefix=20from=20m?= =?UTF-8?q?utation=20and=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gke_machine_type_dropdown.vue | 3 +- .../components/gke_project_id_dropdown.vue | 3 +- .../components/gke_zone_dropdown.vue | 3 +- .../gke_cluster_dropdowns/stores/actions.js | 6 ++-- .../projects/gke_cluster_dropdowns/stores/index.js | 6 ++-- .../gke_cluster_dropdowns/stores/mutation_types.js | 6 ++-- .../gke_cluster_dropdowns/stores/mutations.js | 12 ++++---- .../components/gke_machine_type_dropdown_spec.js | 6 ++-- .../components/gke_project_id_dropdown_spec.js | 4 +-- .../components/gke_zone_dropdown_spec.js | 7 ++--- .../projects/gke_cluster_dropdowns/helpers.js | 6 ++-- .../gke_cluster_dropdowns/stores/actions_spec.js | 8 ++--- .../gke_cluster_dropdowns/stores/mutations_spec.js | 36 +++++++++++----------- 13 files changed, 50 insertions(+), 56 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 3af7cd07237..2ab1e48488c 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -42,8 +42,7 @@ export default { }; }, computed: { - ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType']), - ...mapState({ machineTypes: 'fetchedMachineTypes' }), + ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType', 'machineTypes']), ...mapGetters(['hasProject', 'hasZone', 'hasMachineType']), isDisabled() { return !this.selectedProject || !this.selectedZone; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 92d69f7288a..f813f784d47 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -45,8 +45,7 @@ export default { }; }, computed: { - ...mapState(['selectedProject']), - ...mapState({ projects: 'fetchedProjects' }), + ...mapState(['selectedProject', 'projects']), ...mapGetters(['hasProject']), hasOneProject() { return this.projects.length === 1; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index b33f8f8f519..7ba949b6989 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -42,8 +42,7 @@ export default { }; }, computed: { - ...mapState(['selectedProject', 'selectedZone']), - ...mapState({ zones: 'fetchedZones' }), + ...mapState(['selectedProject', 'selectedZone', 'zones']), ...mapGetters(['hasProject']), isDisabled() { return !this.hasProject; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js index 3ad5543a4f7..507cc5f8b62 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js @@ -29,7 +29,7 @@ export const getProjects = ({ commit }) => return request.then( resp => { - commit(types.SET_FETCHED_PROJECTS, resp.result.projects); + commit(types.SET_PROJECTS, resp.result.projects); resolve(); }, @@ -60,7 +60,7 @@ export const getZones = ({ commit, state }) => return request.then( resp => { - commit(types.SET_FETCHED_ZONES, resp.result.items); + commit(types.SET_ZONES, resp.result.items); resolve(); }, @@ -90,7 +90,7 @@ export const getMachineTypes = ({ commit, state }) => return request.then( resp => { - commit(types.SET_FETCHED_MACHINE_TYPES, resp.result.items); + commit(types.SET_MACHINE_TYPES, resp.result.items); resolve(); }, diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js index af6d89f5966..ec71a49c97a 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/index.js @@ -17,8 +17,8 @@ export default new Vuex.Store({ }, selectedZone: '', selectedMachineType: '', - fetchedProjects: [], - fetchedZones: [], - fetchedMachineTypes: [], + projects: [], + zones: [], + machineTypes: [], }, }); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js index 47f61a178ca..6577612b4cd 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutation_types.js @@ -1,6 +1,6 @@ export const SET_PROJECT = 'SET_PROJECT'; export const SET_ZONE = 'SET_ZONE'; export const SET_MACHINE_TYPE = 'SET_MACHINE_TYPE'; -export const SET_FETCHED_PROJECTS = 'SET_FETCHED_PROJECTS'; -export const SET_FETCHED_ZONES = 'SET_FETCHED_ZONES'; -export const SET_FETCHED_MACHINE_TYPES = 'SET_FETCHED_MACHINE_TYPES'; +export const SET_PROJECTS = 'SET_PROJECTS'; +export const SET_ZONES = 'SET_ZONES'; +export const SET_MACHINE_TYPES = 'SET_MACHINE_TYPES'; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js index 5ae2170115f..95b7ed68053 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/mutations.js @@ -10,13 +10,13 @@ export default { [types.SET_MACHINE_TYPE](state, selectedMachineType) { Object.assign(state, { selectedMachineType }); }, - [types.SET_FETCHED_PROJECTS](state, fetchedProjects) { - Object.assign(state, { fetchedProjects }); + [types.SET_PROJECTS](state, projects) { + Object.assign(state, { projects }); }, - [types.SET_FETCHED_ZONES](state, fetchedZones) { - Object.assign(state, { fetchedZones }); + [types.SET_ZONES](state, zones) { + Object.assign(state, { zones }); }, - [types.SET_FETCHED_MACHINE_TYPES](state, fetchedMachineTypes) { - Object.assign(state, { fetchedMachineTypes }); + [types.SET_MACHINE_TYPES](state, machineTypes) { + Object.assign(state, { machineTypes }); }, }; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index 471465528ec..d22c43c67e2 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -3,8 +3,8 @@ import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/ import { SET_PROJECT, SET_ZONE, - SET_FETCHED_ZONES, - SET_FETCHED_MACHINE_TYPES, + SET_ZONES, + SET_MACHINE_TYPES, } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; @@ -84,7 +84,7 @@ describe('GkeMachineTypeDropdown', () => { describe('form input', () => { it('reflects new value when dropdown item is clicked', done => { expect(vm.$el.querySelector('input').value).toBe(''); - vm.$store.commit(SET_FETCHED_MACHINE_TYPES, gapiMachineTypesResponseMock.items); + vm.$store.commit(SET_MACHINE_TYPES, gapiMachineTypesResponseMock.items); vm.$nextTick(() => { vm.$el.querySelector('.dropdown-content button').click(); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js index ae2fbb39375..28b1dc466f7 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; -import { SET_FETCHED_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; @@ -64,7 +64,7 @@ describe('GkeProjectIdDropdown', () => { it('returns empty toggle text', done => { vm.$nextTick(() => { - vm.$store.commit(SET_FETCHED_PROJECTS, []); + vm.$store.commit(SET_PROJECTS, []); vm.setProject(emptyProjectMock); vm.$nextTick(() => { diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js index 0b9b7318519..cb137e33a0d 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -1,9 +1,6 @@ import Vue from 'vue'; import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; -import { - SET_PROJECT, - SET_FETCHED_ZONES, -} from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECT, SET_ZONES } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; @@ -67,7 +64,7 @@ describe('GkeZoneDropdown', () => { describe('selectItem', () => { it('reflects new value when dropdown item is clicked', done => { expect(vm.$el.querySelector('input').value).toBe(''); - vm.$store.commit(SET_FETCHED_ZONES, gapiZonesResponseMock.items); + vm.$store.commit(SET_ZONES, gapiZonesResponseMock.items); vm.$nextTick(() => { vm.$el.querySelector('.dropdown-content button').click(); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js b/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js index 612bc19fce1..c34190d02f2 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js @@ -13,9 +13,9 @@ export const resetStore = store => { }, selectedZone: '', selectedMachineType: '', - fetchedProjects: [], - fetchedZones: [], - fetchedMachineTypes: [], + projects: [], + zones: [], + machineTypes: [], }); }; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js index 5e4ea027d7d..501113d7f33 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js @@ -56,8 +56,8 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getProjects') .then(() => { - expect(store.state.fetchedProjects[0].projectId).toEqual(selectedProjectMock.projectId); - expect(store.state.fetchedProjects[0].name).toEqual(selectedProjectMock.name); + expect(store.state.projects[0].projectId).toEqual(selectedProjectMock.projectId); + expect(store.state.projects[0].name).toEqual(selectedProjectMock.name); done(); }) @@ -70,7 +70,7 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getZones') .then(() => { - expect(store.state.fetchedZones[0].name).toEqual(selectedZoneMock); + expect(store.state.zones[0].name).toEqual(selectedZoneMock); done(); }) @@ -83,7 +83,7 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getMachineTypes') .then(() => { - expect(store.state.fetchedMachineTypes[0].name).toEqual(selectedMachineTypeMock); + expect(store.state.machineTypes[0].name).toEqual(selectedMachineTypeMock); done(); }) diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js index 0db3266349e..5569f88467f 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js @@ -52,45 +52,45 @@ describe('GCP Cluster Dropdown Store Mutations', () => { }); }); - describe('SET_FETCHED_PROJECTS', () => { - it('should set Google API Projects response as fetchedProjects', () => { + describe('SET_PROJECTS', () => { + it('should set Google API Projects response as projects', () => { const state = { - fetchedProjects: [], + projects: [], }; - expect(state.fetchedProjects.length).toEqual(0); + expect(state.projects.length).toEqual(0); - mutations.SET_FETCHED_PROJECTS(state, gapiProjectsResponseMock.projects); + mutations.SET_PROJECTS(state, gapiProjectsResponseMock.projects); - expect(state.fetchedProjects.length).toEqual(gapiProjectsResponseMock.projects.length); + expect(state.projects.length).toEqual(gapiProjectsResponseMock.projects.length); }); }); - describe('SET_FETCHED_ZONES', () => { - it('should set Google API Zones response as fetchedZones', () => { + describe('SET_ZONES', () => { + it('should set Google API Zones response as zones', () => { const state = { - fetchedZones: [], + zones: [], }; - expect(state.fetchedZones.length).toEqual(0); + expect(state.zones.length).toEqual(0); - mutations.SET_FETCHED_ZONES(state, gapiZonesResponseMock.items); + mutations.SET_ZONES(state, gapiZonesResponseMock.items); - expect(state.fetchedZones.length).toEqual(gapiZonesResponseMock.items.length); + expect(state.zones.length).toEqual(gapiZonesResponseMock.items.length); }); }); - describe('SET_FETCHED_MACHINE_TYPES', () => { - it('should set Google API Machine Types response as fetchedMachineTypes', () => { + describe('SET_MACHINE_TYPES', () => { + it('should set Google API Machine Types response as machineTypes', () => { const state = { - fetchedMachineTypes: [], + machineTypes: [], }; - expect(state.fetchedMachineTypes.length).toEqual(0); + expect(state.machineTypes.length).toEqual(0); - mutations.SET_FETCHED_MACHINE_TYPES(state, gapiMachineTypesResponseMock.items); + mutations.SET_MACHINE_TYPES(state, gapiMachineTypesResponseMock.items); - expect(state.fetchedMachineTypes.length).toEqual(gapiMachineTypesResponseMock.items.length); + expect(state.machineTypes.length).toEqual(gapiMachineTypesResponseMock.items.length); }); }); }); -- cgit v1.2.1 From 4b752e2e17028fb005fde0189c872d3848e73197 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 14:58:23 +0200 Subject: remove unused dependencies --- .../gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index d22c43c67e2..421ec74bb65 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -3,7 +3,6 @@ import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/ import { SET_PROJECT, SET_ZONE, - SET_ZONES, SET_MACHINE_TYPES, } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; @@ -13,7 +12,6 @@ import { selectedZoneMock, selectedProjectMock, selectedMachineTypeMock, - gapiZonesResponseMock, gapiMachineTypesResponseMock, } from '../mock_data'; -- cgit v1.2.1 From e73da567c1d9a8b31622d9cca39a7a833527f21e Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 15:05:44 +0200 Subject: clean up enableSubmit check --- .../gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 2ab1e48488c..5e208bec9e8 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -44,6 +44,9 @@ export default { computed: { ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType', 'machineTypes']), ...mapGetters(['hasProject', 'hasZone', 'hasMachineType']), + allDropdownsSelected() { + return this.hasProject && this.hasZone && this.hasMachineType; + }, isDisabled() { return !this.selectedProject || !this.selectedZone; }, @@ -107,7 +110,7 @@ export default { }); }, enableSubmit() { - if (this.hasProject && this.hasZone && this.hasMachineType) { + if (this.allDropdownsSelected) { const submitButtonEl = document.querySelector('.js-gke-cluster-creation-submit'); if (submitButtonEl) { -- cgit v1.2.1 From c997c4cc7ffbc9a4ee14e882f022be9fe7b1e4ed Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 15:15:08 +0200 Subject: use watchers instead of eventHub --- .../components/gke_machine_type_dropdown.vue | 11 +++++++---- .../gke_cluster_dropdowns/components/gke_zone_dropdown.vue | 7 ++++--- .../projects/gke_cluster_dropdowns/stores/actions.js | 7 ------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 5e208bec9e8..d65600117c0 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -7,7 +7,6 @@ import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_searc import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; -import eventHub from '../eventhub'; import store from '../stores'; export default { @@ -79,9 +78,13 @@ export default { return s__('ClusterIntegration|No machine types matched your search'); }, }, - created() { - eventHub.$on('zoneSelected', this.fetchMachineTypes); - eventHub.$on('machineTypeSelected', this.enableSubmit); + watch: { + selectedZone() { + this.fetchMachineTypes(); + }, + selectedMachineType() { + this.enableSubmit(); + }, }, methods: { ...mapActions(['setMachineType', 'getMachineTypes']), diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 7ba949b6989..f27cee3bf07 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -7,7 +7,6 @@ import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_searc import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; -import eventHub from '../eventhub'; import store from '../stores'; export default { @@ -70,8 +69,10 @@ export default { return s__('ClusterIntegration|No zones matched your search'); }, }, - created() { - eventHub.$on('projectSelected', this.fetchZones); + watch: { + selectedProject() { + this.fetchZones(); + }, }, methods: { ...mapActions(['setZone', 'getZones']), diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js index 507cc5f8b62..dba12ac28ca 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js @@ -3,24 +3,17 @@ import Flash from '~/flash'; import { s__, sprintf } from '~/locale'; import * as types from './mutation_types'; -import eventHub from '../eventhub'; export const setProject = ({ commit }, selectedProject) => { commit(types.SET_PROJECT, selectedProject); - - eventHub.$emit('projectSelected'); }; export const setZone = ({ commit }, selectedZone) => { commit(types.SET_ZONE, selectedZone); - - eventHub.$emit('zoneSelected'); }; export const setMachineType = ({ commit }, selectedMachineType) => { commit(types.SET_MACHINE_TYPE, selectedMachineType); - - eventHub.$emit('machineTypeSelected'); }; export const getProjects = ({ commit }) => -- cgit v1.2.1 From 5a2f09136c714647146ffbe667c841c54d07382d Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 15:16:38 +0200 Subject: remove eventHub module --- app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js deleted file mode 100644 index 0948c2e5352..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/eventhub.js +++ /dev/null @@ -1,3 +0,0 @@ -import Vue from 'vue'; - -export default new Vue(); -- cgit v1.2.1 From 01ef0b64ea6ab54a3348a55c9a96ad886d5854a3 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 15:53:44 +0200 Subject: use component mixin to refactor components --- .../components/gcp_dropdown_mixin.js | 62 +++++++++++++++ .../components/gke_machine_type_dropdown.vue | 79 +++---------------- .../components/gke_project_id_dropdown.vue | 90 +++++++--------------- .../components/gke_zone_dropdown.vue | 73 +++--------------- .../components/gke_machine_type_dropdown_spec.js | 2 +- .../components/gke_project_id_dropdown_spec.js | 4 +- .../components/gke_zone_dropdown_spec.js | 2 +- 7 files changed, 118 insertions(+), 194 deletions(-) create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js new file mode 100644 index 00000000000..26dc329ad1f --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js @@ -0,0 +1,62 @@ +import _ from 'underscore'; +import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; +import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; +import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; +import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; + +import store from '../stores'; + +export default { + store, + components: { + LoadingIcon, + DropdownButton, + DropdownSearchInput, + DropdownHiddenInput, + }, + props: { + fieldId: { + type: String, + required: true, + }, + fieldName: { + type: String, + required: true, + }, + defaultValue: { + type: String, + required: false, + default: '', + }, + }, + data() { + return { + isLoading: false, + hasErrors: false, + searchQuery: '', + }; + }, + computed: { + results() { + return this.items.filter(item => item.name.toLowerCase().indexOf(this.searchQuery) > -1); + }, + }, + methods: { + fetchSuccessHandler() { + if (this.defaultValue) { + const itemToSelect = _.find(this.items, item => item.name === this.defaultValue); + + if (itemToSelect) { + this.setItem(itemToSelect.name); + } + } + + this.isLoading = false; + this.hasErrors = false; + }, + fetchFailureHandler() { + this.isLoading = false; + this.hasErrors = true; + }, + }, +}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index d65600117c0..991f2e91729 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -2,46 +2,15 @@ import _ from 'underscore'; import { s__ } from '~/locale'; import { mapState, mapGetters, mapActions } from 'vuex'; -import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; -import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; -import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; -import store from '../stores'; +import gcpDropdownMixin from './gcp_dropdown_mixin'; export default { name: 'GkeMachineTypeDropdown', - store, - components: { - LoadingIcon, - DropdownButton, - DropdownSearchInput, - DropdownHiddenInput, - }, - props: { - fieldId: { - type: String, - required: true, - }, - fieldName: { - type: String, - required: true, - }, - defaultValue: { - type: String, - required: false, - default: '', - }, - }, - data() { - return { - isLoading: false, - hasErrors: false, - searchQuery: '', - }; - }, + mixins: [gcpDropdownMixin], computed: { - ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType', 'machineTypes']), + ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType']), + ...mapState({ items: 'machineTypes' }), ...mapGetters(['hasProject', 'hasZone', 'hasMachineType']), allDropdownsSelected() { return this.hasProject && this.hasZone && this.hasMachineType; @@ -49,11 +18,6 @@ export default { isDisabled() { return !this.selectedProject || !this.selectedZone; }, - results() { - return this.machineTypes.filter( - item => item.name.toLowerCase().indexOf(this.searchQuery) > -1, - ); - }, toggleText() { if (this.isLoading) { return s__('ClusterIntegration|Fetching machine types'); @@ -80,38 +44,19 @@ export default { }, watch: { selectedZone() { - this.fetchMachineTypes(); + this.isLoading = true; + + this.getMachineTypes() + .then(this.fetchSuccessHandler) + .catch(this.fetchFailureHandler); }, selectedMachineType() { this.enableSubmit(); }, }, methods: { - ...mapActions(['setMachineType', 'getMachineTypes']), - fetchMachineTypes() { - this.isLoading = true; - - this.getMachineTypes() - .then(() => { - if (this.defaultValue) { - const machineTypeToSelect = _.find( - this.machineTypes, - item => item.name === this.defaultValue, - ); - - if (machineTypeToSelect) { - this.setMachineType(machineTypeToSelect.name); - } - } - - this.isLoading = false; - this.hasErrors = false; - }) - .catch(() => { - this.isLoading = false; - this.hasErrors = true; - }); - }, + ...mapActions(['getMachineTypes']), + ...mapActions({ setItem: 'setMachineType' }), enableSubmit() { if (this.allDropdownsSelected) { const submitButtonEl = document.querySelector('.js-gke-cluster-creation-submit'); @@ -154,7 +99,7 @@ export default { v-for="result in results" :key="result.id" > -
        • diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index f813f784d47..95fcbc12cfb 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -2,59 +2,32 @@ import _ from 'underscore'; import { s__, sprintf } from '~/locale'; import { mapState, mapGetters, mapActions } from 'vuex'; -import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; -import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; -import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; -import store from '../stores'; +import gcpDropdownMixin from './gcp_dropdown_mixin'; export default { name: 'GkeProjectIdDropdown', - store, - components: { - LoadingIcon, - DropdownButton, - DropdownSearchInput, - DropdownHiddenInput, - }, + mixins: [gcpDropdownMixin], props: { docsUrl: { type: String, required: true, }, - fieldId: { - type: String, - required: true, - }, - fieldName: { - type: String, - required: true, - }, - defaultValue: { - type: String, - required: false, - default: '', - }, }, data() { return { isLoading: true, - hasErrors: false, - searchQuery: '', }; }, computed: { - ...mapState(['selectedProject', 'projects']), + ...mapState(['selectedProject']), + ...mapState({ items: 'projects' }), ...mapGetters(['hasProject']), hasOneProject() { - return this.projects.length === 1; + return this.items.length === 1; }, isDisabled() { - return this.projects.length < 2; - }, - results() { - return this.projects.filter(item => item.name.toLowerCase().indexOf(this.searchQuery) > -1); + return this.items.length < 2; }, noSearchResultsText() { return s__('ClusterIntegration|No projects matched your search'); @@ -68,7 +41,7 @@ export default { return this.selectedProject.name; } - return !this.projects.length + return !this.items.length ? s__('ClusterIntegration|No projects found') : s__('ClusterIntegration|Select project'); }, @@ -82,7 +55,7 @@ export default { 'ClusterIntegration|We were unable to fetch any projects. Ensure that you have a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.'; } - message = this.projects.length + message = this.items.length ? 'ClusterIntegration|To use a new project, first create one on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.' : 'ClusterIntegration|To create a cluster, first create a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.'; @@ -99,34 +72,29 @@ export default { }, }, created() { - this.fetchProjects(); - }, - methods: { - ...mapActions(['setProject', 'getProjects']), - fetchProjects() { - this.getProjects() - .then(() => { - if (this.defaultValue) { - const projectToSelect = _.find( - this.projects, - item => item.projectId === this.defaultValue, - ); + this.getProjects() + .then(() => { + if (this.defaultValue) { + const projectToSelect = _.find(this.items, item => item.projectId === this.defaultValue); - if (projectToSelect) { - this.setProject(projectToSelect); - } - } else if (this.projects.length === 1) { - this.setProject(this.projects[0]); + if (projectToSelect) { + this.setItem(projectToSelect); } + } else if (this.items.length === 1) { + this.setItem(this.items[0]); + } - this.isLoading = false; - this.hasErrors = false; - }) - .catch(() => { - this.isLoading = false; - this.hasErrors = true; - }); - }, + this.isLoading = false; + this.hasErrors = false; + }) + .catch(() => { + this.isLoading = false; + this.hasErrors = true; + }); + }, + methods: { + ...mapActions(['getProjects']), + ...mapActions({ setItem: 'setProject' }), }, }; @@ -164,7 +132,7 @@ export default { v-for="result in results" :key="result.project_number" > - diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index f27cee3bf07..35220d8d960 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -1,54 +1,19 @@ @@ -130,7 +79,7 @@ export default { v-for="result in results" :key="result.id" > - diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index 421ec74bb65..fe1aff2bd09 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -73,7 +73,7 @@ describe('GkeMachineTypeDropdown', () => { }); it('returns machine type name if machine type selected', () => { - vm.setMachineType(selectedMachineTypeMock); + vm.setItem(selectedMachineTypeMock); expect(vm.toggleText).toBe(selectedMachineTypeMock); }); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js index 28b1dc466f7..d88c55216dd 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -45,7 +45,7 @@ describe('GkeProjectIdDropdown', () => { it('returns default toggle text', done => { vm.$nextTick(() => { vm.$nextTick(() => { - vm.setProject(emptyProjectMock); + vm.setItem(emptyProjectMock); expect(vm.toggleText).toBe(LABELS.DEFAULT); done(); @@ -65,7 +65,7 @@ describe('GkeProjectIdDropdown', () => { it('returns empty toggle text', done => { vm.$nextTick(() => { vm.$store.commit(SET_PROJECTS, []); - vm.setProject(emptyProjectMock); + vm.setItem(emptyProjectMock); vm.$nextTick(() => { expect(vm.toggleText).toBe(LABELS.EMPTY); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js index cb137e33a0d..b8b06a06be0 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -55,7 +55,7 @@ describe('GkeZoneDropdown', () => { }); it('returns project name if project selected', () => { - vm.setZone(selectedZoneMock); + vm.setItem(selectedZoneMock); expect(vm.toggleText).toBe(selectedZoneMock); }); -- cgit v1.2.1 From b66aa62431d28efd21eab272e56a0a44d76bae2d Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 16:14:04 +0200 Subject: cleanup --- .../gke_cluster_dropdowns/components/gke_project_id_dropdown.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 95fcbc12cfb..1f2a3c049c7 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -87,10 +87,7 @@ export default { this.isLoading = false; this.hasErrors = false; }) - .catch(() => { - this.isLoading = false; - this.hasErrors = true; - }); + .catch(this.fetchFailureHandler); }, methods: { ...mapActions(['getProjects']), -- cgit v1.2.1 From e33c44587a6d4bb82424a148b543c17079ad615b Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 16:57:01 +0200 Subject: refactor gke store actions --- .../gke_cluster_dropdowns/stores/actions.js | 106 ++++++++------------- 1 file changed, 41 insertions(+), 65 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js index dba12ac28ca..60bfae456c3 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/stores/actions.js @@ -16,92 +16,68 @@ export const setMachineType = ({ commit }, selectedMachineType) => { commit(types.SET_MACHINE_TYPE, selectedMachineType); }; -export const getProjects = ({ commit }) => +const displayError = (resp, errorMessage) => { + if (resp.result && resp.result.error) { + Flash(sprintf(s__(errorMessage), { error: resp.result.error.message })); + } +}; + +const gapiRequest = ({ service, params, commit, mutation, payloadKey, errorMessage }) => new Promise((resolve, reject) => { - const request = gapi.client.cloudresourcemanager.projects.list(); + const request = service.list(params); return request.then( resp => { - commit(types.SET_PROJECTS, resp.result.projects); + const { result } = resp; + + commit(mutation, result[payloadKey]); resolve(); }, resp => { - if (resp.result.error) { - Flash( - sprintf( - s__( - 'ClusterIntegration|An error occured while trying to fetch your projects: %{error}', - ), - { - error: resp.result.error.message, - }, - ), - ); - } + displayError(resp, errorMessage); reject(); }, ); }); +export const getProjects = ({ commit }) => + gapiRequest({ + service: gapi.client.cloudresourcemanager.projects, + params: {}, + commit, + mutation: types.SET_PROJECTS, + payloadKey: 'projects', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch your projects: %{error}', + }); + export const getZones = ({ commit, state }) => - new Promise((resolve, reject) => { - const request = gapi.client.compute.zones.list({ + gapiRequest({ + service: gapi.client.compute.zones, + params: { project: state.selectedProject.projectId, - }); - - return request.then( - resp => { - commit(types.SET_ZONES, resp.result.items); - - resolve(); - }, - resp => { - if (resp.result.error) { - Flash( - sprintf( - s__( - 'ClusterIntegration|An error occured while trying to fetch project zones: %{error}', - ), - { error: resp.result.error.message }, - ), - ); - } - - reject(); - }, - ); + }, + commit, + mutation: types.SET_ZONES, + payloadKey: 'items', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch project zones: %{error}', }); export const getMachineTypes = ({ commit, state }) => - new Promise((resolve, reject) => { - const request = gapi.client.compute.machineTypes.list({ + gapiRequest({ + service: gapi.client.compute.machineTypes, + params: { project: state.selectedProject.projectId, zone: state.selectedZone, - }); - - return request.then( - resp => { - commit(types.SET_MACHINE_TYPES, resp.result.items); - - resolve(); - }, - resp => { - if (resp.result.error) { - Flash( - sprintf( - s__( - 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', - ), - { error: resp.result.error.message }, - ), - ); - } - - reject(); - }, - ); + }, + commit, + mutation: types.SET_MACHINE_TYPES, + payloadKey: 'items', + errorMessage: + 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', }); // prevent babel-plugin-rewire from generating an invalid default during karma tests -- cgit v1.2.1 From b45714db81fa7d66cf63c571f0611cce81b48b62 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 9 May 2018 17:16:20 +0200 Subject: cleanup --- .../components/gcp_dropdown_mixin.js | 62 ---------------------- .../components/gke_dropdown_mixin.js | 62 ++++++++++++++++++++++ .../components/gke_machine_type_dropdown.vue | 16 +++--- .../components/gke_project_id_dropdown.vue | 41 +++++++------- .../components/gke_zone_dropdown.vue | 16 +++--- 5 files changed, 97 insertions(+), 100 deletions(-) delete mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js deleted file mode 100644 index 26dc329ad1f..00000000000 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gcp_dropdown_mixin.js +++ /dev/null @@ -1,62 +0,0 @@ -import _ from 'underscore'; -import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; -import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; -import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; - -import store from '../stores'; - -export default { - store, - components: { - LoadingIcon, - DropdownButton, - DropdownSearchInput, - DropdownHiddenInput, - }, - props: { - fieldId: { - type: String, - required: true, - }, - fieldName: { - type: String, - required: true, - }, - defaultValue: { - type: String, - required: false, - default: '', - }, - }, - data() { - return { - isLoading: false, - hasErrors: false, - searchQuery: '', - }; - }, - computed: { - results() { - return this.items.filter(item => item.name.toLowerCase().indexOf(this.searchQuery) > -1); - }, - }, - methods: { - fetchSuccessHandler() { - if (this.defaultValue) { - const itemToSelect = _.find(this.items, item => item.name === this.defaultValue); - - if (itemToSelect) { - this.setItem(itemToSelect.name); - } - } - - this.isLoading = false; - this.hasErrors = false; - }, - fetchFailureHandler() { - this.isLoading = false; - this.hasErrors = true; - }, - }, -}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js new file mode 100644 index 00000000000..26dc329ad1f --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js @@ -0,0 +1,62 @@ +import _ from 'underscore'; +import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; +import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; +import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; +import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; + +import store from '../stores'; + +export default { + store, + components: { + LoadingIcon, + DropdownButton, + DropdownSearchInput, + DropdownHiddenInput, + }, + props: { + fieldId: { + type: String, + required: true, + }, + fieldName: { + type: String, + required: true, + }, + defaultValue: { + type: String, + required: false, + default: '', + }, + }, + data() { + return { + isLoading: false, + hasErrors: false, + searchQuery: '', + }; + }, + computed: { + results() { + return this.items.filter(item => item.name.toLowerCase().indexOf(this.searchQuery) > -1); + }, + }, + methods: { + fetchSuccessHandler() { + if (this.defaultValue) { + const itemToSelect = _.find(this.items, item => item.name === this.defaultValue); + + if (itemToSelect) { + this.setItem(itemToSelect.name); + } + } + + this.isLoading = false; + this.hasErrors = false; + }, + fetchFailureHandler() { + this.isLoading = false; + this.hasErrors = true; + }, + }, +}; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 991f2e91729..c26dcf887b8 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -3,11 +3,17 @@ import _ from 'underscore'; import { s__ } from '~/locale'; import { mapState, mapGetters, mapActions } from 'vuex'; -import gcpDropdownMixin from './gcp_dropdown_mixin'; +import gkeDropdownMixin from './gke_dropdown_mixin'; export default { name: 'GkeMachineTypeDropdown', - mixins: [gcpDropdownMixin], + mixins: [gkeDropdownMixin], + data() { + return { + searchPlaceholderText: s__('ClusterIntegration|Search machine types'), + noSearchResultsText: s__('ClusterIntegration|No machine types matched your search'), + }; + }, computed: { ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType']), ...mapState({ items: 'machineTypes' }), @@ -35,12 +41,6 @@ export default { ? s__('ClusterIntegration|Select zone to choose machine type') : s__('ClusterIntegration|Select machine type'); }, - searchPlaceholderText() { - return s__('ClusterIntegration|Search machine types'); - }, - noSearchResultsText() { - return s__('ClusterIntegration|No machine types matched your search'); - }, }, watch: { selectedZone() { diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 1f2a3c049c7..9dc6bebc5ba 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -3,11 +3,11 @@ import _ from 'underscore'; import { s__, sprintf } from '~/locale'; import { mapState, mapGetters, mapActions } from 'vuex'; -import gcpDropdownMixin from './gcp_dropdown_mixin'; +import gkeDropdownMixin from './gke_dropdown_mixin'; export default { name: 'GkeProjectIdDropdown', - mixins: [gcpDropdownMixin], + mixins: [gkeDropdownMixin], props: { docsUrl: { type: String, @@ -17,6 +17,8 @@ export default { data() { return { isLoading: true, + searchPlaceholderText: s__('ClusterIntegration|Search projects'), + noSearchResultsText: s__('ClusterIntegration|No projects matched your search'), }; }, computed: { @@ -29,9 +31,6 @@ export default { isDisabled() { return this.items.length < 2; }, - noSearchResultsText() { - return s__('ClusterIntegration|No projects matched your search'); - }, toggleText() { if (this.isLoading) { return s__('ClusterIntegration|Fetching projects'); @@ -45,9 +44,6 @@ export default { ? s__('ClusterIntegration|No projects found') : s__('ClusterIntegration|Select project'); }, - searchPlaceholderText() { - return s__('ClusterIntegration|Search projects'); - }, helpText() { let message; if (this.hasErrors) { @@ -73,25 +69,26 @@ export default { }, created() { this.getProjects() - .then(() => { - if (this.defaultValue) { - const projectToSelect = _.find(this.items, item => item.projectId === this.defaultValue); - - if (projectToSelect) { - this.setItem(projectToSelect); - } - } else if (this.items.length === 1) { - this.setItem(this.items[0]); - } - - this.isLoading = false; - this.hasErrors = false; - }) + .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, methods: { ...mapActions(['getProjects']), ...mapActions({ setItem: 'setProject' }), + fetchSuccessHandler() { + if (this.defaultValue) { + const projectToSelect = _.find(this.items, item => item.projectId === this.defaultValue); + + if (projectToSelect) { + this.setItem(projectToSelect); + } + } else if (this.items.length === 1) { + this.setItem(this.items[0]); + } + + this.isLoading = false; + this.hasErrors = false; + }, }, }; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 35220d8d960..9a99d986d05 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -2,11 +2,17 @@ import { s__ } from '~/locale'; import { mapState, mapGetters, mapActions } from 'vuex'; -import gcpDropdownMixin from './gcp_dropdown_mixin'; +import gkeDropdownMixin from './gke_dropdown_mixin'; export default { name: 'GkeZoneDropdown', - mixins: [gcpDropdownMixin], + mixins: [gkeDropdownMixin], + data() { + return { + searchPlaceholderText: s__('ClusterIntegration|Search zones'), + noSearchResultsText: s__('ClusterIntegration|No zones matched your search'), + }; + }, computed: { ...mapState(['selectedProject', 'selectedZone']), ...mapState({ items: 'zones' }), @@ -27,12 +33,6 @@ export default { ? s__('ClusterIntegration|Select project to choose zone') : s__('ClusterIntegration|Select zone'); }, - searchPlaceholderText() { - return s__('ClusterIntegration|Search zones'); - }, - noSearchResultsText() { - return s__('ClusterIntegration|No zones matched your search'); - }, }, watch: { selectedProject() { -- cgit v1.2.1 From 918077a0b6b134df57ab6b518b4b6b63c14a5e5c Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 11 May 2018 10:20:35 +0200 Subject: set isLoading in created lifecycle hook --- .../gke_cluster_dropdowns/components/gke_project_id_dropdown.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 9dc6bebc5ba..bcc41aefc72 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -16,7 +16,6 @@ export default { }, data() { return { - isLoading: true, searchPlaceholderText: s__('ClusterIntegration|Search projects'), noSearchResultsText: s__('ClusterIntegration|No projects matched your search'), }; @@ -68,6 +67,8 @@ export default { }, }, created() { + this.isLoading = true; + this.getProjects() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); -- cgit v1.2.1 From af3dd043610b9869183fb6238251b17e95ee922e Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 11 May 2018 10:20:48 +0200 Subject: clean up component tests --- .../components/gke_machine_type_dropdown_spec.js | 4 +-- .../components/gke_project_id_dropdown_spec.js | 39 +++++++++------------- .../components/gke_zone_dropdown_spec.js | 4 +-- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index fe1aff2bd09..b6c1c454b2b 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -84,10 +84,10 @@ describe('GkeMachineTypeDropdown', () => { expect(vm.$el.querySelector('input').value).toBe(''); vm.$store.commit(SET_MACHINE_TYPES, gapiMachineTypesResponseMock.items); - vm.$nextTick(() => { + return vm.$nextTick().then(() => { vm.$el.querySelector('.dropdown-content button').click(); - vm.$nextTick(() => { + return vm.$nextTick().then(() => { expect(vm.$el.querySelector('input').value).toBe(selectedMachineTypeMock); done(); }); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js index d88c55216dd..1c322262a73 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -43,34 +43,28 @@ describe('GkeProjectIdDropdown', () => { }); it('returns default toggle text', done => { - vm.$nextTick(() => { - vm.$nextTick(() => { - vm.setItem(emptyProjectMock); + return vm.$nextTick().then(() => { + vm.setItem(emptyProjectMock); - expect(vm.toggleText).toBe(LABELS.DEFAULT); - done(); - }); + expect(vm.toggleText).toBe(LABELS.DEFAULT); + done(); }); }); it('returns project name if project selected', done => { - vm.$nextTick(() => { - vm.$nextTick(() => { - expect(vm.toggleText).toBe(selectedProjectMock.name); - done(); - }); + return vm.$nextTick().then(() => { + expect(vm.toggleText).toBe(selectedProjectMock.name); + done(); }); }); it('returns empty toggle text', done => { - vm.$nextTick(() => { + return vm.$nextTick().then(() => { vm.$store.commit(SET_PROJECTS, []); vm.setItem(emptyProjectMock); - vm.$nextTick(() => { - expect(vm.toggleText).toBe(LABELS.EMPTY); - done(); - }); + expect(vm.toggleText).toBe(LABELS.EMPTY); + done(); }); }); }); @@ -79,13 +73,12 @@ describe('GkeProjectIdDropdown', () => { it('reflects new value when dropdown item is clicked', done => { expect(vm.$el.querySelector('input').value).toBe(''); - vm.$nextTick(() => { - vm.$nextTick(() => { - vm.$el.querySelector('.dropdown-content button').click(); - vm.$nextTick(() => { - expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId); - done(); - }); + return vm.$nextTick().then(() => { + vm.$el.querySelector('.dropdown-content button').click(); + + return vm.$nextTick().then(() => { + expect(vm.$el.querySelector('input').value).toBe(selectedProjectMock.projectId); + done(); }); }); }); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js index b8b06a06be0..c99816cd13c 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -66,10 +66,10 @@ describe('GkeZoneDropdown', () => { expect(vm.$el.querySelector('input').value).toBe(''); vm.$store.commit(SET_ZONES, gapiZonesResponseMock.items); - vm.$nextTick(() => { + return vm.$nextTick().then(() => { vm.$el.querySelector('.dropdown-content button').click(); - vm.$nextTick(() => { + return vm.$nextTick().then(() => { expect(vm.$el.querySelector('input').value).toBe(selectedZoneMock); done(); }); -- cgit v1.2.1 From 3daa298d9ab493ea30710505055eea63ae49fdfb Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 11 May 2018 13:57:10 +0200 Subject: eslint fixes --- .../components/gke_machine_type_dropdown.vue | 1 - .../components/gke_project_id_dropdown_spec.js | 21 +++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index c26dcf887b8..0540051c983 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -1,5 +1,4 @@ diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 58605832202..e1b15a1507d 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -66,6 +66,12 @@ export default { false, ); }, + errorMessage() { + return sprintf( + s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'), + { error: this.gapiError }, + ); + }, }, created() { this.isLoading = true; @@ -146,7 +152,7 @@ export default {
    diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index d0e6bfc0137..a63d9ae9125 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -1,5 +1,5 @@ diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js index 73f1e17f379..e484f6a1b2b 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js @@ -1,5 +1,4 @@ /* global gapi */ -import createFlash, { hideFlash } from '~/flash'; import { s__, sprintf } from '~/locale'; import * as types from './mutation_types'; @@ -16,21 +15,7 @@ export const setMachineType = ({ commit }, selectedMachineType) => { commit(types.SET_MACHINE_TYPE, selectedMachineType); }; -const displayError = (resp, errorMessage) => { - if (resp.result && resp.result.error) { - createFlash(sprintf(errorMessage, { error: resp.result.error.message })); - } -}; - -const hideError = () => { - const flashEl = document.querySelector('.flash-alert'); - - if (flashEl) { - hideFlash(flashEl); - } -}; - -const gapiRequest = ({ service, params, commit, mutation, payloadKey, errorMessage }) => +const gapiRequest = ({ service, params, commit, mutation, payloadKey }) => new Promise((resolve, reject) => { const request = service.list(params); @@ -38,15 +23,12 @@ const gapiRequest = ({ service, params, commit, mutation, payloadKey, errorMessa resp => { const { result } = resp; - hideError(); commit(mutation, result[payloadKey]); resolve(); }, resp => { - displayError(resp, errorMessage); - - reject(); + reject(resp); }, ); }); @@ -58,9 +40,6 @@ export const getProjects = ({ commit }) => commit, mutation: types.SET_PROJECTS, payloadKey: 'projects', - errorMessage: s__( - 'ClusterIntegration|An error occured while trying to fetch your projects: %{error}', - ), }); export const getZones = ({ commit, state }) => @@ -72,9 +51,6 @@ export const getZones = ({ commit, state }) => commit, mutation: types.SET_ZONES, payloadKey: 'items', - errorMessage: s__( - 'ClusterIntegration|An error occured while trying to fetch project zones: %{error}', - ), }); export const getMachineTypes = ({ commit, state }) => @@ -87,9 +63,6 @@ export const getMachineTypes = ({ commit, state }) => commit, mutation: types.SET_MACHINE_TYPES, payloadKey: 'items', - errorMessage: s__( - 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', - ), }); // prevent babel-plugin-rewire from generating an invalid default during karma tests -- cgit v1.2.1 From f15e331dd269b6563420f0de4de16ecb29700b5e Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Fri, 11 May 2018 21:36:22 +0200 Subject: eslint! --- app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js index e484f6a1b2b..844eb1bc3cd 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js @@ -1,6 +1,4 @@ /* global gapi */ -import { s__, sprintf } from '~/locale'; - import * as types from './mutation_types'; export const setProject = ({ commit }, selectedProject) => { -- cgit v1.2.1 From 761d890a68c92c49136937dbceda9f40bd714801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= Date: Thu, 3 May 2018 11:02:26 +0200 Subject: Blacklisting attributes in the project import process --- .../security-fj-import-export-assignment.yml | 5 ++++ lib/gitlab/import_export/attribute_cleaner.rb | 11 ++++++-- lib/gitlab/import_export/attributes_finder.rb | 4 +++ lib/gitlab/import_export/import_export.yml | 2 -- lib/gitlab/import_export/project_tree_restorer.rb | 23 +++++++++++------ lib/gitlab/import_export/reader.rb | 2 +- lib/gitlab/import_export/relation_factory.rb | 10 +++++++- .../gitlab/import_export/attribute_cleaner_spec.rb | 29 +++++++++++++++++++--- spec/lib/gitlab/import_export/project.json | 2 ++ spec/lib/gitlab/import_export/project.light.json | 2 ++ .../import_export/project_tree_restorer_spec.rb | 9 +++++++ .../gitlab/import_export/relation_factory_spec.rb | 12 ++++++++- 12 files changed, 93 insertions(+), 18 deletions(-) create mode 100644 changelogs/unreleased/security-fj-import-export-assignment.yml diff --git a/changelogs/unreleased/security-fj-import-export-assignment.yml b/changelogs/unreleased/security-fj-import-export-assignment.yml new file mode 100644 index 00000000000..4bfd71d431a --- /dev/null +++ b/changelogs/unreleased/security-fj-import-export-assignment.yml @@ -0,0 +1,5 @@ +--- +title: Fixed bug that allowed importing arbitrary project attributes +merge_request: +author: +type: security diff --git a/lib/gitlab/import_export/attribute_cleaner.rb b/lib/gitlab/import_export/attribute_cleaner.rb index 34169319b26..7c9fc5c15bb 100644 --- a/lib/gitlab/import_export/attribute_cleaner.rb +++ b/lib/gitlab/import_export/attribute_cleaner.rb @@ -7,14 +7,15 @@ module Gitlab new(*args).clean end - def initialize(relation_hash:, relation_class:) + def initialize(relation_hash:, relation_class:, excluded_keys: []) @relation_hash = relation_hash @relation_class = relation_class + @excluded_keys = excluded_keys end def clean @relation_hash.reject do |key, _value| - prohibited_key?(key) || !@relation_class.attribute_method?(key) + prohibited_key?(key) || !@relation_class.attribute_method?(key) || excluded_key?(key) end.except('id') end @@ -23,6 +24,12 @@ module Gitlab def prohibited_key?(key) key.end_with?('_id') && !ALLOWED_REFERENCES.include?(key) end + + def excluded_key?(key) + return false if @excluded_keys.empty? + + @excluded_keys.include?(key) + end end end end diff --git a/lib/gitlab/import_export/attributes_finder.rb b/lib/gitlab/import_export/attributes_finder.rb index 56042ddecbf..0c8fda07294 100644 --- a/lib/gitlab/import_export/attributes_finder.rb +++ b/lib/gitlab/import_export/attributes_finder.rb @@ -32,6 +32,10 @@ module Gitlab @methods[key].nil? ? {} : { methods: @methods[key] } end + def find_excluded_keys(klass_name) + @excluded_attributes[klass_name.to_sym]&.map(&:to_s) || [] + end + private def find_attributes_only(value) diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 21ac7f7e0b6..36c7534cd7a 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -98,8 +98,6 @@ excluded_attributes: - :import_jid - :created_at - :updated_at - - :import_jid - - :import_jid - :id - :star_count - :last_activity_at diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index d5590dde40f..4eb67fbe11e 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -88,16 +88,18 @@ module Gitlab end def project_params - @project_params ||= json_params.merge(override_params) + @project_params ||= begin + attrs = json_params.merge(override_params) + + # Cleaning all imported and overridden params + Gitlab::ImportExport::AttributeCleaner.clean(relation_hash: attrs, + relation_class: Project, + excluded_keys: excluded_keys_for_relation(:project)) + end end def override_params - return {} unless params = @project.import_data&.data&.fetch('override_params', nil) - - @override_params ||= params.select do |key, _value| - Project.column_names.include?(key.to_s) && - !reader.project_tree[:except].include?(key.to_sym) - end + @override_params ||= @project.import_data&.data&.fetch('override_params', nil) || {} end def json_params @@ -171,7 +173,8 @@ module Gitlab relation_hash: parsed_relation_hash(relation_hash, relation.to_sym), members_mapper: members_mapper, user: @user, - project: @restored_project) + project: @restored_project, + excluded_keys: excluded_keys_for_relation(relation)) end.compact relation_hash_list.is_a?(Array) ? relation_array : relation_array.first @@ -192,6 +195,10 @@ module Gitlab def reader @reader ||= Gitlab::ImportExport::Reader.new(shared: @shared) end + + def excluded_keys_for_relation(relation) + @reader.attributes_finder.find_excluded_keys(relation) + end end end end diff --git a/lib/gitlab/import_export/reader.rb b/lib/gitlab/import_export/reader.rb index eb7f5120592..e621c40fc7a 100644 --- a/lib/gitlab/import_export/reader.rb +++ b/lib/gitlab/import_export/reader.rb @@ -1,7 +1,7 @@ module Gitlab module ImportExport class Reader - attr_reader :tree + attr_reader :tree, :attributes_finder def initialize(shared:) @shared = shared diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index e3e9f156fb4..301719406e4 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -36,13 +36,21 @@ module Gitlab new(*args).create end - def initialize(relation_sym:, relation_hash:, members_mapper:, user:, project:) + def initialize(relation_sym:, relation_hash:, members_mapper:, user:, project:, excluded_keys: []) @relation_name = OVERRIDES[relation_sym] || relation_sym @relation_hash = relation_hash.except('noteable_id') @members_mapper = members_mapper @user = user @project = project @imported_object_retries = 0 + + # Remove excluded keys from relation_hash + # We don't do this in the parsed_relation_hash because of the 'transformed attributes' + # For example, MergeRequestDiffFiles exports its diff attribute as utf8_diff. Then, + # in the create method that attribute is renamed to diff. And because diff is an excluded key, + # if we clean the excluded keys in the parsed_relation_hash, it will be removed + # from the object attributes and the export will fail. + @relation_hash.except!(*excluded_keys) end # Creates an object from an actual model with name "relation_sym" with params from diff --git a/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb b/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb index cd5a1b2982b..536cc359d39 100644 --- a/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb +++ b/spec/lib/gitlab/import_export/attribute_cleaner_spec.rb @@ -15,7 +15,10 @@ describe Gitlab::ImportExport::AttributeCleaner do 'project_id' => 99, 'user_id' => 99, 'random_id_in_the_middle' => 99, - 'notid' => 99 + 'notid' => 99, + 'import_source' => 'whatever', + 'import_type' => 'whatever', + 'non_existent_attr' => 'whatever' } end @@ -28,10 +31,30 @@ describe Gitlab::ImportExport::AttributeCleaner do } end + let(:excluded_keys) { %w[import_source import_type] } + + subject { described_class.clean(relation_hash: unsafe_hash, relation_class: relation_class, excluded_keys: excluded_keys) } + + before do + allow(relation_class).to receive(:attribute_method?).and_return(true) + allow(relation_class).to receive(:attribute_method?).with('non_existent_attr').and_return(false) + end + it 'removes unwanted attributes from the hash' do - # allow(relation_class).to receive(:attribute_method?).and_return(true) + expect(subject).to eq(post_safe_hash) + end + + it 'removes attributes not present in relation_class' do + expect(subject.keys).not_to include 'non_existent_attr' + end + + it 'removes excluded keys from the hash' do + expect(subject.keys).not_to include excluded_keys + end + + it 'does not remove excluded key if not listed' do parsed_hash = described_class.clean(relation_hash: unsafe_hash, relation_class: relation_class) - expect(parsed_hash).to eq(post_safe_hash) + expect(parsed_hash.keys).to eq post_safe_hash.keys + excluded_keys end end diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json index 6d63749296e..4d0cc1f196e 100644 --- a/spec/lib/gitlab/import_export/project.json +++ b/spec/lib/gitlab/import_export/project.json @@ -1,5 +1,7 @@ { "description": "Nisi et repellendus ut enim quo accusamus vel magnam.", + "import_type": "gitlab_project", + "creator_id": 123, "visibility_level": 10, "archived": false, "labels": [ diff --git a/spec/lib/gitlab/import_export/project.light.json b/spec/lib/gitlab/import_export/project.light.json index 5dbf0ed289b..c13cf4a0507 100644 --- a/spec/lib/gitlab/import_export/project.light.json +++ b/spec/lib/gitlab/import_export/project.light.json @@ -1,5 +1,7 @@ { "description": "Nisi et repellendus ut enim quo accusamus vel magnam.", + "import_type": "gitlab_project", + "creator_id": 123, "visibility_level": 10, "archived": false, "milestones": [ diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index 13a8c9adcee..68ddc947e02 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -23,6 +23,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch) project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project) + + expect(Gitlab::ImportExport::RelationFactory).to receive(:create).with(hash_including(excluded_keys: ['whatever'])).and_call_original.at_least(:once) + allow(project_tree_restorer).to receive(:excluded_keys_for_relation).and_return(['whatever']) + @restored_project_json = project_tree_restorer.restore end end @@ -248,6 +252,11 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do expect(labels.where(type: "ProjectLabel").count).to eq(results.fetch(:first_issue_labels, 0)) expect(labels.where(type: "ProjectLabel").where.not(group_id: nil).count).to eq(0) end + + it 'does not set params that are excluded from import_export settings' do + expect(project.import_type).to be_nil + expect(project.creator_id).not_to eq 123 + end end shared_examples 'restores group correctly' do |**results| diff --git a/spec/lib/gitlab/import_export/relation_factory_spec.rb b/spec/lib/gitlab/import_export/relation_factory_spec.rb index 5c61a5a2044..5f0dfd64b15 100644 --- a/spec/lib/gitlab/import_export/relation_factory_spec.rb +++ b/spec/lib/gitlab/import_export/relation_factory_spec.rb @@ -4,12 +4,14 @@ describe Gitlab::ImportExport::RelationFactory do let(:project) { create(:project) } let(:members_mapper) { double('members_mapper').as_null_object } let(:user) { create(:admin) } + let(:excluded_keys) { [] } let(:created_object) do described_class.create(relation_sym: relation_sym, relation_hash: relation_hash, members_mapper: members_mapper, user: user, - project: project) + project: project, + excluded_keys: excluded_keys) end context 'hook object' do @@ -67,6 +69,14 @@ describe Gitlab::ImportExport::RelationFactory do expect(created_object.service_id).not_to eq(service_id) end end + + context 'excluded attributes' do + let(:excluded_keys) { %w[url] } + + it 'are removed from the imported object' do + expect(created_object.url).to be_nil + end + end end # Mocks an ActiveRecordish object with the dodgy columns -- cgit v1.2.1 From 3acc649d3066ca4e9bff67751f14b1060a4b3f19 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Mon, 14 May 2018 14:38:29 +0200 Subject: move state into separate file as per vuex docs --- .../projects/gke_cluster_dropdowns/store/index.js | 13 ++----------- .../projects/gke_cluster_dropdowns/store/state.js | 11 +++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js index ec71a49c97a..458ca1b3164 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js @@ -3,6 +3,7 @@ import Vuex from 'vuex'; import * as actions from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); @@ -10,15 +11,5 @@ export default new Vuex.Store({ actions, getters, mutations, - state: { - selectedProject: { - projectId: '', - name: '', - }, - selectedZone: '', - selectedMachineType: '', - projects: [], - zones: [], - machineTypes: [], - }, + state, }); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js new file mode 100644 index 00000000000..5b1ed85bdb2 --- /dev/null +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js @@ -0,0 +1,11 @@ +export default { + selectedProject: { + projectId: '', + name: '', + }, + selectedZone: '', + selectedMachineType: '', + projects: [], + zones: [], + machineTypes: [], +}; -- cgit v1.2.1 From 2b903eceda1253e60fa98ba00d2fe12f6fa0d9ba Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Mon, 14 May 2018 14:38:55 +0200 Subject: rename vuex actions as per best practices --- .../components/gke_machine_type_dropdown.vue | 4 +-- .../components/gke_project_id_dropdown.vue | 4 +-- .../components/gke_zone_dropdown.vue | 4 +-- .../gke_cluster_dropdowns/store/actions.js | 30 +++++++++++----------- .../gke_cluster_dropdowns/stores/actions_spec.js | 12 ++++----- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index d25df18658d..cc4d863a989 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -47,7 +47,7 @@ export default { selectedZone() { this.isLoading = true; - this.getMachineTypes() + this.fetchMachineTypes() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, @@ -56,7 +56,7 @@ export default { }, }, methods: { - ...mapActions(['getMachineTypes']), + ...mapActions(['fetchMachineTypes']), ...mapActions({ setItem: 'setMachineType' }), enableSubmit() { if (this.allDropdownsSelected) { diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index e1b15a1507d..a322b7c375e 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -76,12 +76,12 @@ export default { created() { this.isLoading = true; - this.getProjects() + this.fetchProjects() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, methods: { - ...mapActions(['getProjects']), + ...mapActions(['fetchProjects']), ...mapActions({ setItem: 'setProject' }), fetchSuccessHandler() { if (this.defaultValue) { diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index a63d9ae9125..46d84bbb751 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -38,13 +38,13 @@ export default { selectedProject() { this.isLoading = true; - this.getZones() + this.fetchZones() .then(this.fetchSuccessHandler) .catch(this.fetchFailureHandler); }, }, methods: { - ...mapActions(['getZones']), + ...mapActions(['fetchZones']), ...mapActions({ setItem: 'setZone' }), }, }; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js index 844eb1bc3cd..11bd04f5b01 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js @@ -1,18 +1,6 @@ /* global gapi */ import * as types from './mutation_types'; -export const setProject = ({ commit }, selectedProject) => { - commit(types.SET_PROJECT, selectedProject); -}; - -export const setZone = ({ commit }, selectedZone) => { - commit(types.SET_ZONE, selectedZone); -}; - -export const setMachineType = ({ commit }, selectedMachineType) => { - commit(types.SET_MACHINE_TYPE, selectedMachineType); -}; - const gapiRequest = ({ service, params, commit, mutation, payloadKey }) => new Promise((resolve, reject) => { const request = service.list(params); @@ -31,7 +19,19 @@ const gapiRequest = ({ service, params, commit, mutation, payloadKey }) => ); }); -export const getProjects = ({ commit }) => +export const setProject = ({ commit }, selectedProject) => { + commit(types.SET_PROJECT, selectedProject); +}; + +export const setZone = ({ commit }, selectedZone) => { + commit(types.SET_ZONE, selectedZone); +}; + +export const setMachineType = ({ commit }, selectedMachineType) => { + commit(types.SET_MACHINE_TYPE, selectedMachineType); +}; + +export const fetchProjects = ({ commit }) => gapiRequest({ service: gapi.client.cloudresourcemanager.projects, params: {}, @@ -40,7 +40,7 @@ export const getProjects = ({ commit }) => payloadKey: 'projects', }); -export const getZones = ({ commit, state }) => +export const fetchZones = ({ commit, state }) => gapiRequest({ service: gapi.client.compute.zones, params: { @@ -51,7 +51,7 @@ export const getZones = ({ commit, state }) => payloadKey: 'items', }); -export const getMachineTypes = ({ commit, state }) => +export const fetchMachineTypes = ({ commit, state }) => gapiRequest({ service: gapi.client.compute.machineTypes, params: { diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js index e246c77e36a..02ce780e3fb 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js @@ -51,10 +51,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { describe('async fetch methods', () => { window.gapi = gapi(); - describe('getProjects', () => { + describe('fetchProjects', () => { it('fetches projects from Google API', done => { store - .dispatch('getProjects') + .dispatch('fetchProjects') .then(() => { expect(store.state.projects[0].projectId).toEqual(selectedProjectMock.projectId); expect(store.state.projects[0].name).toEqual(selectedProjectMock.name); @@ -65,10 +65,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { }); }); - describe('getZones', () => { + describe('fetchZones', () => { it('fetches zones from Google API', done => { store - .dispatch('getZones') + .dispatch('fetchZones') .then(() => { expect(store.state.zones[0].name).toEqual(selectedZoneMock); @@ -78,10 +78,10 @@ describe('GCP Cluster Dropdown Store Actions', () => { }); }); - describe('getMachineTypes', () => { + describe('fetchMachineTypes', () => { it('fetches machine types from Google API', done => { store - .dispatch('getMachineTypes') + .dispatch('fetchMachineTypes') .then(() => { expect(store.state.machineTypes[0].name).toEqual(selectedMachineTypeMock); -- cgit v1.2.1 From ab3c6e76c03a5264cdde8c285b2df40ee6b8a324 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Wed, 16 May 2018 21:44:54 +0000 Subject: use postgres_role --- doc/administration/high_availability/database.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md index ca6d8d2de67..b5124b1d540 100644 --- a/doc/administration/high_availability/database.md +++ b/doc/administration/high_availability/database.md @@ -33,16 +33,7 @@ If you use a cloud-managed service, or provide your own PostgreSQL: external_url 'https://gitlab.example.com' # Disable all components except PostgreSQL - postgresql['enable'] = true - bootstrap['enable'] = false - nginx['enable'] = false - unicorn['enable'] = false - sidekiq['enable'] = false - redis['enable'] = false - prometheus['enable'] = false - gitaly['enable'] = false - gitlab_workhorse['enable'] = false - mailroom['enable'] = false + roles ['postgres_role'] # PostgreSQL configuration gitlab_rails['db_password'] = 'DB password' -- cgit v1.2.1 From a33d591602b40d224b4fdb74300e3b0d96bda7df Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 17 May 2018 15:19:32 +0200 Subject: Don't pass the repository path to Gitlab Shell This isn't a requirement, and removes deprecated method calls --- lib/api/helpers/internal_helpers.rb | 6 ------ lib/api/internal.rb | 2 +- spec/requests/api/internal_spec.rb | 12 ++++++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index abe3d353984..83151be82ad 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -89,12 +89,6 @@ module API end end - # Return the repository full path so that gitlab-shell has it when - # handling ssh commands - def repository_path - repository.path_to_repo - end - # Return the Gitaly Address if it is enabled def gitaly_payload(action) return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action) diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 6b72caea8fd..798a8dbb929 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -59,7 +59,7 @@ module API status: true, gl_repository: gl_repository, gl_username: user&.username, - repository_path: repository_path, + repository_path: nil, gitaly: gitaly_payload(params[:action]) } end diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index db8c5f963d6..506901095f1 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' describe API::Internal do - let(:user) { create(:user) } + set(:user) { create(:user) } let(:key) { create(:key, user: user) } - let(:project) { create(:project, :repository, :wiki_repo) } + set(:project) { create(:project, :repository, :wiki_repo) } let(:secret_token) { Gitlab::Shell.secret_token } let(:gl_repository) { "project-#{project.id}" } let(:reference_counter) { double('ReferenceCounter') } @@ -277,7 +277,7 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo) + expect(json_response["repository_path"]).to be_nil expect(json_response["gl_repository"]).to eq("wiki-#{project.id}") expect(user).not_to have_an_activity_record end @@ -289,7 +289,7 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq(project.wiki.repository.path_to_repo) + expect(json_response["repository_path"]).to be_nil expect(json_response["gl_repository"]).to eq("wiki-#{project.id}") expect(user).to have_an_activity_record end @@ -301,7 +301,7 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq(project.repository.path_to_repo) + expect(json_response["repository_path"]).to be_nil expect(json_response["gl_repository"]).to eq("project-#{project.id}") expect(json_response["gitaly"]).not_to be_nil expect(json_response["gitaly"]["repository"]).not_to be_nil @@ -320,7 +320,7 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq(project.repository.path_to_repo) + expect(json_response["repository_path"]).to be_nil expect(json_response["gl_repository"]).to eq("project-#{project.id}") expect(json_response["gitaly"]).not_to be_nil expect(json_response["gitaly"]["repository"]).not_to be_nil -- cgit v1.2.1 From 247b20972b51fce323939bfa43340ad32f7e9a30 Mon Sep 17 00:00:00 2001 From: Dennis Tang Date: Wed, 23 May 2018 12:16:14 +0200 Subject: validate project billing status after selection --- .../components/gke_machine_type_dropdown.vue | 10 ++-- .../components/gke_project_id_dropdown.vue | 57 ++++++++++++++++++++-- .../components/gke_zone_dropdown.vue | 14 +++--- .../projects/gke_cluster_dropdowns/constants.js | 2 + .../projects/gke_cluster_dropdowns/index.js | 19 ++++---- .../gke_cluster_dropdowns/store/actions.js | 35 ++++++++++--- .../gke_cluster_dropdowns/store/mutation_types.js | 1 + .../gke_cluster_dropdowns/store/mutations.js | 3 ++ .../projects/gke_cluster_dropdowns/store/state.js | 1 + 9 files changed, 110 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index cc4d863a989..5cb1ae670dc 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -8,14 +8,14 @@ export default { name: 'GkeMachineTypeDropdown', mixins: [gkeDropdownMixin], computed: { - ...mapState(['selectedProject', 'selectedZone', 'selectedMachineType']), + ...mapState(['projectHasBillingEnabled', 'selectedZone', 'selectedMachineType']), ...mapState({ items: 'machineTypes' }), - ...mapGetters(['hasProject', 'hasZone', 'hasMachineType']), + ...mapGetters(['hasZone', 'hasMachineType']), allDropdownsSelected() { - return this.hasProject && this.hasZone && this.hasMachineType; + return this.projectHasBillingEnabled && this.hasZone && this.hasMachineType; }, isDisabled() { - return !this.selectedProject || !this.selectedZone; + return !this.projectHasBillingEnabled || !this.selectedZone; }, toggleText() { if (this.isLoading) { @@ -26,7 +26,7 @@ export default { return this.selectedMachineType; } - if (!this.hasProject && !this.hasZone) { + if (!this.projectHasBillingEnabled && !this.hasZone) { return s__('ClusterIntegration|Select project and zone to choose machine type'); } diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index a322b7c375e..265c66f8ad1 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -15,7 +15,7 @@ export default { }, }, computed: { - ...mapState(['selectedProject']), + ...mapState(['selectedProject', 'projectHasBillingEnabled']), ...mapState({ items: 'projects' }), ...mapGetters(['hasProject']), hasOneProject() { @@ -25,6 +25,10 @@ export default { return this.items && this.items.length < 2; }, toggleText() { + if (this.isValidatingProjectBilling) { + return s__('ClusterIntegration|Validating project billing status'); + } + if (this.isLoading) { return s__('ClusterIntegration|Fetching projects'); } @@ -42,7 +46,7 @@ export default { helpText() { let message; if (this.hasErrors) { - message = this.gapiError; + return this.errorMessage; } if (!this.items) { @@ -67,12 +71,50 @@ export default { ); }, errorMessage() { + if (!this.projectHasBillingEnabled) { + if (this.gapiError) { + return s__( + 'ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again.', + ); + } + + return sprintf( + s__( + 'Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.', + ), + { + linkToBilling: + 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', + }, + false, + ); + } + return sprintf( s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'), { error: this.gapiError }, ); }, }, + watch: { + selectedProject() { + this.isLoading = true; + this.isValidatingProjectBilling = true; + + this.validateProjectBilling() + .then(this.validateProjectBillingSuccessHandler) + .catch(this.validateProjectBillingFailureHandler); + }, + projectHasBillingEnabled(billingEnabled) { + this.hasErrors = !billingEnabled; + this.isValidatingProjectBilling = false; + }, + }, + data() { + return { + isValidatingProjectBilling: false, + }; + }, created() { this.isLoading = true; @@ -81,7 +123,7 @@ export default { .catch(this.fetchFailureHandler); }, methods: { - ...mapActions(['fetchProjects']), + ...mapActions(['fetchProjects', 'validateProjectBilling']), ...mapActions({ setItem: 'setProject' }), fetchSuccessHandler() { if (this.defaultValue) { @@ -97,6 +139,15 @@ export default { this.isLoading = false; this.hasErrors = false; }, + validateProjectBillingSuccessHandler() { + this.isLoading = false; + }, + validateProjectBillingFailureHandler(resp) { + this.isLoading = false; + this.hasErrors = true; + + this.gapiError = resp.result ? resp.result.error.message : resp; + }, }, }; diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 46d84bbb751..43531813407 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -1,6 +1,6 @@ diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index 46d84bbb751..43531813407 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -1,6 +1,6 @@