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
a180306d
Commit
a180306d
authored
Jan 06, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use token from redis in gcp project billing worker
parent
2885dc06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
15 deletions
+46
-15
app/workers/check_gcp_project_billing_worker.rb
app/workers/check_gcp_project_billing_worker.rb
+14
-1
spec/workers/check_gcp_project_billing_worker_spec.rb
spec/workers/check_gcp_project_billing_worker_spec.rb
+32
-14
No files found.
app/workers/check_gcp_project_billing_worker.rb
View file @
a180306d
require
'securerandom'
class
CheckGcpProjectBillingWorker
class
CheckGcpProjectBillingWorker
include
ApplicationWorker
include
ApplicationWorker
include
ClusterQueue
include
ClusterQueue
LEASE_TIMEOUT
=
15
.
seconds
.
to_i
LEASE_TIMEOUT
=
15
.
seconds
.
to_i
def
self
.
generate_redis_token_key
SecureRandom
.
uuid
end
def
self
.
redis_shared_state_key_for
(
token
)
def
self
.
redis_shared_state_key_for
(
token
)
"gitlab:gcp:
#{
token
.
hash
}
:billing_enabled"
"gitlab:gcp:
#{
token
.
hash
}
:billing_enabled"
end
end
def
perform
(
token
)
def
perform
(
token_key
)
return
unless
token_key
token
=
get_token
(
token_key
)
return
unless
token
return
unless
token
return
unless
try_obtain_lease_for
(
token
)
return
unless
try_obtain_lease_for
(
token
)
...
@@ -20,6 +29,10 @@ class CheckGcpProjectBillingWorker
...
@@ -20,6 +29,10 @@ class CheckGcpProjectBillingWorker
private
private
def
get_token
(
token_key
)
Gitlab
::
Redis
::
SharedState
.
with
{
|
redis
|
redis
.
get
(
token_key
)
}
end
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
(
"check_gcp_project_billing_worker:
#{
token
.
hash
}
"
,
timeout:
LEASE_TIMEOUT
)
...
...
spec/workers/check_gcp_project_billing_worker_spec.rb
View file @
a180306d
...
@@ -3,33 +3,51 @@ require 'spec_helper'
...
@@ -3,33 +3,51 @@ require 'spec_helper'
describe
CheckGcpProjectBillingWorker
do
describe
CheckGcpProjectBillingWorker
do
describe
'.perform'
do
describe
'.perform'
do
let
(
:token
)
{
'bogustoken'
}
let
(
:token
)
{
'bogustoken'
}
subject
{
described_class
.
new
.
perform
(
token
)
}
subject
{
described_class
.
new
.
perform
(
'token_key'
)
}
context
'when there is
no lease
'
do
context
'when there is
a token in redis
'
do
before
do
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:
try_obtain_lease_for
).
and_return
(
'randomuuid'
)
allow_any_instance_of
(
described_class
).
to
receive
(
:
get_token
).
and_return
(
token
)
end
end
it
'calls the service'
do
context
'when there is no lease'
do
expect
(
CheckGcpProjectBillingService
).
to
receive_message_chain
(
:new
,
:execute
).
and_return
([
double
])
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:try_obtain_lease_for
).
and_return
(
'randomuuid'
)
end
subject
it
'calls the service'
do
expect
(
CheckGcpProjectBillingService
).
to
receive_message_chain
(
:new
,
:execute
).
and_return
([
double
])
subject
end
it
'stores billing status in redis'
do
redis_double
=
double
expect
(
CheckGcpProjectBillingService
).
to
receive_message_chain
(
:new
,
:execute
).
and_return
([
double
])
expect
(
Gitlab
::
Redis
::
SharedState
).
to
receive
(
:with
).
and_yield
(
redis_double
)
expect
(
redis_double
).
to
receive
(
:set
).
with
(
described_class
.
redis_shared_state_key_for
(
token
),
anything
)
subject
end
end
end
it
'stores billing status in redis'
do
context
'when there is a lease'
do
redis_double
=
double
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:try_obtain_lease_for
).
and_return
(
false
)
end
expect
(
CheckGcpProjectBillingService
).
to
receive_message_chain
(
:new
,
:execute
).
and_return
([
double
])
it
'does not call the service'
do
expect
(
Gitlab
::
Redis
::
SharedState
).
to
receive
(
:with
).
and_yield
(
redis_double
)
expect
(
CheckGcpProjectBillingService
).
not_to
receive
(
:new
)
expect
(
redis_double
).
to
receive
(
:set
).
with
(
described_class
.
redis_shared_state_key_for
(
token
),
anything
)
subject
subject
end
end
end
end
end
context
'when there is
a lease
'
do
context
'when there is
no token in redis
'
do
before
do
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:
try_obtain_lease_for
).
and_return
(
false
)
allow_any_instance_of
(
described_class
).
to
receive
(
:
get_token
).
and_return
(
nil
)
end
end
it
'does not call the service'
do
it
'does not call the service'
do
...
...
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