Remove the GCP billing verification step
This commit is contained in:
Matija Čupić
parent
e4c661a138
commit
45dadeec7d
3 changed files with 97 additions and 174 deletions
|
|
@ -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 <a href=%{link_to_billing} target="_blank" rel="noopener noreferrer">enable billing for one of your projects to be able to create a Kubernetes cluster</a>, 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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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])
|
||||
end
|
||||
|
||||
context 'when user does not have a cluster and visits cluster index page' 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'
|
||||
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...')
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
context 'when user filled form with invalid parameters' do
|
||||
before do
|
||||
click_button 'Create Kubernetes cluster'
|
||||
end
|
||||
|
||||
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]) }
|
||||
|
||||
before do
|
||||
visit project_cluster_path(project, cluster)
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
it 'user sees the successful message' do
|
||||
expect(page).to have_content('Kubernetes cluster was successfully updated.')
|
||||
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
|
||||
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
|
||||
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'
|
||||
|
||||
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
|
||||
|
||||
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.')
|
||||
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'
|
||||
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...')
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
context 'when user filled form with invalid parameters' do
|
||||
before do
|
||||
click_button 'Create Kubernetes cluster'
|
||||
end
|
||||
|
||||
it 'user sees a validation error' do
|
||||
expect(page).to have_css('#error_explanation')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when gcp billing status is not in redis' do
|
||||
context 'when user does have a cluster and visits cluster page' do
|
||||
let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
|
||||
|
||||
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)
|
||||
|
||||
visit project_clusters_path(project)
|
||||
|
||||
click_link 'Add Kubernetes cluster'
|
||||
click_link 'Create on Google Kubernetes Engine'
|
||||
|
||||
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'
|
||||
visit project_cluster_path(project, cluster)
|
||||
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.')
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
it 'user sees the successful message' do
|
||||
expect(page).to have_content('Kubernetes cluster was successfully updated.')
|
||||
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
|
||||
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
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue