Skip to content

Commit dbabb6c

Browse files
agneumagneum
committed
Merge branch 'bump-versions' into 'master'
refactor: bump DBLab version to v2 See merge request postgres-ai/database-lab!251
2 parents d104d7f + 81c1550 commit dbabb6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+259
-257
lines changed

‎.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: golang:1.14
1+
image: golang:1.15
22

33
include:
44
- template: Security/SAST.gitlab-ci.yml
@@ -43,7 +43,7 @@ lint:
4343
when: manual
4444

4545
build-binary-alpine:
46-
image: golang:1.14-alpine
46+
image: golang:1.15-alpine
4747
stage: build-binary
4848
only:
4949
refs:

‎cmd/cli/commands/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/urfave/cli/v2"
1212

13-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi"
13+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi"
1414
)
1515

1616
// CLI configuration keys.

‎cmd/cli/commands/clone/actions.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414

1515
"github.com/urfave/cli/v2"
1616

17-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
18-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi/types"
19-
"gitlab.com/postgres-ai/database-lab/pkg/log"
20-
"gitlab.com/postgres-ai/database-lab/pkg/models"
17+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
19+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
20+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
2121
)
2222

2323
// list runs a request to list clones of an instance.

‎cmd/cli/commands/clone/command_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package clone
77
import (
88
"github.com/urfave/cli/v2"
99

10-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
10+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
1111
)
1212

1313
// CommandList returns available commands for a clones management.

‎cmd/cli/commands/config/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/urfave/cli/v2"
1515

16-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
16+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
1717
)
1818

1919
// headers of a config list.

‎cmd/cli/commands/config/environment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/pkg/errors"
99
"github.com/urfave/cli/v2"
1010

11-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
11+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
1212
)
1313

1414
// CLIConfig defines a format of CLI configuration.

‎cmd/cli/commands/global/actions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"github.com/pkg/errors"
1414
"github.com/urfave/cli/v2"
1515

16-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
17-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/config"
18-
"gitlab.com/postgres-ai/database-lab/pkg/log"
16+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
17+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/config"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
1919
)
2020

2121
func initCLI(c *cli.Context) error {

‎cmd/cli/commands/global/command_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package global
77
import (
88
"github.com/urfave/cli/v2"
99

10-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
11-
"gitlab.com/postgres-ai/database-lab/cmd/cli/templates"
10+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
11+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/templates"
1212
)
1313

1414
// List provides commands for getting started.

‎cmd/cli/commands/instance/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/urfave/cli/v2"
1313

14-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
14+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
1515
)
1616

1717
// status runs a request to get status of the instance.

‎cmd/cli/commands/port_forwarding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/urfave/cli/v2"
1515
"golang.org/x/crypto/ssh"
1616

17-
"gitlab.com/postgres-ai/database-lab/pkg/portfwd"
17+
"gitlab.com/postgres-ai/database-lab/v2/pkg/portfwd"
1818
)
1919

2020
// BuildTunnel creates a new instance of SSH tunnel.

‎cmd/cli/commands/snapshot/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/urfave/cli/v2"
1313

14-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
14+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
1515
)
1616

1717
// list runs a request to list snapshots of an instance.

‎cmd/cli/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88

99
"github.com/urfave/cli/v2"
1010

11-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands"
12-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/clone"
13-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/config"
14-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/global"
15-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/instance"
16-
"gitlab.com/postgres-ai/database-lab/cmd/cli/commands/snapshot"
17-
"gitlab.com/postgres-ai/database-lab/cmd/cli/templates"
18-
dblabLog "gitlab.com/postgres-ai/database-lab/pkg/log"
19-
"gitlab.com/postgres-ai/database-lab/version"
11+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
12+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/clone"
13+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/config"
14+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/global"
15+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/instance"
16+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands/snapshot"
17+
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/templates"
18+
dblabLog "gitlab.com/postgres-ai/database-lab/v2/pkg/log"
19+
"gitlab.com/postgres-ai/database-lab/v2/version"
2020
)
2121

2222
func main() {

‎cmd/database-lab/main.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ import (
2020
"github.com/pkg/errors"
2121
"github.com/rs/xid"
2222

23-
"gitlab.com/postgres-ai/database-lab/pkg/config"
24-
"gitlab.com/postgres-ai/database-lab/pkg/log"
25-
"gitlab.com/postgres-ai/database-lab/pkg/observer"
26-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval"
27-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/engine/postgres/tools/cont"
28-
"gitlab.com/postgres-ai/database-lab/pkg/services/cloning"
29-
"gitlab.com/postgres-ai/database-lab/pkg/services/platform"
30-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision"
31-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/pool"
32-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/resources"
33-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/runners"
34-
"gitlab.com/postgres-ai/database-lab/pkg/srv"
35-
"gitlab.com/postgres-ai/database-lab/version"
23+
"gitlab.com/postgres-ai/database-lab/v2/pkg/config"
24+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
25+
"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
26+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval"
27+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/cont"
28+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/cloning"
29+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
30+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
31+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
32+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
33+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
34+
"gitlab.com/postgres-ai/database-lab/v2/pkg/srv"
35+
"gitlab.com/postgres-ai/database-lab/v2/version"
3636
)
3737

3838
const (

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module gitlab.com/postgres-ai/database-lab
1+
module gitlab.com/postgres-ai/database-lab/v2
22

3-
go 1.14
3+
go 1.15
44

55
require (
66
github.com/AlekSi/pointer v1.1.0

‎pkg/client/dblabapi/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
"github.com/pkg/errors"
2222

23-
"gitlab.com/postgres-ai/database-lab/pkg/log"
24-
"gitlab.com/postgres-ai/database-lab/pkg/models"
23+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
24+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
2525
)
2626

2727
const (

‎pkg/client/dblabapi/clone.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
"github.com/pkg/errors"
1717

18-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi/types"
19-
"gitlab.com/postgres-ai/database-lab/pkg/models"
20-
"gitlab.com/postgres-ai/database-lab/pkg/observer"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
19+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
20+
"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
2121
)
2222

2323
// ListClones provides a list of Database Lab clones.

‎pkg/client/dblabapi/clone_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414

15-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi/types"
16-
"gitlab.com/postgres-ai/database-lab/pkg/models"
15+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
16+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1717
)
1818

1919
func TestClientListClones(t *testing.T) {

‎pkg/client/dblabapi/snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/pkg/errors"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/models"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1515
)
1616

1717
// ListSnapshots provides a snapshot list.

‎pkg/client/dblabapi/snapshot_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/models"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1515
)
1616

1717
func TestClientListSnapshots(t *testing.T) {

‎pkg/client/dblabapi/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/pkg/errors"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/models"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1515
)
1616

1717
// Status provides an instance status.

‎pkg/client/dblabapi/status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/models"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1515
)
1616

1717
func TestClientStatus(t *testing.T) {

‎pkg/client/platform/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/pkg/errors"
2020

21-
"gitlab.com/postgres-ai/database-lab/pkg/log"
21+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2222
)
2323

2424
const (

‎pkg/client/platform/observation.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"github.com/pkg/errors"
1212

13-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi/types"
14-
"gitlab.com/postgres-ai/database-lab/pkg/log"
15-
"gitlab.com/postgres-ai/database-lab/pkg/models"
13+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
15+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
1616
)
1717

1818
// StartObservationRequest represents a start observation request.

‎pkg/client/platform/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/pkg/errors"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/log"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
1515
)
1616

1717
// TokenCheckRequest represents a token checking request.

‎pkg/config/config.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"github.com/pkg/errors"
1212
"gopkg.in/yaml.v2"
1313

14-
"gitlab.com/postgres-ai/database-lab/pkg/observer"
15-
retConfig "gitlab.com/postgres-ai/database-lab/pkg/retrieval/config"
16-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/engine/postgres/tools/defaults"
17-
"gitlab.com/postgres-ai/database-lab/pkg/services/cloning"
18-
"gitlab.com/postgres-ai/database-lab/pkg/services/platform"
19-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision"
20-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/pool"
21-
"gitlab.com/postgres-ai/database-lab/pkg/srv"
22-
"gitlab.com/postgres-ai/database-lab/pkg/util"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
15+
retConfig "gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/config"
16+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/defaults"
17+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/cloning"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
19+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
20+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
21+
"gitlab.com/postgres-ai/database-lab/v2/pkg/srv"
22+
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
2323
)
2424

2525
// Config contains a common database-lab configuration.

‎pkg/observer/observer.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"github.com/docker/docker/client"
1919
"github.com/pkg/errors"
2020

21-
"gitlab.com/postgres-ai/database-lab/pkg/client/platform"
22-
"gitlab.com/postgres-ai/database-lab/pkg/log"
23-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/resources"
24-
"gitlab.com/postgres-ai/database-lab/pkg/util/pglog"
21+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/platform"
22+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
23+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
24+
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/pglog"
2525
)
2626

2727
const (

‎pkg/observer/session.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/jackc/pgx/v4"
1515
"github.com/pkg/errors"
1616

17-
"gitlab.com/postgres-ai/database-lab/pkg/client/dblabapi/types"
18-
"gitlab.com/postgres-ai/database-lab/pkg/log"
19-
"gitlab.com/postgres-ai/database-lab/pkg/models"
20-
"gitlab.com/postgres-ai/database-lab/pkg/util"
17+
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
19+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
20+
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
2121
)
2222

2323
const (

‎pkg/observer/sql.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/jackc/pgx/v4"
1515
"github.com/pkg/errors"
1616

17-
"gitlab.com/postgres-ai/database-lab/pkg/log"
18-
"gitlab.com/postgres-ai/database-lab/pkg/models"
19-
"gitlab.com/postgres-ai/database-lab/pkg/util"
17+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
18+
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
19+
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
2020
)
2121

2222
func initConnection(clone *models.Clone, socketDir string) (*pgx.Conn, error) {

‎pkg/portfwd/sshtunnel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"golang.org/x/crypto/ssh"
1818
"golang.org/x/crypto/ssh/agent"
1919

20-
"gitlab.com/postgres-ai/database-lab/pkg/log"
20+
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2121
)
2222

2323
// SSHTunnel describes a tunnel structure.

‎pkg/retrieval/components/components.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package components
88
import (
99
"context"
1010

11-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/config"
11+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/config"
1212
)
1313

1414
// JobBuilder builds jobs.

‎pkg/retrieval/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package config
88
import (
99
"github.com/docker/docker/client"
1010

11-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/dbmarker"
12-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/resources"
11+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/dbmarker"
12+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
1313
)
1414

1515
// Config describes of data retrieval jobs.

‎pkg/retrieval/engine/engine.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ package engine
88
import (
99
"errors"
1010

11-
"gitlab.com/postgres-ai/database-lab/pkg/config"
12-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/components"
13-
"gitlab.com/postgres-ai/database-lab/pkg/retrieval/engine/postgres"
14-
"gitlab.com/postgres-ai/database-lab/pkg/services/provision/pool"
11+
"gitlab.com/postgres-ai/database-lab/v2/pkg/config"
12+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/components"
13+
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres"
14+
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
1515
)
1616

1717
// JobBuilder provides a new job builder.

0 commit comments

Comments
 (0)