Skip to content

Commit 51cabb1

Browse files
agneumagneum
committed
Merge branch 'refactor-packages' into 'master'
chore: Refactor packages to make the project more structured: * move services to the internal package * reformat imports * remove unused functions See merge request postgres-ai/database-lab!367
2 parents 6ddab8b + 3d1a10b commit 51cabb1

File tree

135 files changed

+239
-248
lines changed

Some content is hidden

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

135 files changed

+239
-248
lines changed

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ bash-test-14:
366366
integration-test:
367367
services:
368368
- name: docker:dind
369-
command: ["--tls=false"]
369+
command: [ "--tls=false" ]
370370
<<: *only_feature
371371
stage: integration-test
372372
variables:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"github.com/urfave/cli/v2"
2020

2121
"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
22+
"gitlab.com/postgres-ai/database-lab/v2/internal/observer"
2223
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
2324
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2425
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
25-
"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
2626
)
2727

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func CommandList() []*cli.Command {
2929
Required: true,
3030
},
3131
&cli.StringFlag{
32-
Name: "token",
33-
Usage: "verification token of Database Lab instance",
32+
Name: "token",
33+
Usage: "verification token of Database Lab instance",
3434
},
3535
&cli.BoolFlag{
3636
Name: "insecure",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func List() []*cli.Command {
3030
Required: true,
3131
},
3232
&cli.StringFlag{
33-
Name: "token",
34-
Usage: "verification token of Database Lab instance",
33+
Name: "token",
34+
Usage: "verification token of Database Lab instance",
3535
},
3636
&cli.BoolFlag{
3737
Name: "insecure",

‎cmd/cli/commands/port_forwarding.go

+1-1
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/v2/pkg/portfwd"
17+
"gitlab.com/postgres-ai/database-lab/v2/internal/portfwd"
1818
)
1919

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

‎cmd/database-lab/main.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ import (
2020
"github.com/docker/docker/client"
2121
"github.com/pkg/errors"
2222

23+
"gitlab.com/postgres-ai/database-lab/v2/internal/cloning"
24+
"gitlab.com/postgres-ai/database-lab/v2/internal/estimator"
25+
"gitlab.com/postgres-ai/database-lab/v2/internal/localui"
26+
"gitlab.com/postgres-ai/database-lab/v2/internal/observer"
27+
"gitlab.com/postgres-ai/database-lab/v2/internal/platform"
28+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision"
29+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/pool"
30+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
31+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
32+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval"
33+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools/cont"
34+
"gitlab.com/postgres-ai/database-lab/v2/internal/srv"
35+
"gitlab.com/postgres-ai/database-lab/v2/internal/telemetry"
2336
"gitlab.com/postgres-ai/database-lab/v2/pkg/config"
2437
"gitlab.com/postgres-ai/database-lab/v2/pkg/config/global"
25-
"gitlab.com/postgres-ai/database-lab/v2/pkg/estimator"
26-
"gitlab.com/postgres-ai/database-lab/v2/pkg/localui"
2738
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
28-
"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
29-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval"
30-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/cont"
31-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/cloning"
32-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
33-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
34-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
35-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
36-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
37-
"gitlab.com/postgres-ai/database-lab/v2/pkg/srv"
38-
"gitlab.com/postgres-ai/database-lab/v2/pkg/telemetry"
3939
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/networks"
4040
"gitlab.com/postgres-ai/database-lab/v2/version"
4141
)

‎cmd/runci/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
"github.com/docker/docker/client"
1212
"github.com/pkg/errors"
1313

14+
"gitlab.com/postgres-ai/database-lab/v2/internal/platform"
15+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
16+
"gitlab.com/postgres-ai/database-lab/v2/internal/runci"
17+
"gitlab.com/postgres-ai/database-lab/v2/internal/runci/source"
1418
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi"
1519
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
16-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
17-
"gitlab.com/postgres-ai/database-lab/v2/pkg/runci"
18-
"gitlab.com/postgres-ai/database-lab/v2/pkg/runci/source"
19-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
2020
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/networks"
2121
)
2222

‎configs/config.example.physical_generic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ retrieval:
265265

266266
# Add PostgreSQL recovery configuration parameters to the promotion container.
267267
recovery:
268-
# Uncomment this only if you are on Postgres version 11 or older.
269-
# standby_mode: on
268+
# Uncomment this only if you are on Postgres version 11 or older.
269+
# standby_mode: on
270270

271271
# It is possible to define a pre-precessing script. For example, "/tmp/scripts/custom.sh".
272272
# Default: empty string (no pre-processing defined).

‎configs/config.example.physical_walg.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ retrieval:
206206

207207
# Add PostgreSQL recovery configuration parameters to the sync container.
208208
recovery:
209-
# Uncomment this only if you are on Postgres version 11 or older.
210-
# standby_mode: on
209+
# Uncomment this only if you are on Postgres version 11 or older.
210+
# standby_mode: on
211211

