Commit 6a65e2f5 authored by Shinya Maeda's avatar Shinya Maeda

specs for controller. Improved validation

parent 944149ec
...@@ -27,13 +27,14 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -27,13 +27,14 @@ class Projects::ClustersController < Projects::ApplicationController
end end
def new def new
@cluster = Clusters::Cluster.new( # @cluster = Clusters::Cluster.new(
platform_type: :kubernetes, # platform_type: :kubernetes,
provider_type: :gcp).tap do |cluster| # provider_type: :gcp).tap do |cluster|
cluster.build_provider_gcp # cluster.build_provider_gcp
cluster.build_platform_kubernetes # cluster.build_platform_kubernetes
cluster.projects << project # cluster.projects << project
end # end
@cluster = Clusters::Cluster.new
end end
def create def create
......
...@@ -10,11 +10,13 @@ module Clusters ...@@ -10,11 +10,13 @@ module Clusters
has_many :projects, through: :cluster_projects, class_name: '::Project' has_many :projects, through: :cluster_projects, class_name: '::Project'
has_one :provider_gcp, class_name: 'Clusters::Providers::Gcp' has_one :provider_gcp, class_name: 'Clusters::Providers::Gcp'
has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes' has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes', validate: { if: :update }
accepts_nested_attributes_for :provider_gcp accepts_nested_attributes_for :provider_gcp, update_only: true
accepts_nested_attributes_for :platform_kubernetes, update_only: true accepts_nested_attributes_for :platform_kubernetes, update_only: true
validates :provider_type, presence: true
validates :platform_type, presence: true
validates :name, cluster_name: true validates :name, cluster_name: true
validate :restrict_modification, on: :update validate :restrict_modification, on: :update
......
...@@ -30,8 +30,8 @@ module Clusters ...@@ -30,8 +30,8 @@ module Clusters
message: Gitlab::Regex.kubernetes_namespace_regex_message message: Gitlab::Regex.kubernetes_namespace_regex_message
} }
validates :api_url, url: true, presence: true, on: :update validates :api_url, url: true, presence: true
validates :token, presence: true, on: :update validates :token, presence: true
after_save :clear_reactive_cache! after_save :clear_reactive_cache!
......
...@@ -28,10 +28,10 @@ module Clusters ...@@ -28,10 +28,10 @@ module Clusters
def cluster_params def cluster_params
return @cluster_params if defined?(@cluster_params) return @cluster_params if defined?(@cluster_params)
params[:provider_gcp_attributes][:machine_type] ||= params[:provider_gcp_attributes].try do |h|
GoogleApi::CloudPlatform::Client::DEFAULT_MACHINE_TYPE h[:machine_type] ||= GoogleApi::CloudPlatform::Client::DEFAULT_MACHINE_TYPE
h[:access_token] ||= access_token
params[:provider_gcp_attributes][:access_token] ||= access_token end
@cluster_params = params.merge(user: current_user) @cluster_params = params.merge(user: current_user)
end end
......
require 'spec_helper' require 'spec_helper'
describe Projects::ClustersController do describe Projects::ClustersController do
set(:user) { create(:user) } include AccessMatchersForController
set(:project) { create(:project) } include GoogleApi::CloudPlatformHelpers
let(:role) { :master }
before do describe 'GET index' do
project.team << [user, role] describe 'functionality' do
let(:user) { create(:user) }
before do
project.add_master(user)
sign_in(user) sign_in(user)
end end
describe 'GET index' do context 'when project has a cluster' do
subject do let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
get :index, namespace_id: project.namespace, let(:project) { cluster.project }
project_id: project
end
context 'when cluster is already created' do it { expect(go).to redirect_to(project_cluster_path(project, project.cluster)) }
let!(:cluster) { create(:gcp_cluster, :created_on_gke, project: project) } end
it 'redirects to show a cluster' do context 'when project does not have a cluster' do
subject let(:project) { create(:project) }
expect(response).to redirect_to(project_cluster_path(project, cluster)) it { expect(go).to redirect_to(new_project_cluster_path(project)) }
end end
end end
context 'when we do not have cluster' do describe 'security' do
it 'redirects to create a cluster' do let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
subject let(:project) { cluster.project }
expect(response).to redirect_to(new_project_cluster_path(project)) it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
def go
get :index, namespace_id: project.namespace.to_param, project_id: project
end end
end end
describe 'GET login' do describe 'GET login' do
render_views let(:project) { create(:project) }
subject do describe 'functionality' do
get :login, namespace_id: project.namespace, let(:user) { create(:user) }
project_id: project
before do
project.add_master(user)
sign_in(user)
end end
context 'when we do have omniauth configured' do context 'when omniauth has been configured' do
it 'shows login button' do let(:key) { 'secere-key' }
subject
let(:session_key_for_redirect_uri) do
GoogleApi::CloudPlatform::Client.session_key_for_redirect_uri(key)
end
before do
allow(SecureRandom).to receive(:hex).and_return(key)
end
it 'has authorize_url' do
go
expect(response.body).to include('auth_buttons/signin_with_google') expect(assigns(:authorize_url)).to include(key)
expect(session[session_key_for_redirect_uri]).to eq(namespace_project_clusters_url(project.namespace, project))
end end
end end
context 'when we do not have omniauth configured' do context 'when omniauth has not configured' do
before do before do
stub_omniauth_setting(providers: []) stub_omniauth_setting(providers: [])
end end
it 'shows notice message' do it 'does not have authorize_url' do
subject go
expect(assigns(:authorize_url)).to be_nil
end
end
end
expect(response.body).to include('Ask your GitLab administrator if you want to use this service.') describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
def go
get :login, namespace_id: project.namespace, project_id: project
end end
end end
...@@ -74,235 +114,406 @@ describe Projects::ClustersController do ...@@ -74,235 +114,406 @@ describe Projects::ClustersController do
end end
describe 'GET new' do describe 'GET new' do
render_views let(:project) { create(:project) }
describe 'functionality' do
let(:user) { create(:user) }
subject do before do
get :new, namespace_id: project.namespace, project.add_master(user)
project_id: project sign_in(user)
end end
context 'when logged' do context 'when access token is valid' do
before do before do
make_logged_in stub_google_api_validate_token
end end
it 'shows a creation form' do it 'has new object' do
subject go
expect(response.body).to include('Create cluster') expect(assigns(:cluster)).to be_an_instance_of(Clusters::Cluster)
end end
end end
context 'when not logged' do context 'when access token is expired' do
it_behaves_like 'requires to login' before do
end stub_google_api_expired_token
end end
describe 'POST create' do it { expect(go).to redirect_to(login_project_clusters_path(project)) }
subject do
post :create, params.merge(namespace_id: project.namespace,
project_id: project)
end end
context 'when not logged' do context 'when access token is not stored in session' do
let(:params) { {} } it { expect(go).to redirect_to(login_project_clusters_path(project)) }
end
end
it_behaves_like 'requires to login' describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
context 'when logged in' do def go
before do get :new, namespace_id: project.namespace, project_id: project
make_logged_in end
end end
context 'when all required parameters are set' do describe 'POST create' do
let(:project) { create(:project) }
let(:params) do let(:params) do
{ {
cluster: { cluster: {
gcp_cluster_name: 'new-cluster', name: 'new-cluster',
gcp_project_id: '111' platform_type: :kubernetes,
provider_type: :gcp,
provider_gcp_attributes: {
gcp_project_id: '111',
}
} }
} }
end end
describe 'functionality' do
let(:user) { create(:user) }
before do
project.add_master(user)
sign_in(user)
end
context 'when access token is valid' do
before do before do
expect(ClusterProvisionWorker).to receive(:perform_async) { } stub_google_api_validate_token
end end
context 'when creates a cluster on gke' do
it 'creates a new cluster' do it 'creates a new cluster' do
expect { subject }.to change { Gcp::Cluster.count } expect(ClusterProvisionWorker).to receive(:perform_async)
expect { go }.to change { Clusters::Cluster.count }
expect(response).to redirect_to(project_cluster_path(project, project.cluster))
end
end
context 'when adds a cluster manually' do
let(:params) do
{
cluster: {
name: 'new-cluster',
platform_type: :kubernetes,
provider_type: :user
}
}
end
it 'creates a new cluster' do
expect(ClusterProvisionWorker).to receive(:perform_async)
expect { go }.to change { Clusters::Cluster.count }
expect(response).to redirect_to(project_cluster_path(project, project.cluster)) expect(response).to redirect_to(project_cluster_path(project, project.cluster))
end end
end end
context 'when not all required parameters are set' do context 'when not all required parameters are set' do
render_views
let(:params) do let(:params) do
{ {
cluster: { cluster: {
project_namespace: 'some namespace' name: 'new-cluster'
} }
} }
end end
it 'shows an error message' do it 'shows an error message' do
expect { subject }.not_to change { Gcp::Cluster.count } expect { go }.not_to change { Clusters::Cluster.count }
expect(assigns(:cluster).errors).not_to be_empty
expect(response).to render_template(:new) expect(response).to render_template(:new)
end end
end end
end end
context 'when access token is expired' do
before do
stub_google_api_expired_token
end
it 'redirects to login page' do
expect(go).to redirect_to(login_project_clusters_path(project))
end
end
context 'when access token is not stored in session' do
it 'redirects to login page' do
expect(go).to redirect_to(login_project_clusters_path(project))
end
end
end
describe 'security' do
it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end
def go
post :create, params.merge(namespace_id: project.namespace, project_id: project)
end
end end
describe 'GET status' do describe 'GET status' do
let(:cluster) { create(:gcp_cluster, :created_on_gke, project: project) } let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
let(:project) { cluster.project }
subject do describe 'functionality' do
get :status, namespace_id: project.namespace, let(:user) { create(:user) }
project_id: project,
id: cluster, before do
format: :json project.add_master(user)
sign_in(user)
end end
it "responds with matching schema" do it "responds with matching schema" do
subject go
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(response).to match_response_schema('cluster_status') expect(response).to match_response_schema('cluster_status')
end end
end end
describe 'GET show' do describe 'security' do
render_views it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
let(:cluster) { create(:gcp_cluster, :created_on_gke, project: project) } it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end
subject do def go
get :show, namespace_id: project.namespace, get :status, namespace_id: project.namespace,
project_id: project, project_id: project,
id: cluster id: cluster,
format: :json
end
end end
context 'when logged as master' do describe 'GET show' do
it "allows to update cluster" do let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
subject let(:project) { cluster.project }
expect(response).to have_http_status(:ok) describe 'functionality' do
expect(response.body).to include("Save") let(:user) { create(:user) }
before do
project.add_master(user)
sign_in(user)
end end
it "allows remove integration" do it "renders view" do
subject go
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(response.body).to include("Remove integration") expect(assigns(:cluster)).to eq(cluster)
end end
end end
context 'when logged as developer' do describe 'security' do
let(:role) { :developer } it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it "does not allow to access page" do it { expect { go }.to be_allowed_for(:master).of(project) }
subject it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
expect(response).to have_http_status(:not_found) it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
def go
get :show, namespace_id: project.namespace,
project_id: project,
id: cluster
end end
end end
describe 'PUT update' do describe 'PUT update' do
render_views let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
let(:project) { cluster.project }
let(:service) { project.build_kubernetes_service } describe 'functionality' do
let(:cluster) { create(:gcp_cluster, :created_on_gke, project: project, service: service) } let(:user) { create(:user) }
let(:params) { {} }
subject do before do
put :update, params.merge(namespace_id: project.namespace, project.add_master(user)
project_id: project, sign_in(user)
id: cluster)
end end
context 'when logged as master' do context 'when update enabled' do
context 'when valid params are used' do
let(:params) do let(:params) do
{ {
cluster: { enabled: false } cluster: { enabled: false }
} }
end end
it "redirects back to show page" do it "updates and redirects back to show page" do
subject go
cluster.reload
expect(response).to redirect_to(project_cluster_path(project, project.cluster)) expect(response).to redirect_to(project_cluster_path(project, project.cluster))
expect(flash[:notice]).to eq('Cluster was successfully updated.') expect(flash[:notice]).to eq('Cluster was successfully updated.')
expect(cluster.enabled).to be_falsey
end
context 'when cluster is being created' do
let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
it "rejects changes" do
go
expect(response).to have_http_status(:ok)
expect(response).to render_template(:show)
expect(cluster.enabled).to be_truthy
end
end end
end end
context 'when invalid params are used' do context 'when update namespace' do
let(:namespace) { 'namespace-123' }
let(:params) do let(:params) do
{ {
cluster: { project_namespace: 'my Namespace 321321321 #' } cluster: {
platform_kubernetes_attributes: {
namespace: namespace
}
} }
}
end
it "updates and redirects back to show page" do
go
cluster.reload
expect(response).to redirect_to(project_cluster_path(project, project.cluster))
expect(flash[:notice]).to eq('Cluster was successfully updated.')
expect(cluster.platform.namespace).to eq(namespace)
end end
context 'when namespace is invalid' do
let(:namespace) { 'my Namespace 321321321 #' }
it "rejects changes" do it "rejects changes" do
subject go
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(response).to render_template(:show) expect(response).to render_template(:show)
expect(cluster.platform.namespace).not_to eq(namespace)
end
end end
end end
end end
context 'when logged as developer' do describe 'security' do
let(:role) { :developer } let(:params) do
{
it "does not allow to update cluster" do cluster: { enabled: false }
subject }
end
expect(response).to have_http_status(:not_found) it { expect { go }.to be_allowed_for(:admin) }
it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
def go
put :update, params.merge(namespace_id: project.namespace,
project_id: project,
id: cluster)
end end
end end
describe 'delete update' do describe 'delete update' do
let(:cluster) { create(:gcp_cluster, :created_on_gke, project: project) } let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
let(:project) { cluster.project }
subject do describe 'functionality' do
delete :destroy, namespace_id: project.namespace, let(:user) { create(:user) }
project_id: project,
id: cluster before do
project.add_master(user)
sign_in(user)
end end
context 'when logged as master' do it "destroys and redirects back to clusters list" do
it "redirects back to clusters list" do expect { go }
subject .to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Platforms::Kubernetes.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(-1)
expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end
context 'when cluster is being created' do
let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
it "destroys and redirects back to clusters list" do
expect { go }
.to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Platforms::Kubernetes.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(-1)
expect(response).to redirect_to(project_clusters_path(project)) expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.') expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end end
end end
context 'when logged as developer' do context 'when provider is user' do
let(:role) { :developer } let(:cluster) { create(:cluster, :project, :provided_by_user) }
it "does not allow to destroy cluster" do it "destroys and redirects back to clusters list" do
subject expect { go }
.to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Platforms::Kubernetes.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(0)
expect(response).to have_http_status(:not_found) expect(response).to redirect_to(project_clusters_path(project))
expect(flash[:notice]).to eq('Cluster integration was successfully removed.')
end end
end end
end end
def make_logged_in describe 'security' do
session[GoogleApi::CloudPlatform::Client.session_key_for_token] = '1234' it { expect { go }.to be_allowed_for(:admin) }
session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at] = in_hour.to_i.to_s it { expect { go }.to be_allowed_for(:owner).of(project) }
it { expect { go }.to be_allowed_for(:master).of(project) }
it { expect { go }.to be_denied_for(:developer).of(project) }
it { expect { go }.to be_denied_for(:reporter).of(project) }
it { expect { go }.to be_denied_for(:guest).of(project) }
it { expect { go }.to be_denied_for(:user) }
it { expect { go }.to be_denied_for(:external) }
end end
def in_hour def go
Time.now + 1.hour delete :destroy, namespace_id: project.namespace,
project_id: project,
id: cluster
end
end end
end end
...@@ -42,7 +42,9 @@ FactoryGirl.define do ...@@ -42,7 +42,9 @@ FactoryGirl.define do
end end
after(:create) do |cluster, evaluator| after(:create) do |cluster, evaluator|
create(:platform_kubernetes, cluster: cluster) build(:platform_kubernetes, cluster: cluster).tap do |platform|
platform.save!(validate: false)
end
end end
end end
end end
......
...@@ -3,19 +3,16 @@ FactoryGirl.define do ...@@ -3,19 +3,16 @@ FactoryGirl.define do
cluster cluster
namespace nil namespace nil
trait :ca_cert do
after(:create) do |platform_kubernetes, evaluator|
pem_file = File.expand_path(Rails.root.join('spec/fixtures/clusters/sample_cert.pem'))
platform_kubernetes.ca_cert = File.read(pem_file)
end
end
trait :configured do trait :configured do
api_url 'https://kubernetes.example.com' api_url 'https://kubernetes.example.com'
ca_cert nil
token 'a' * 40 token 'a' * 40
username 'xxxxxx' username 'xxxxxx'
password 'xxxxxx' password 'xxxxxx'
after(:create) do |platform_kubernetes, evaluator|
pem_file = File.expand_path(Rails.root.join('spec/fixtures/clusters/sample_cert.pem'))
platform_kubernetes.ca_cert = File.read(pem_file)
end
end end
end end
end end
...@@ -10,6 +10,8 @@ describe Clusters::Cluster do ...@@ -10,6 +10,8 @@ describe Clusters::Cluster do
it { is_expected.to delegate_method(:status_name).to(:provider) } it { is_expected.to delegate_method(:status_name).to(:provider) }
it { is_expected.to delegate_method(:on_creation?).to(:provider) } it { is_expected.to delegate_method(:on_creation?).to(:provider) }
it { is_expected.to respond_to :project } it { is_expected.to respond_to :project }
it { is_expected.to validate_presence_of(:provider_type) }
it { is_expected.to validate_presence_of(:platform_type) }
describe '.enabled' do describe '.enabled' do
subject { described_class.enabled } subject { described_class.enabled }
......
...@@ -11,7 +11,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -11,7 +11,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
describe 'before_validation' do describe 'before_validation' do
context 'when namespace includes upper case' do context 'when namespace includes upper case' do
let(:kubernetes) { create(:platform_kubernetes, namespace: namespace) } let(:kubernetes) { create(:platform_kubernetes, :configured, namespace: namespace) }
let(:namespace) { 'ABC' } let(:namespace) { 'ABC' }
it 'converts to lower case' do it 'converts to lower case' do
...@@ -24,7 +24,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -24,7 +24,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject { kubernetes.valid? } subject { kubernetes.valid? }
context 'when validates namespace' do context 'when validates namespace' do
let(:kubernetes) { build(:platform_kubernetes, namespace: namespace) } let(:kubernetes) { build(:platform_kubernetes, :configured, namespace: namespace) }
context 'when namespace is blank' do context 'when namespace is blank' do
let(:namespace) { '' } let(:namespace) { '' }
...@@ -52,8 +52,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -52,8 +52,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
end end
context 'when validates api_url' do context 'when validates api_url' do
context 'when updates a record' do let(:kubernetes) { build(:platform_kubernetes, :configured) }
let(:kubernetes) { create(:platform_kubernetes) }
before do before do
kubernetes.api_url = api_url kubernetes.api_url = api_url
...@@ -78,24 +77,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -78,24 +77,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
end end
end end
context 'when creates a record' do
let(:kubernetes) { build(:platform_kubernetes) }
before do
kubernetes.api_url = api_url
end
context 'when api_url is nil' do
let(:api_url) { nil }
it { expect(kubernetes.save).to be_truthy }
end
end
end
context 'when validates token' do context 'when validates token' do
context 'when updates a record' do let(:kubernetes) { build(:platform_kubernetes, :configured) }
let(:kubernetes) { create(:platform_kubernetes) }
before do before do
kubernetes.token = token kubernetes.token = token
...@@ -107,28 +90,14 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -107,28 +90,14 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
it { expect(kubernetes.save).to be_falsey } it { expect(kubernetes.save).to be_falsey }
end end
end end
context 'when creates a record' do
let(:kubernetes) { build(:platform_kubernetes) }
before do
kubernetes.token = token
end
context 'when token is nil' do
let(:token) { nil }
it { expect(kubernetes.save).to be_truthy }
end
end
end
end end
describe '#actual_namespace' do describe '#actual_namespace' do
subject { kubernetes.actual_namespace } subject { kubernetes.actual_namespace }
let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) } let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
let(:kubernetes) { create(:platform_kubernetes, namespace: namespace) } let(:project) { cluster.project }
let(:kubernetes) { create(:platform_kubernetes, :configured, namespace: namespace) }
context 'when namespace is present' do context 'when namespace is present' do
let(:namespace) { 'namespace-123' } let(:namespace) { 'namespace-123' }
...@@ -139,7 +108,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -139,7 +108,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
context 'when namespace is not present' do context 'when namespace is not present' do
let(:namespace) { nil } let(:namespace) { nil }
it { is_expected.to eq("#{cluster.project.path}-#{cluster.project.id}") } it { is_expected.to eq("#{project.path}-#{project.id}") }
end end
end end
...@@ -154,12 +123,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -154,12 +123,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
describe '#default_namespace' do describe '#default_namespace' do
subject { kubernetes.default_namespace } subject { kubernetes.default_namespace }
let(:kubernetes) { create(:platform_kubernetes) } let(:kubernetes) { create(:platform_kubernetes, :configured) }
context 'when cluster belongs to a project' do context 'when cluster belongs to a project' do
let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) } let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
let(:project) { cluster.project }
it { is_expected.to eq("#{cluster.project.path}-#{cluster.project.id}") } it { is_expected.to eq("#{project.path}-#{project.id}") }
end end
context 'when cluster belongs to nothing' do context 'when cluster belongs to nothing' do
...@@ -229,7 +199,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -229,7 +199,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
let!(:cluster) { create(:cluster, :project, platform_kubernetes: service) } let!(:cluster) { create(:cluster, :project, platform_kubernetes: service) }
let(:project) { cluster.project } let(:project) { cluster.project }
let(:service) { create(:platform_kubernetes) } let(:service) { create(:platform_kubernetes, :configured) }
let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") } let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") }
context 'with invalid pods' do context 'with invalid pods' do
...@@ -268,7 +238,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching ...@@ -268,7 +238,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject { service.calculate_reactive_cache } subject { service.calculate_reactive_cache }
let!(:cluster) { create(:cluster, :project, enabled: enabled, platform_kubernetes: service) } let!(:cluster) { create(:cluster, :project, enabled: enabled, platform_kubernetes: service) }
let(:service) { create(:platform_kubernetes, :ca_cert) } let(:service) { create(:platform_kubernetes, :configured) }
let(:enabled) { true } let(:enabled) { true }
context 'when cluster is disabled' do context 'when cluster is disabled' do
......
module GoogleApi module GoogleApi
module CloudPlatformHelpers module CloudPlatformHelpers
def stub_google_api_validate_token
request.session[GoogleApi::CloudPlatform::Client.session_key_for_token] = 'token'
request.session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at] = 1.hour.since.to_i.to_s
end
def stub_google_api_expired_token
request.session[GoogleApi::CloudPlatform::Client.session_key_for_token] = 'token'
request.session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at] = 1.hour.ago.to_i.to_s
end
def stub_cloud_platform_get_zone_cluster(project_id, zone, cluster_id, **options) def stub_cloud_platform_get_zone_cluster(project_id, zone, cluster_id, **options)
WebMock.stub_request(:get, cloud_platform_get_zone_cluster_url(project_id, zone, cluster_id)) WebMock.stub_request(:get, cloud_platform_get_zone_cluster_url(project_id, zone, cluster_id))
.to_return(cloud_platform_response(cloud_platform_cluster_body(options))) .to_return(cloud_platform_response(cloud_platform_cluster_body(options)))
......
...@@ -14,7 +14,7 @@ module KubernetesHelpers ...@@ -14,7 +14,7 @@ module KubernetesHelpers
end end
def stub_kubeclient_pods(response = nil) def stub_kubeclient_pods(response = nil)
stub_kubeclient_discover stub_kubeclient_discover(service.api_url)
pods_url = service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods" pods_url = service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods"
WebMock.stub_request(:get, pods_url).to_return(response || kube_pods_response) WebMock.stub_request(:get, pods_url).to_return(response || kube_pods_response)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment