Commit 9e2b996f authored by Kamil Trzcinski's avatar Kamil Trzcinski

Merge remote-tracking branch 'origin/38464-k8s-apps' into...

Merge remote-tracking branch 'origin/38464-k8s-apps' into 36629-35958-add-cluster-application-section
parents 797e758b c6c9b37b
......@@ -9,7 +9,7 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
application_class: @application_class,
cluster: @cluster).execute
if scheduled
head :no_data
head :no_content
else
head :bad_request
end
......
......@@ -3,8 +3,6 @@ module Clusters
class Helm < ActiveRecord::Base
self.table_name = 'clusters_applications_helm'
NAME = 'helm'.freeze
include ::Clusters::Concerns::ApplicationStatus
belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
......@@ -13,8 +11,12 @@ module Clusters
validates :cluster, presence: true
def self.application_name
self.to_s.demodulize.underscore
end
def name
NAME
self.class.application_name
end
end
end
......
......@@ -5,7 +5,7 @@ module Clusters
self.table_name = 'clusters'
APPLICATIONS = {
Clusters::Applications::Helm::NAME => Clusters::Applications::Helm
Applications::Helm.application_name => Applications::Helm
}.freeze
belongs_to :user
......
......@@ -24,7 +24,7 @@ module Clusters
end
event :make_scheduled do
transition %i(installable errored) => :scheduled
transition any - [:scheduled] => :scheduled
end
before_transition any => [:scheduled] do |app_status, _|
......
......@@ -192,7 +192,7 @@ constraints(ProjectUrlConstrainer.new) do
get :status, format: :json
scope :applications do
post '/*application', to: 'clusters/applications#create'
post '/*application', to: 'clusters/applications#create', as: :install_applications
end
end
end
......
require 'spec_helper'
describe Projects::Clusters::ApplicationsController do
include AccessMatchersForController
def current_application
Clusters::Cluster::APPLICATIONS[application]
end
describe 'POST create' do
let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
let(:project) { cluster.project }
let(:application) { 'helm' }
let(:params) { { application: application, id: cluster.id } }
describe 'functionality' do
let(:user) { create(:user) }
before do
project.add_master(user)
sign_in(user)
end
it 'schedule an application installation' do
expect(ClusterInstallAppWorker).to receive(:perform_async).with(application, anything).once
expect { go }.to change { current_application.count }
expect(response).to have_http_status(:no_content)
expect(cluster.application_helm).to be_scheduled
end
context 'when cluster do not exists' do
before do
cluster.destroy!
end
it 'return 404' do
expect { go }.not_to change { current_application.count }
expect(response).to have_http_status(:not_found)
end
end
context 'when application is unknown' do
let(:application) { 'unkwnown-app' }
it 'return 404' do
go
expect(response).to have_http_status(:not_found)
end
end
end
describe 'security' do
before do
allow(ClusterInstallAppWorker).to receive(:perform_async)
end
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
FactoryGirl.define do
factory :applications_helm, class: Clusters::Applications::Helm do
trait :cluster do
before(:create) do |app, _|
app.cluster = create(:cluster)
end
end
trait :installable do
cluster
status 0
end
trait :scheduled do
cluster
status 1
end
trait :installing do
cluster
status 2
end
trait :installed do
cluster
status 3
end
trait :errored do
cluster
status(-1)
status_reason 'something went wrong'
end
end
end
require 'rails_helper'
require_relative '../kubernetes_spec'
RSpec.describe Clusters::Applications::Helm, type: :model do
it_behaves_like 'a registered kubernetes app'
it { is_expected.to belong_to(:cluster) }
it { is_expected.to validate_presence_of(:cluster) }
it { is_expected.to belong_to(:kubernetes_service) }
describe '#name' do
it 'is .application_name' do
expect(subject.name).to eq(described_class.application_name)
end
it 'is recorded in Clusters::Cluster::APPLICATIONS' do
expect(Clusters::Cluster::APPLICATIONS[subject.name]).to eq(described_class)
end
end
describe '#version' do
it 'defaults to Gitlab::Kubernetes::Helm::HELM_VERSION' do
expect(subject.version).to eq(Gitlab::Kubernetes::Helm::HELM_VERSION)
end
end
describe '#status' do
it 'defaults to :installable' do
expect(subject.status_name).to be(:installable)
end
end
describe 'status state machine' do
describe '#make_installing' do
subject { create(:applications_helm, :scheduled) }
it 'is installing' do
subject.make_installing!
expect(subject).to be_installing
end
end
describe '#make_installed' do
subject { create(:applications_helm, :installing) }
it 'is installed' do
subject.make_installed
expect(subject).to be_installed
end
end
describe '#make_errored' do
subject { create(:applications_helm, :installing) }
let(:reason) { 'some errors' }
it 'is errored' do
subject.make_errored(reason)
expect(subject).to be_errored
expect(subject.status_reason).to eq(reason)
end
end
describe '#make_scheduled' do
subject { create(:applications_helm, :installable) }
it 'is scheduled' do
subject.make_scheduled
expect(subject).to be_scheduled
end
describe 'when was errored' do
subject { create(:applications_helm, :errored) }
it 'clears #status_reason' do
expect(subject.status_reason).not_to be_nil
subject.make_scheduled!
describe '#cluster' do
it 'is an alias to #kubernetes_service' do
expect(subject.method(:cluster).original_name).to eq(:kubernetes_service)
expect(subject.status_reason).to be_nil
end
end
end
end
end
......@@ -5,7 +5,7 @@ module AccessMatchersForController
extend RSpec::Matchers::DSL
include Warden::Test::Helpers
EXPECTED_STATUS_CODE_ALLOWED = [200, 201, 302].freeze
EXPECTED_STATUS_CODE_ALLOWED = [200, 201, 204, 302].freeze
EXPECTED_STATUS_CODE_DENIED = [401, 404].freeze
def emulate_user(role, membership = nil)
......
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