212212
# Passes custom environment variables to the Docker container with the restoring tool.
213213
envs:
@@ -255,8 +255,8 @@ retrieval:
255255

256256
# Add PostgreSQL recovery configuration parameters to the promotion container.
257257
recovery:
258-
# Uncomment this only if you are on Postgres version 11 or older.
259-
# standby_mode: on
258+
# Uncomment this only if you are on Postgres version 11 or older.
259+
# standby_mode: on
260260

261261
# It is possible to define a pre-precessing script. For example, "/tmp/scripts/custom.sh".
262262
# Default: empty string (no pre-processing defined).

‎pkg/services/cloning/base.go renamed to ‎internal/cloning/base.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
"github.com/pkg/errors"
2222
"github.com/rs/xid"
2323

24+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision"
25+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
26+
"gitlab.com/postgres-ai/database-lab/v2/internal/telemetry"
2427
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
2528
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2629
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
27-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
28-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
29-
"gitlab.com/postgres-ai/database-lab/v2/pkg/telemetry"
3030
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
3131
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/pglog"
3232
"gitlab.com/postgres-ai/database-lab/v2/version"

‎pkg/services/cloning/base_test.go renamed to ‎internal/cloning/base_test.go

File renamed without changes.

‎pkg/services/cloning/snapshots.go renamed to ‎internal/cloning/snapshots.go

File renamed without changes.

‎pkg/services/cloning/snapshots_test.go renamed to ‎internal/cloning/snapshots_test.go

File renamed without changes.

‎pkg/services/cloning/storage.go renamed to ‎internal/cloning/storage.go

File renamed without changes.

‎pkg/services/cloning/storage_test.go renamed to ‎internal/cloning/storage_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/stretchr/testify/assert"
99

10-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
11-
"gitlab.com/postgres-ai/database-lab/v2/pkg/telemetry"
10+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision"
11+
"gitlab.com/postgres-ai/database-lab/v2/internal/telemetry"
1212
)
1313

1414
const (

‎pkg/services/cloning/wrapper.go renamed to ‎internal/cloning/wrapper.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ package cloning
88
import (
99
"time"
1010

11+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
12+
1113
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
12-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
1314
)
1415

1516
// CloneWrapper represents a cloning service wrapper.

‎pkg/estimator/estimator.go renamed to ‎internal/estimator/estimator.go

File renamed without changes.

‎pkg/estimator/estimator_test.go renamed to ‎internal/estimator/estimator_test.go

File renamed without changes.

‎pkg/estimator/events.go renamed to ‎internal/estimator/events.go

File renamed without changes.

‎pkg/estimator/io_events.go renamed to ‎internal/estimator/io_events.go

File renamed without changes.

‎pkg/estimator/monitor.go renamed to ‎internal/estimator/monitor.go

File renamed without changes.

‎pkg/estimator/monitor_test.go renamed to ‎internal/estimator/monitor_test.go

File renamed without changes.

‎pkg/estimator/profile.go renamed to ‎internal/estimator/profile.go

File renamed without changes.

‎pkg/estimator/timing.go renamed to ‎internal/estimator/timing.go

File renamed without changes.

‎pkg/localui/local_ui.go renamed to ‎internal/localui/local_ui.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"github.com/docker/docker/client"
1818
"github.com/docker/go-connections/nat"
1919

20+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/docker"
21+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
22+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
23+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools/cont"
2024
"gitlab.com/postgres-ai/database-lab/v2/pkg/config/global"
21-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
22-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/cont"
23-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/docker"
24-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
2525
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/networks"
2626
)
2727

‎pkg/observer/artifacts.go renamed to ‎internal/observer/artifacts.go

File renamed without changes.

‎pkg/observer/observer.go renamed to ‎internal/observer/observer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/docker/docker/client"
2020
"github.com/pkg/errors"
2121

22+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/pool"
2223
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
23-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
2424
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/pglog"
2525
)
2626

‎pkg/observer/observer_test.go renamed to ‎internal/observer/observer_test.go

File renamed without changes.

‎pkg/observer/observing_clone.go renamed to ‎internal/observer/observing_clone.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"github.com/jackc/pgx/v4"
1919
"github.com/pkg/errors"
2020

21+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
2122
"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
2223
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2324
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
24-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
2525
)
2626

2727
const (

‎pkg/observer/queries.go renamed to ‎internal/observer/queries.go

File renamed without changes.

‎pkg/observer/session.go renamed to ‎internal/observer/session.go

File renamed without changes.

‎pkg/observer/session_test.go renamed to ‎internal/observer/session_test.go

File renamed without changes.

‎pkg/observer/sql.go renamed to ‎internal/observer/sql.go

+1-1
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/v2/internal/retrieval/engine/postgres/tools/defaults"
1718
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
1819
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
19-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/defaults"
2020
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
2121
)
2222

‎pkg/observer/stats.go renamed to ‎internal/observer/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/dustin/go-humanize"
1717
"github.com/pkg/errors"
1818

19+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
1920
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
20-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
2121
)
2222

