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
Boxiang Sun
gitlab-ce
Commits
3b161251
Commit
3b161251
authored
Apr 20, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename CheckGcpProjectBillingWorker to ListGcpProjectsWorker
parent
cffc8899
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+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
No files found.
app/controllers/projects/clusters/gcp_controller.rb
View file @
3b161251
...
@@ -83,12 +83,12 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
...
@@ -83,12 +83,12 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
end
end
def
authorize_google_project_billing
def
authorize_google_project_billing
redis_token_key
=
CheckGcpProjectBilling
Worker
.
store_session_token
(
token_in_session
)
redis_token_key
=
ListGcpProjects
Worker
.
store_session_token
(
token_in_session
)
CheckGcpProjectBilling
Worker
.
perform_async
(
redis_token_key
)
ListGcpProjects
Worker
.
perform_async
(
redis_token_key
)
end
end
def
google_project_billing_status
def
google_project_billing_status
CheckGcpProjectBilling
Worker
.
get_billing_state
(
token_in_session
)
ListGcpProjects
Worker
.
get_billing_state
(
token_in_session
)
end
end
def
token_in_session
def
token_in_session
...
...
app/workers/all_queues.yml
View file @
3b161251
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
-
gcp_cluster:cluster_provision
-
gcp_cluster:cluster_provision
-
gcp_cluster:cluster_wait_for_app_installation
-
gcp_cluster:cluster_wait_for_app_installation
-
gcp_cluster:wait_for_cluster_creation
-
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
-
gcp_cluster:cluster_wait_for_ingress_ip_address
-
github_import_advance_stage
-
github_import_advance_stage
...
...
app/workers/
check_gcp_project_billing
_worker.rb
→
app/workers/
list_gcp_projects
_worker.rb
View file @
3b161251
require
'securerandom'
require
'securerandom'
class
CheckGcpProjectBilling
Worker
class
ListGcpProjects
Worker
include
ApplicationWorker
include
ApplicationWorker
include
ClusterQueue
include
ClusterQueue
...
@@ -64,7 +64,7 @@ class CheckGcpProjectBillingWorker
...
@@ -64,7 +64,7 @@ class CheckGcpProjectBillingWorker
def
try_obtain_lease_for
(
token
)
def
try_obtain_lease_for
(
token
)
Gitlab
::
ExclusiveLease
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
.
try_obtain
end
end
...
...
spec/controllers/projects/clusters/gcp_controller_spec.rb
View file @
3b161251
...
@@ -144,7 +144,7 @@ describe Projects::Clusters::GcpController do
...
@@ -144,7 +144,7 @@ describe Projects::Clusters::GcpController do
before
do
before
do
redis_double
=
double
redis_double
=
double
allow
(
Gitlab
::
Redis
::
SharedState
).
to
receive
(
:with
).
and_yield
(
redis_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
end
it
'creates a new cluster'
do
it
'creates a new cluster'
do
...
...
spec/workers/
check_gcp_project_billing
_worker_spec.rb
→
spec/workers/
list_gcp_projects
_worker_spec.rb
View file @
3b161251
require
'spec_helper'
require
'spec_helper'
describe
CheckGcpProjectBilling
Worker
do
describe
ListGcpProjects
Worker
do
describe
'.perform'
do
describe
'.perform'
do
let
(
:token
)
{
'bogustoken'
}
let
(
:token
)
{
'bogustoken'
}
...
...
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