Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
6a65e2f5
Commit
6a65e2f5
authored
Oct 31, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
specs for controller. Improved validation
parent
944149ec
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
446 additions
and
251 deletions
+446
-251
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+8
-7
app/models/clusters/cluster.rb
app/models/clusters/cluster.rb
+4
-2
app/models/clusters/platforms/kubernetes.rb
app/models/clusters/platforms/kubernetes.rb
+2
-2
app/services/clusters/create_service.rb
app/services/clusters/create_service.rb
+4
-4
spec/controllers/projects/clusters_controller_spec.rb
spec/controllers/projects/clusters_controller_spec.rb
+377
-166
spec/factories/clusters/cluster.rb
spec/factories/clusters/cluster.rb
+3
-1
spec/factories/clusters/platforms/kubernetes.rb
spec/factories/clusters/platforms/kubernetes.rb
+5
-8
spec/models/clusters/cluster_spec.rb
spec/models/clusters/cluster_spec.rb
+2
-0
spec/models/clusters/platforms/kubernetes_spec.rb
spec/models/clusters/platforms/kubernetes_spec.rb
+30
-60
spec/support/google_api/cloud_platform_helpers.rb
spec/support/google_api/cloud_platform_helpers.rb
+10
-0
spec/support/kubernetes_helpers.rb
spec/support/kubernetes_helpers.rb
+1
-1
No files found.
app/controllers/projects/clusters_controller.rb
View file @
6a65e2f5
...
...
@@ -27,13 +27,14 @@ class Projects::ClustersController < Projects::ApplicationController
end
def
new
@cluster
=
Clusters
::
Cluster
.
new
(
platform_type: :kubernetes
,
provider_type: :gcp
).
tap
do
|
cluster
|
cluster
.
build_provider_gcp
cluster
.
build_platform_kubernetes
cluster
.
projects
<<
project
end
# @cluster = Clusters::Cluster.new(
# platform_type: :kubernetes,
# provider_type: :gcp).tap do |cluster|
# cluster.build_provider_gcp
# cluster.build_platform_kubernetes
# cluster.projects << project
# end
@cluster
=
Clusters
::
Cluster
.
new
end
def
create
...
...
app/models/clusters/cluster.rb
View file @
6a65e2f5
...
...
@@ -10,11 +10,13 @@ module Clusters
has_many
:projects
,
through: :cluster_projects
,
class_name:
'::Project'
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
validates
:provider_type
,
presence:
true
validates
:platform_type
,
presence:
true
validates
:name
,
cluster_name:
true
validate
:restrict_modification
,
on: :update
...
...
app/models/clusters/platforms/kubernetes.rb
View file @
6a65e2f5
...
...
@@ -30,8 +30,8 @@ module Clusters
message:
Gitlab
::
Regex
.
kubernetes_namespace_regex_message
}
validates
:api_url
,
url:
true
,
presence:
true
,
on: :update
validates
:token
,
presence:
true
,
on: :update
validates
:api_url
,
url:
true
,
presence:
true
validates
:token
,
presence:
true
after_save
:clear_reactive_cache!
...
...
app/services/clusters/create_service.rb
View file @
6a65e2f5
...
...
@@ -28,10 +28,10 @@ module Clusters
def
cluster_params
return
@cluster_params
if
defined?
(
@cluster_params
)
params
[
:provider_gcp_attributes
]
[
:machine_type
]
||=
GoogleApi
::
CloudPlatform
::
Client
::
DEFAULT_MACHINE_TYPE
params
[
:provider_gcp_attributes
][
:access_token
]
||=
access_token
params
[
:provider_gcp_attributes
]
.
try
do
|
h
|
h
[
:machine_type
]
||=
GoogleApi
::
CloudPlatform
::
Client
::
DEFAULT_MACHINE_TYPE
h
[
:access_token
]
||=
access_token
end
@cluster_params
=
params
.
merge
(
user:
current_user
)
end
...
...
spec/controllers/projects/clusters_controller_spec.rb
View file @
6a65e2f5
require
'spec_helper'
describe
Projects
::
ClustersController
do
set
(
:user
)
{
create
(
:user
)
}
set
(
:project
)
{
create
(
:project
)
}
let
(
:role
)
{
:master
}
include
AccessMatchersForController
include
GoogleApi
::
CloudPlatformHelpers
before
do
project
.
team
<<
[
user
,
role
]
describe
'GET index'
do
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
sign_in
(
user
)
end
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
describe
'GET index'
do
subject
do
get
:index
,
namespace_id:
project
.
namespace
,
project_id:
project
end
context
'when project has a cluster'
do
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:project
)
{
cluster
.
project
}
context
'when cluster is already created'
do
let!
(
:cluster
)
{
create
(
:gcp_cluster
,
:created_on_gke
,
project:
project
)
}
it
{
expect
(
go
).
to
redirect_to
(
project_cluster_path
(
project
,
project
.
cluster
))
}
end
it
'redirects to show
a cluster'
do
subject
context
'when project does not have
a cluster'
do
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
context
'when we do not have cluster'
do
it
'redirects to create a cluster'
do
subject
describe
'security'
do
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:project
)
{
cluster
.
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
expect
(
response
).
to
redirect_to
(
new_project_cluster_path
(
project
))
end
def
go
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
end
end
describe
'GET login'
do
render_views
let
(
:project
)
{
create
(
:project
)
}
subject
do
get
:login
,
namespace_id:
project
.
namespace
,
project_id:
project
end
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
context
'when we do have omniauth configured'
do
it
'shows login button'
do
subject
expect
(
response
.
body
).
to
include
(
'auth_buttons/signin_with_google'
)
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
end
context
'when we do not have omniauth configured'
do
before
do
stub_omniauth_setting
(
providers:
[])
context
'when omniauth has been configured'
do
let
(
:key
)
{
'secere-key'
}
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
(
assigns
(
:authorize_url
)).
to
include
(
key
)
expect
(
session
[
session_key_for_redirect_uri
]).
to
eq
(
namespace_project_clusters_url
(
project
.
namespace
,
project
))
end
end
it
'shows notice message'
do
subject
context
'when omniauth has not configured'
do
before
do
stub_omniauth_setting
(
providers:
[])
end
expect
(
response
.
body
).
to
include
(
'Ask your GitLab administrator if you want to use this service.'
)
it
'does not have authorize_url'
do
go
expect
(
assigns
(
:authorize_url
)).
to
be_nil
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
get
:login
,
namespace_id:
project
.
namespace
,
project_id:
project
end
end
shared_examples
'requires to login'
do
...
...
@@ -74,235 +114,406 @@ describe Projects::ClustersController do
end
describe
'GET new'
do
render_views
let
(
:project
)
{
create
(
:project
)
}
subject
do
get
:new
,
namespace_id:
project
.
namespace
,
project_id:
project
end
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
context
'when logged'
do
before
do
make_logged_in
project
.
add_master
(
user
)
sign_in
(
user
)
end
context
'when access token is valid'
do
before
do
stub_google_api_validate_token
end
it
'has new object'
do
go
expect
(
assigns
(
:cluster
)).
to
be_an_instance_of
(
Clusters
::
Cluster
)
end
end
it
'shows a creation form'
do
subject
context
'when access token is expired'
do
before
do
stub_google_api_expired_token
end
it
{
expect
(
go
).
to
redirect_to
(
login_project_clusters_path
(
project
))
}
end
expect
(
response
.
body
).
to
include
(
'Create cluster'
)
context
'when access token is not stored in session'
do
it
{
expect
(
go
).
to
redirect_to
(
login_project_clusters_path
(
project
))
}
end
end
context
'when not logged'
do
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
def
go
get
:new
,
namespace_id:
project
.
namespace
,
project_id:
project
end
end
describe
'POST create'
do
subject
do
post
:create
,
params
.
merge
(
namespace_id:
project
.
namespace
,
project_id:
project
)
let
(
:project
)
{
create
(
:project
)
}
let
(
:params
)
do
{
cluster:
{
name:
'new-cluster'
,
platform_type: :kubernetes
,
provider_type: :gcp
,
provider_gcp_attributes:
{
gcp_project_id:
'111'
,
}
}
}
end
context
'when not logged'
do
let
(
:params
)
{
{}
}
it_behaves_like
'requires to login'
end
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
context
'when logged in'
do
before
do
make_logged_in
project
.
add_master
(
user
)
sign_in
(
user
)
end
context
'when all required parameters are set'
do
let
(
:params
)
do
{
cluster:
{
gcp_cluster_name:
'new-cluster'
,
gcp_project_id:
'111'
}
}
context
'when access token is valid'
do
before
do
stub_google_api_validate_token
end
before
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
{
}
context
'when creates a cluster on gke'
do
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
))
end
end
it
'creates a new cluster'
do
expect
{
subject
}.
to
change
{
Gcp
::
Cluster
.
count
}
context
'when adds a cluster manually'
do
let
(
:params
)
do
{
cluster:
{
name:
'new-cluster'
,
platform_type: :kubernetes
,
provider_type: :user
}
}
end
expect
(
response
).
to
redirect_to
(
project_cluster_path
(
project
,
project
.
cluster
))
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
))
end
end
end
context
'when not all required parameters are set'
do
render_views
let
(
:params
)
do
{
cluster:
{
project_namespace:
'some namespace'
context
'when not all required parameters are set'
do
let
(
:params
)
do
{
cluster:
{
name:
'new-cluster'
}
}
}
end
it
'shows an error message'
do
expect
{
go
}.
not_to
change
{
Clusters
::
Cluster
.
count
}
expect
(
assigns
(
:cluster
).
errors
).
not_to
be_empty
expect
(
response
).
to
render_template
(
:new
)
end
end
end
context
'when access token is expired'
do
before
do
stub_google_api_expired_token
end
it
'shows an error message'
do
expect
{
subject
}.
not_to
change
{
Gcp
::
Cluster
.
count
}
it
'redirects to login page'
do
expect
(
go
).
to
redirect_to
(
login_project_clusters_path
(
project
))
end
end
expect
(
response
).
to
render_template
(
:new
)
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
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
}
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
subject
do
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
it
"responds with matching schema"
do
go
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'cluster_status'
)
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
get
:status
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
,
format: :json
end
it
"responds with matching schema"
do
subject
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'cluster_status'
)
end
end
describe
'GET show'
do
render_views
let
(
:cluster
)
{
create
(
:gcp_cluster
,
:created_on_gke
,
project:
project
)
}
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:project
)
{
cluster
.
project
}
subject
do
get
:show
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
end
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
context
'when logged as master'
do
it
"allows to update cluster"
do
subject
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
.
body
).
to
include
(
"Save"
)
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
it
"
allows remove integration
"
do
subject
it
"
renders view
"
do
go
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
.
body
).
to
include
(
"Remove integration"
)
expect
(
assigns
(
:cluster
)).
to
eq
(
cluster
)
end
end
context
'when logged as developer'
do
let
(
:role
)
{
:developer
}
it
"does not allow to access page"
do
subject
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
expect
(
response
).
to
have_http_status
(
:not_found
)
end
def
go
get
:show
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
end
end
describe
'PUT update'
do
render_views
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:project
)
{
cluster
.
project
}
let
(
:service
)
{
project
.
build_kubernetes_service
}
let
(
:cluster
)
{
create
(
:gcp_cluster
,
:created_on_gke
,
project:
project
,
service:
service
)
}
let
(
:params
)
{
{}
}
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
subject
do
put
:update
,
params
.
merge
(
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
)
end
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
context
'when logged as master'
do
context
'when valid params are used'
do
context
'when update enabled'
do
let
(
:params
)
do
{
cluster:
{
enabled:
false
}
}
end
it
"redirects back to show page"
do
subject
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
.
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
context
'when invalid params are used'
do
context
'when update namespace'
do
let
(
:namespace
)
{
'namespace-123'
}
let
(
:params
)
do
{
cluster:
{
project_namespace:
'my Namespace 321321321 #'
}
cluster:
{
platform_kubernetes_attributes:
{
namespace:
namespace
}
}
}
end
it
"rejects changes"
do
subject
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
context
'when namespace is invalid'
do
let
(
:namespace
)
{
'my Namespace 321321321 #'
}
it
"rejects changes"
do
go
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:show
)
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:show
)
expect
(
cluster
.
platform
.
namespace
).
not_to
eq
(
namespace
)
end
end
end
end
context
'when logged as developer'
do
let
(
:role
)
{
:developer
}
describe
'security'
do
let
(
:params
)
do
{
cluster:
{
enabled:
false
}
}
end
it
"does not allow to update cluster"
do
subject
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
expect
(
response
).
to
have_http_status
(
:not_found
)
end
def
go
put
:update
,
params
.
merge
(
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
)
end
end
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
delete
:destroy
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
end
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
context
'when logged as master'
do
it
"redirects back to clusters list"
do
subject
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
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
(
flash
[
:notice
]).
to
eq
(
'Cluster integration was successfully removed.'
)
end
end
context
'when logged as developer'
do
let
(
:role
)
{
:developer
}
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
(
flash
[
:notice
]).
to
eq
(
'Cluster integration was successfully removed.'
)
end
end
context
'when provider is user'
do
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_user
)
}
it
"does not allow to destroy cluster"
do
subject
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
(
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
def
make_logged_in
session
[
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_token
]
=
'1234'
session
[
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_expires_at
]
=
in_hour
.
to_i
.
to_s
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
in_hour
Time
.
now
+
1
.
hour
def
go
delete
:destroy
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
cluster
end
end
end
spec/factories/clusters/cluster.rb
View file @
6a65e2f5
...
...
@@ -42,7 +42,9 @@ FactoryGirl.define do
end
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
...
...
spec/factories/clusters/platforms/kubernetes.rb
View file @
6a65e2f5
...
...
@@ -3,19 +3,16 @@ FactoryGirl.define do
cluster
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
api_url
'https://kubernetes.example.com'
ca_cert
nil
token
'a'
*
40
username
'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
spec/models/clusters/cluster_spec.rb
View file @
6a65e2f5
...
...
@@ -10,6 +10,8 @@ describe Clusters::Cluster do
it
{
is_expected
.
to
delegate_method
(
:status_name
).
to
(
:provider
)
}
it
{
is_expected
.
to
delegate_method
(
:on_creation?
).
to
(
:provider
)
}
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
subject
{
described_class
.
enabled
}
...
...
spec/models/clusters/platforms/kubernetes_spec.rb
View file @
6a65e2f5
...
...
@@ -11,7 +11,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
describe
'before_validation'
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'
}
it
'converts to lower case'
do
...
...
@@ -24,7 +24,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject
{
kubernetes
.
valid?
}
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
let
(
:namespace
)
{
''
}
...
...
@@ -52,74 +52,42 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
end
context
'when validates api_url'
do
context
'when updates a record'
do
let
(
:kubernetes
)
{
create
(
:platform_kubernetes
)
}
let
(
:kubernetes
)
{
build
(
:platform_kubernetes
,
:configured
)
}
before
do
kubernetes
.
api_url
=
api_url
end
context
'when api_url is invalid url'
do
let
(
:api_url
)
{
'!!!!!!'
}
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
context
'when api_url is nil'
do
let
(
:api_url
)
{
nil
}
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
before
do
kubernetes
.
api_url
=
api_url
end
context
'when api_url is
valid url'
do
let
(
:api_url
)
{
'https://111.111.111.111
'
}
context
'when api_url is in
valid url'
do
let
(
:api_url
)
{
'!!!!!!
'
}
it
{
expect
(
kubernetes
.
save
).
to
be_truthy
}
end
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
context
'when
creates a record
'
do
let
(
:
kubernetes
)
{
build
(
:platform_kubernetes
)
}
context
'when
api_url is nil
'
do
let
(
:
api_url
)
{
nil
}
before
do
kubernetes
.
api_url
=
api_url
end
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
context
'when api_url is ni
l'
do
let
(
:api_url
)
{
nil
}
context
'when api_url is valid ur
l'
do
let
(
:api_url
)
{
'https://111.111.111.111'
}
it
{
expect
(
kubernetes
.
save
).
to
be_truthy
}
end
it
{
expect
(
kubernetes
.
save
).
to
be_truthy
}
end
end
context
'when validates token'
do
context
'when updates a record'
do
let
(
:kubernetes
)
{
create
(
:platform_kubernetes
)
}
let
(
:kubernetes
)
{
build
(
:platform_kubernetes
,
:configured
)
}
before
do
kubernetes
.
token
=
token
end
context
'when token is nil'
do
let
(
:token
)
{
nil
}
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
before
do
kubernetes
.
token
=
token
end
context
'when
creates a record
'
do
let
(
:
kubernetes
)
{
build
(
:platform_kubernetes
)
}
context
'when
token is nil
'
do
let
(
:
token
)
{
nil
}
before
do
kubernetes
.
token
=
token
end
context
'when token is nil'
do
let
(
:token
)
{
nil
}
it
{
expect
(
kubernetes
.
save
).
to
be_truthy
}
end
it
{
expect
(
kubernetes
.
save
).
to
be_falsey
}
end
end
end
...
...
@@ -128,7 +96,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject
{
kubernetes
.
actual_namespace
}
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
let
(
:namespace
)
{
'namespace-123'
}
...
...
@@ -139,7 +108,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
context
'when namespace is not present'
do
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
...
...
@@ -154,12 +123,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
describe
'#default_namespace'
do
subject
{
kubernetes
.
default_namespace
}
let
(
:kubernetes
)
{
create
(
:platform_kubernetes
)
}
let
(
:kubernetes
)
{
create
(
:platform_kubernetes
,
:configured
)
}
context
'when cluster belongs to a project'
do
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
context
'when cluster belongs to nothing'
do
...
...
@@ -229,7 +199,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
let!
(
:cluster
)
{
create
(
:cluster
,
:project
,
platform_kubernetes:
service
)
}
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"
)
}
context
'with invalid pods'
do
...
...
@@ -268,7 +238,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject
{
service
.
calculate_reactive_cache
}
let!
(
:cluster
)
{
create
(
:cluster
,
:project
,
enabled:
enabled
,
platform_kubernetes:
service
)
}
let
(
:service
)
{
create
(
:platform_kubernetes
,
:c
a_cert
)
}
let
(
:service
)
{
create
(
:platform_kubernetes
,
:c
onfigured
)
}
let
(
:enabled
)
{
true
}
context
'when cluster is disabled'
do
...
...
spec/support/google_api_helpers.rb
→
spec/support/google_api
/cloud_platform
_helpers.rb
View file @
6a65e2f5
module
GoogleApi
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
)
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
)))
...
...
spec/support/kubernetes_helpers.rb
View file @
6a65e2f5
...
...
@@ -14,7 +14,7 @@ module KubernetesHelpers
end
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"
WebMock
.
stub_request
(
:get
,
pods_url
).
to_return
(
response
||
kube_pods_response
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment