Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
25076520
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
25076520
编写于
10月 03, 2017
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Introduce serializer for ClusterEntity
上级
65b4627d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
10 deletion
+34
-10
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+21
-10
app/serializers/cluster_entity.rb
app/serializers/cluster_entity.rb
+6
-0
app/serializers/cluster_serializer.rb
app/serializers/cluster_serializer.rb
+7
-0
未找到文件。
app/controllers/projects/clusters_controller.rb
浏览文件 @
25076520
...
...
@@ -46,10 +46,9 @@ class Projects::ClustersController < Projects::ApplicationController
format
.
json
do
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
10_000
)
render
json:
{
status:
cluster
.
status
,
# The current status of the operation.
status_reason:
cluster
.
status_reason
# If an error has occurred, a textual description of the error.
}
render
json:
ClusterSerializer
.
new
(
project:
@project
,
current_user:
@current_user
)
.
represent_status
(
@cluster
)
end
end
end
...
...
@@ -62,7 +61,15 @@ class Projects::ClustersController < Projects::ApplicationController
.
new
(
project
,
current_user
,
cluster_params
)
.
execute
(
cluster
)
render
:show
respond_to
do
|
format
|
format
.
html
do
render
:show
end
format
.
json
do
head
:no_data
end
end
end
def
destroy
...
...
@@ -80,9 +87,13 @@ class Projects::ClustersController < Projects::ApplicationController
end
def
cluster_params
params
.
require
(
:cluster
)
.
permit
(
:gcp_project_id
,
:gcp_cluster_zone
,
:gcp_cluster_name
,
:gcp_cluster_size
,
:gcp_machine_type
,
:project_namespace
,
:enabled
)
params
.
require
(
:cluster
).
permit
(
:gcp_project_id
,
:gcp_cluster_zone
,
:gcp_cluster_name
,
:gcp_cluster_size
,
:gcp_machine_type
,
:project_namespace
,
:enabled
)
end
def
authorize_google_api
...
...
@@ -103,10 +114,10 @@ class Projects::ClustersController < Projects::ApplicationController
end
def
authorize_update_cluster!
return
access_denied!
unless
can?
(
current_user
,
:update_cluster
,
cluster
)
access_denied!
unless
can?
(
current_user
,
:update_cluster
,
cluster
)
end
def
authorize_admin_cluster!
return
access_denied!
unless
can?
(
current_user
,
:admin_cluster
,
cluster
)
access_denied!
unless
can?
(
current_user
,
:admin_cluster
,
cluster
)
end
end
app/serializers/cluster_entity.rb
0 → 100644
浏览文件 @
25076520
class
ClusterEntity
<
Grape
::
Entity
include
RequestAwareEntity
expose
:status
expose
:status_reason
end
app/serializers/cluster_serializer.rb
0 → 100644
浏览文件 @
25076520
class
ClusterSerializer
<
BaseSerializer
entity
ClusterEntity
def
represent_status
(
resource
)
represent
(
resource
,
{
only:
[
:status
,
:status_reason
]
})
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录