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
5a92d82b
Commit
5a92d82b
authored
2 years ago
by
Anton Sattarov
Browse files
Options
Downloads
Patches
Plain Diff
remove MigrateOptions.Wait
parent
5599d8fa
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
perxis-proto
+1
-1
1 addition, 1 deletion
perxis-proto
pkg/setup/collection.go
+1
-2
1 addition, 2 deletions
pkg/setup/collection.go
pkg/setup/collection_test.go
+8
-8
8 additions, 8 deletions
pkg/setup/collection_test.go
with
10 additions
and
11 deletions
perxis-proto
@
062d090c
Compare
f954a6b7
...
062d090c
Subproject commit
f954a6b764e2d0f60b911582fb28a0
78
e
bf
cce93
Subproject commit
062d090c3a8e44d3cc4ca616
78bf
58c0e7377812
This diff is collapsed.
Click to expand it.
pkg/setup/collection.go
+
1
−
2
View file @
5a92d82b
...
...
@@ -7,7 +7,6 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/schema"
...
...
@@ -140,7 +139,7 @@ func (s *Setup) InstallCollections(ctx context.Context) (err error) {
}
if
migrate
{
if
err
=
s
.
content
.
Environments
.
Migrate
(
ctx
,
s
.
SpaceID
,
s
.
EnvironmentID
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
);
err
!=
nil
{
if
err
=
s
.
content
.
Environments
.
Migrate
(
ctx
,
s
.
SpaceID
,
s
.
EnvironmentID
);
err
!=
nil
{
s
.
logger
.
Error
(
"Failed to migrate environment"
,
zap
.
String
(
"Space ID"
,
s
.
SpaceID
),
...
...
This diff is collapsed.
Click to expand it.
pkg/setup/collection_test.go
+
8
−
8
View file @
5a92d82b
...
...
@@ -43,7 +43,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"1"
,
schema
.
New
(
"name"
,
field
.
String
()))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -57,7 +57,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"Create"
,
mock
.
Anything
,
&
collections
.
Collection
{
ID
:
"1"
,
SpaceID
:
"sp"
,
Name
:
"space"
,
EnvID
:
"env"
,
View
:
&
collections
.
View
{
SpaceID
:
"sp"
,
EnvID
:
"env"
,
CollectionID
:
"3"
}})
.
Return
(
&
collections
.
Collection
{
ID
:
"1"
,
SpaceID
:
"sp"
,
Name
:
"space"
,
EnvID
:
"env"
,
View
:
&
collections
.
View
{
SpaceID
:
"sp"
,
EnvID
:
"env"
,
CollectionID
:
"3"
}},
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -88,7 +88,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"2"
,
schema
.
New
(
"name"
,
field
.
String
()))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Twice
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Twice
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -116,7 +116,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"1"
,
schema
.
New
(
"name"
,
field
.
String
())
.
WithMetadata
(
extension
.
ExtensionMetadataKey
,
"test-extension"
))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -143,7 +143,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"1"
,
schema
.
New
(
"name"
,
field
.
String
())
.
WithMetadata
(
extension
.
ExtensionMetadataKey
,
"test-extension"
))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -159,7 +159,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"1"
,
schema
.
New
(
"name"
,
field
.
String
())
.
WithMetadata
(
extension
.
ExtensionMetadataKey
,
"test-extension"
))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -174,7 +174,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"Update"
,
mock
.
Anything
,
&
collections
.
Collection
{
ID
:
"1"
,
SpaceID
:
"sp"
,
EnvID
:
"env"
,
View
:
&
collections
.
View
{
SpaceID
:
"sp3"
,
EnvID
:
environments
.
DefaultEnvironment
,
CollectionID
:
"3"
}})
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
nil
)
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
nil
)
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
NoError
(
t
,
err
)
...
...
@@ -189,7 +189,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc
.
On
(
"SetSchema"
,
mock
.
Anything
,
"sp"
,
"env"
,
"1"
,
schema
.
New
(
"name"
,
field
.
String
()))
.
Return
(
nil
)
.
Once
()
},
envsCall
:
func
(
svc
*
envmocks
.
Environments
)
{
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
,
&
environments
.
MigrateOptions
{
Wait
:
true
}
)
.
Return
(
errors
.
New
(
"migrate error"
))
.
Once
()
svc
.
On
(
"Migrate"
,
mock
.
Anything
,
"sp"
,
"env"
)
.
Return
(
errors
.
New
(
"migrate error"
))
.
Once
()
},
wantErr
:
func
(
t
*
testing
.
T
,
err
error
)
{
assert
.
Error
(
t
,
err
)
...
...
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