2323
const (

‎pkg/services/platform/platform.go renamed to ‎internal/platform/platform.go

File renamed without changes.

‎pkg/services/platform/platform_test.go renamed to ‎internal/platform/platform_test.go

File renamed without changes.

‎pkg/portfwd/sshtunnel.go renamed to ‎internal/portfwd/sshtunnel.go

File renamed without changes.

‎pkg/services/provision/databases/postgres/pgconfig/configuration.go renamed to ‎internal/provision/databases/postgres/pgconfig/configuration.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616

1717
"github.com/pkg/errors"
1818

19+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
20+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools/defaults"
21+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools/fs"
1922
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
20-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
21-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/defaults"
22-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/fs"
2323
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
2424
)
2525

‎pkg/services/provision/databases/postgres/pgconfig/configuration_test.go renamed to ‎internal/provision/databases/postgres/pgconfig/configuration_test.go

File renamed without changes.

‎pkg/services/provision/databases/postgres/postgres.go renamed to ‎internal/provision/databases/postgres/postgres.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
_ "github.com/lib/pq" // Register Postgres database driver.
1616
"github.com/pkg/errors"
1717

18+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/databases/postgres/pgconfig"
19+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/docker"
20+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
21+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
1822
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
19-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/databases/postgres/pgconfig"
20-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/docker"
21-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
22-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
2323
)
2424

2525
const (

‎pkg/services/provision/databases/postgres/postgres_mgmt.go renamed to ‎internal/provision/databases/postgres/postgres_mgmt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/lib/pq"
1212
"github.com/pkg/errors"
1313

14+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
1415
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
15-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
1616
)
1717

1818
// ResetPasswordsQuery provides a template for a reset password query.

‎pkg/services/provision/databases/postgres/postgres_mgmt_test.go renamed to ‎internal/provision/databases/postgres/postgres_mgmt_test.go

File renamed without changes.

‎pkg/services/provision/databases/postgres/postgres_test.go renamed to ‎internal/provision/databases/postgres/postgres_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/mock"
1010

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

1515
type MockRunner struct {

‎pkg/services/provision/docker/docker.go renamed to ‎internal/provision/docker/docker.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/pkg/errors"
2020
"github.com/shirou/gopsutil/host"
2121

22-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
23-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
24-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
22+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
23+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
24+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
2525
)
2626

2727
const (

‎pkg/services/provision/docker/docker_test.go renamed to ‎internal/provision/docker/docker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/docker/docker/api/types"
1111
"github.com/stretchr/testify/assert"
1212

13-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
13+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
1414
)
1515

1616
func TestSystemVolumes(t *testing.T) {

‎pkg/services/provision/mode_local.go renamed to ‎internal/provision/mode_local.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121
"github.com/docker/docker/client"
2222
"github.com/pkg/errors"
2323

24+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/databases/postgres"
25+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/docker"
26+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/pool"
27+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
28+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
29+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/thinclones/zfs"
30+
"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
2431
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
2532
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
26-
"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
27-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/databases/postgres"
28-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/docker"
29-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
30-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
31-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
32-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/thinclones/zfs"
3333
"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
3434
"gitlab.com/postgres-ai/database-lab/v2/pkg/util/pglog"
3535
)

‎pkg/services/provision/mode_local_test.go renamed to ‎internal/provision/mode_local_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212

13+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/pool"
14+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
15+
1316
"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
14-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
15-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
1617
)
1718

1819
func TestPortAllocation(t *testing.T) {

‎pkg/services/provision/pool/block_devices.go renamed to ‎internal/provision/pool/block_devices.go

+1-1
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/v2/pkg/services/provision/thinclones/lvm"
14+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/thinclones/lvm"
1515
)
1616

1717
type blockDeviceList struct {

‎pkg/services/provision/pool/fstype_bsd.go renamed to ‎internal/provision/pool/fstype_bsd.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build darwin || freebsd || dragonfly || openbsd || solaris
12
// +build darwin freebsd dragonfly openbsd solaris
23

34
/*
@@ -10,7 +11,7 @@ package pool
1011
import (
1112
"syscall"
1213

13-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/thinclones/lvm"
14+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/thinclones/lvm"
1415
)
1516

1617
func (pm *Manager) getFSInfo(path string) (string, error) {

‎pkg/services/provision/pool/fstype_linux.go renamed to ‎internal/provision/pool/fstype_linux.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux && !s390x && !arm && !386
12
// +build linux,!s390x,!arm,!386
23

34
/*
@@ -11,8 +12,8 @@ import (
1112
"strconv"
1213
"syscall"
1314

14-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/thinclones/lvm"
15-
"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/thinclones/zfs"
15+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/thinclones/lvm"
16+
"gitlab.com/postgres-ai/database-lab/v2/internal/provision/thinclones/zfs"
1617
)
1718

1819
var fsTypeToString = map[string]string{

‎pkg/services/provision/pool/fstype_windows.go renamed to ‎internal/provision/pool/fstype_windows.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
/*

0 commit comments

Comments
 (0)