Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
17275cca
Commit
17275cca
authored
1 year ago
by
ko_oler
Browse files
Options
Downloads
Patches
Plain Diff
правка по ПР
parent
0f660ad8
No related branches found
No related tags found
No related merge requests found
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
pkg/setup/setup.go
+10
-9
10 additions, 9 deletions
pkg/setup/setup.go
pkg/setup/setup_test.go
+168
-20
168 additions, 20 deletions
pkg/setup/setup_test.go
pkg/spaces/service.go
+4
-12
4 additions, 12 deletions
pkg/spaces/service.go
pkg/spaces/service_test.go
+3
-3
3 additions, 3 deletions
pkg/spaces/service_test.go
with
185 additions
and
44 deletions
pkg/setup/setup.go
+
10
−
9
View file @
17275cca
...
...
@@ -53,6 +53,7 @@ func NewSetup(content *content.Content, spaceID, environmentID string, logger *z
EnvironmentID
:
environmentID
,
content
:
content
,
logger
:
logger
,
waitSpaceAvailable
:
true
,
}
}
...
...
@@ -76,9 +77,9 @@ func (s *Setup) IsRemove() bool {
return
s
.
remove
}
func
(
s
*
Setup
)
WithWaitSpace
Available
()
*
Setup
{
func
(
s
*
Setup
)
With
out
WaitSpace
()
*
Setup
{
setup
:=
*
s
setup
.
waitSpaceAvailable
=
tru
e
setup
.
waitSpaceAvailable
=
fals
e
return
&
setup
}
...
...
@@ -158,7 +159,7 @@ func (s *Setup) AddItem(item *items.Item, opt ...ItemsOption) *Setup {
// Install выполняет установку необходимых требований
func
(
s
*
Setup
)
Install
(
ctx
context
.
Context
)
error
{
if
s
.
waitSpaceAvailable
{
if
err
:=
spaces
.
WaitSpaceAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
,
s
.
logger
);
err
!=
nil
{
if
err
:=
spaces
.
WaitSpaceAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
);
err
!=
nil
{
return
err
}
}
...
...
@@ -180,7 +181,7 @@ func (s *Setup) Install(ctx context.Context) error {
// Check выполняет проверку требований
func
(
s
*
Setup
)
Check
(
ctx
context
.
Context
)
error
{
if
s
.
waitSpaceAvailable
{
if
err
:=
spaces
.
WaitSpaceRead
Avail
able
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
,
s
.
logger
);
err
!=
nil
{
if
err
:=
spaces
.
WaitSpaceReadable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
);
err
!=
nil
{
return
err
}
}
...
...
@@ -202,7 +203,7 @@ func (s *Setup) Check(ctx context.Context) error {
// Uninstall выполняет удаление установленных раннее требований
func
(
s
*
Setup
)
Uninstall
(
ctx
context
.
Context
)
error
{
if
s
.
waitSpaceAvailable
{
if
err
:=
spaces
.
WaitSpaceAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
,
s
.
logger
);
err
!=
nil
{
if
err
:=
spaces
.
WaitSpaceAvailable
(
ctx
,
s
.
content
.
Spaces
,
s
.
SpaceID
);
err
!=
nil
{
return
err
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/setup/setup_test.go
+
168
−
20
View file @
17275cca
This diff is collapsed.
Click to expand it.
pkg/spaces/service.go
+
4
−
12
View file @
17275cca
...
...
@@ -6,8 +6,6 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"github.com/avast/retry-go/v4"
"go.uber.org/zap"
)
// @microgen grpc
...
...
@@ -74,7 +72,7 @@ func IsSpaceAvailable(ctx context.Context, svc Spaces, spaceID string) error {
return
ErrSpaceNotAvailable
}
func
IsSpaceRead
Avail
able
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
func
IsSpaceReadable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
sp
,
err
:=
svc
.
Get
(
ctx
,
spaceID
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"fail to get space"
)
...
...
@@ -85,30 +83,24 @@ func IsSpaceReadAvailable(ctx context.Context, svc Spaces, spaceID string) error
return
errors
.
WithContext
(
ErrSpaceNotAvailable
,
"state"
,
sp
.
StateInfo
.
State
)
}
func
WaitSpaceAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
,
logger
*
zap
.
Logger
)
error
{
func
WaitSpaceAvailable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
return
retry
.
Do
(
func
()
error
{
return
IsSpaceAvailable
(
ctx
,
svc
,
spaceID
)
},
retry
.
RetryIf
(
func
(
err
error
)
bool
{
return
errors
.
Is
(
err
,
ErrSpaceNotAvailable
)
}),
retry
.
OnRetry
(
func
(
n
uint
,
err
error
)
{
logger
.
Debug
(
"Waiting for space to be available"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
}),
retry
.
Delay
(
delay
),
retry
.
Attempts
(
attempts
),
retry
.
Context
(
ctx
),
)
}
func
WaitSpaceRead
Avail
able
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
,
logger
*
zap
.
Logger
)
error
{
func
WaitSpaceReadable
(
ctx
context
.
Context
,
svc
Spaces
,
spaceID
string
)
error
{
return
retry
.
Do
(
func
()
error
{
return
IsSpaceRead
Avail
able
(
ctx
,
svc
,
spaceID
)
return
IsSpaceReadable
(
ctx
,
svc
,
spaceID
)
},
retry
.
RetryIf
(
func
(
err
error
)
bool
{
return
errors
.
Is
(
err
,
ErrSpaceNotAvailable
)
}),
retry
.
OnRetry
(
func
(
n
uint
,
err
error
)
{
logger
.
Debug
(
"Waiting for space to be available for read"
,
zap
.
String
(
"spaceID"
,
spaceID
),
zap
.
Uint
(
"Retry"
,
n
),
zap
.
Error
(
err
))
}),
retry
.
Delay
(
delay
),
retry
.
Attempts
(
attempts
),
retry
.
Context
(
ctx
),
...
...
This diff is collapsed.
Click to expand it.
pkg/spaces/service_test.go
+
3
−
3
View file @
17275cca
...
...
@@ -51,7 +51,7 @@ func TestIsSpaceAvailable(t *testing.T) {
}
}
func
TestIs
ReadAvail
able
(
t
*
testing
.
T
)
{
func
TestIs
SpaceRead
able
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
name
string
space
*
Space
...
...
@@ -81,8 +81,8 @@ func TestIsReadAvailable(t *testing.T) {
for
_
,
tt
:=
range
tests
{
t
.
Run
(
tt
.
name
,
func
(
t
*
testing
.
T
)
{
spaces
:=
&
dummySpaces
{
space
:
tt
.
space
}
if
err
:=
IsSpaceRead
Avail
able
(
context
.
Background
(),
spaces
,
"space"
);
(
err
!=
nil
)
!=
tt
.
wantErr
{
t
.
Errorf
(
"IsSpaceRead
Avail
able() error = %v, wantErr %v"
,
err
,
tt
.
wantErr
)
if
err
:=
IsSpaceReadable
(
context
.
Background
(),
spaces
,
"space"
);
(
err
!=
nil
)
!=
tt
.
wantErr
{
t
.
Errorf
(
"IsSpaceReadable() error = %v, wantErr %v"
,
err
,
tt
.
wantErr
)
}
})
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment