Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3b161251
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,发现更多精彩内容 >>
未验证
提交
3b161251
编写于
4月 20, 2018
作者:
M
Matija Čupić
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename CheckGcpProjectBillingWorker to ListGcpProjectsWorker
上级
cffc8899
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
8 deletion
+8
-8
app/controllers/projects/clusters/gcp_controller.rb
app/controllers/projects/clusters/gcp_controller.rb
+3
-3
app/workers/all_queues.yml
app/workers/all_queues.yml
+1
-1
app/workers/list_gcp_projects_worker.rb
app/workers/list_gcp_projects_worker.rb
+2
-2
spec/controllers/projects/clusters/gcp_controller_spec.rb
spec/controllers/projects/clusters/gcp_controller_spec.rb
+1
-1
spec/workers/list_gcp_projects_worker_spec.rb
spec/workers/list_gcp_projects_worker_spec.rb
+1
-1
未找到文件。
app/controllers/projects/clusters/gcp_controller.rb
浏览文件 @
3b161251
...
...
@@ -83,12 +83,12 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
end
def
authorize_google_project_billing
redis_token_key
=
CheckGcpProjectBilling
Worker
.
store_session_token
(
token_in_session
)
CheckGcpProjectBilling
Worker
.
perform_async
(
redis_token_key
)
redis_token_key
=
ListGcpProjects
Worker
.
store_session_token
(
token_in_session
)
ListGcpProjects
Worker
.
perform_async
(
redis_token_key
)
end
def
google_project_billing_status
CheckGcpProjectBilling
Worker
.
get_billing_state
(
token_in_session
)
ListGcpProjects
Worker
.
get_billing_state
(
token_in_session
)
end
def
token_in_session
...
...
app/workers/all_queues.yml
浏览文件 @
3b161251
...
...
@@ -24,7 +24,7 @@
-
gcp_cluster:cluster_provision
-
gcp_cluster:cluster_wait_for_app_installation
-
gcp_cluster:wait_for_cluster_creation
-
gcp_cluster:
check_gcp_project_billing
-
gcp_cluster:
list_gcp_projects
-
gcp_cluster:cluster_wait_for_ingress_ip_address
-
github_import_advance_stage
...
...
app/workers/
check_gcp_project_billing
_worker.rb
→
app/workers/
list_gcp_projects
_worker.rb
浏览文件 @
3b161251
require
'securerandom'
class
CheckGcpProjectBilling
Worker
class
ListGcpProjects
Worker
include
ApplicationWorker
include
ClusterQueue
...
...
@@ -64,7 +64,7 @@ class CheckGcpProjectBillingWorker
def
try_obtain_lease_for
(
token
)
Gitlab
::
ExclusiveLease
.
new
(
"
check_gcp_project_billing
_worker:
#{
token
.
hash
}
"
,
timeout:
LEASE_TIMEOUT
)
.
new
(
"
list_gcp_projects
_worker:
#{
token
.
hash
}
"
,
timeout:
LEASE_TIMEOUT
)
.
try_obtain
end
...
...
spec/controllers/projects/clusters/gcp_controller_spec.rb
浏览文件 @
3b161251
...
...
@@ -144,7 +144,7 @@ describe Projects::Clusters::GcpController do
before
do
redis_double
=
double
allow
(
Gitlab
::
Redis
::
SharedState
).
to
receive
(
:with
).
and_yield
(
redis_double
)
allow
(
redis_double
).
to
receive
(
:get
).
with
(
CheckGcpProjectBilling
Worker
.
redis_shared_state_key_for
(
'token'
)).
and_return
(
'true'
)
allow
(
redis_double
).
to
receive
(
:get
).
with
(
ListGcpProjects
Worker
.
redis_shared_state_key_for
(
'token'
)).
and_return
(
'true'
)
end
it
'creates a new cluster'
do
...
...
spec/workers/
check_gcp_project_billing
_worker_spec.rb
→
spec/workers/
list_gcp_projects
_worker_spec.rb
浏览文件 @
3b161251
require
'spec_helper'
describe
CheckGcpProjectBilling
Worker
do
describe
ListGcpProjects
Worker
do
describe
'.perform'
do
let
(
:token
)
{
'bogustoken'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录