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

Author: agneum

.gitlab-ci.yml

@@ -366,7 +366,7 @@ bash-test-14:
 integration-test:
   services:
     - name: docker:dind
-      command: ["--tls=false"]
+      command: [ "--tls=false" ]
   <<: *only_feature
   stage: integration-test
   variables:

cmd/cli/commands/clone/actions.go

@@ -19,10 +19,10 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"gitlab.com/postgres-ai/database-lab/v2/cmd/cli/commands"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/observer"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
 )
 
 // list runs a request to list clones of an instance.

cmd/cli/commands/config/command_list.go

@@ -29,8 +29,8 @@ func CommandList() []*cli.Command {
 							Required: true,
 						},
 						&cli.StringFlag{
-							Name:     "token",
-							Usage:    "verification token of Database Lab instance",
+							Name:  "token",
+							Usage: "verification token of Database Lab instance",
 						},
 						&cli.BoolFlag{
 							Name:  "insecure",

cmd/cli/commands/global/command_list.go

@@ -30,8 +30,8 @@ func List() []*cli.Command {
 					Required: true,
 				},
 				&cli.StringFlag{
-					Name:     "token",
-					Usage:    "verification token of Database Lab instance",
+					Name:  "token",
+					Usage: "verification token of Database Lab instance",
 				},
 				&cli.BoolFlag{
 					Name:  "insecure",

cmd/cli/commands/port_forwarding.go

@@ -14,7 +14,7 @@ import (
 	"github.com/urfave/cli/v2"
 	"golang.org/x/crypto/ssh"
 
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/portfwd"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/portfwd"
 )
 
 // BuildTunnel creates a new instance of SSH tunnel.

cmd/database-lab/main.go

@@ -20,22 +20,22 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 
+	"gitlab.com/postgres-ai/database-lab/v2/internal/cloning"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/estimator"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/localui"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/observer"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/platform"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision/pool"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision/runners"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools/cont"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/srv"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/config"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/config/global"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/estimator"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/localui"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/observer"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/cont"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/cloning"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/runners"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/srv"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/util/networks"
 	"gitlab.com/postgres-ai/database-lab/v2/version"
 )

cmd/runci/main.go

@@ -11,12 +11,12 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 
+	"gitlab.com/postgres-ai/database-lab/v2/internal/platform"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/retrieval/engine/postgres/tools"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/runci"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/runci/source"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/runci"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/runci/source"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/platform"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/util/networks"
 )
 

configs/config.example.physical_generic.yml

@@ -265,8 +265,8 @@ retrieval:
 
           # Add PostgreSQL recovery configuration parameters to the promotion container.
           recovery:
-            # Uncomment this only if you are on Postgres version 11 or older.
-            # standby_mode: on
+          # Uncomment this only if you are on Postgres version 11 or older.
+          # standby_mode: on
 
         # It is possible to define a pre-precessing script. For example, "/tmp/scripts/custom.sh".
         # Default: empty string (no pre-processing defined).

configs/config.example.physical_walg.yml

@@ -206,8 +206,8 @@ retrieval:
 
           # Add PostgreSQL recovery configuration parameters to the sync container.
           recovery:
-            # Uncomment this only if you are on Postgres version 11 or older.
-            # standby_mode: on
+          # Uncomment this only if you are on Postgres version 11 or older.
+          # standby_mode: on
 
         # Passes custom environment variables to the Docker container with the restoring tool.
         envs:
@@ -255,8 +255,8 @@ retrieval:
 
           # Add PostgreSQL recovery configuration parameters to the promotion container.
           recovery:
-            # Uncomment this only if you are on Postgres version 11 or older.
-            # standby_mode: on
+          # Uncomment this only if you are on Postgres version 11 or older.
+          # standby_mode: on
 
         # It is possible to define a pre-precessing script. For example, "/tmp/scripts/custom.sh".
         # Default: empty string (no pre-processing defined).

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

@@ -21,12 +21,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/xid"
 
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/provision/resources"
+	"gitlab.com/postgres-ai/database-lab/v2/internal/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/client/dblabapi/types"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v2/pkg/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/util"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/util/pglog"
 	"gitlab.com/postgres-ai/database-lab/v2/version"