chore: move runners from internal package to make them available for import outside DBLab project

agneum · agneum · commit 35a0f3728bdd · 2025-02-05T21:48:53.000+07:00
diff --git a/cmd/database-lab/main.go b/cmd/database-lab/main.go
@@ -28,14 +28,14 @@ import (
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/pool"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools/cont"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/srv"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/config"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/config/global"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util/networks"
 	"gitlab.com/postgres-ai/database-lab/v3/version"
 )
diff --git a/internal/embeddedui/embedded_ui.go b/internal/embeddedui/embedded_ui.go
@@ -18,11 +18,11 @@ import (
 	"github.com/docker/go-connections/nat"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/docker"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools/cont"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/config/global"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util/engine"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util/networks"
 )
diff --git a/internal/provision/databases/postgres/postgres.go b/internal/provision/databases/postgres/postgres.go
@@ -18,8 +18,8 @@ import (
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/databases/postgres/pgconfig"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/docker"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 const (
diff --git a/internal/provision/databases/postgres/postgres_test.go b/internal/provision/databases/postgres/postgres_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 type MockRunner struct {
diff --git a/internal/provision/docker/docker.go b/internal/provision/docker/docker.go
@@ -20,8 +20,8 @@ import (
 	"github.com/shirou/gopsutil/host"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 const (
diff --git a/internal/provision/mode_local.go b/internal/provision/mode_local.go
@@ -26,11 +26,11 @@ import (
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/docker"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/pool"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/zfs"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/models"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util/networks"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util/pglog"
diff --git a/internal/provision/pool/manager.go b/internal/provision/pool/manager.go
@@ -12,11 +12,11 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/lvm"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/zfs"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/models"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 // FSManager defines an interface to work different thin-clone managers.
diff --git a/internal/provision/pool/pool_manager.go b/internal/provision/pool/pool_manager.go
@@ -15,13 +15,13 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/lvm"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/zfs"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/dbmarker"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/telemetry"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 const (
diff --git a/internal/provision/thinclones/lvm/lvm.go b/internal/provision/thinclones/lvm/lvm.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 const (
diff --git a/internal/provision/thinclones/lvm/lvmanager.go b/internal/provision/thinclones/lvm/lvmanager.go
@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/models"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 const (
diff --git a/internal/provision/thinclones/zfs/zfs.go b/internal/provision/thinclones/zfs/zfs.go
@@ -16,10 +16,10 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/models"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/util"
 )
 
diff --git a/internal/retrieval/engine/postgres/snapshot/snapshot.go b/internal/retrieval/engine/postgres/snapshot/snapshot.go
@@ -8,9 +8,9 @@ package snapshot
 import (
 	"github.com/pkg/errors"
 
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/dbmarker"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 )
 
 func extractDataStateAt(dbMarker *dbmarker.Marker) string {
diff --git a/internal/retrieval/retrieval.go b/internal/retrieval/retrieval.go
@@ -21,7 +21,6 @@ import (
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/pool"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/zfs"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/components"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/config"
@@ -32,6 +31,7 @@ import (
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/snapshot"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools/cont"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/telemetry"
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/runners"
 
 	dblabCfg "gitlab.com/postgres-ai/database-lab/v3/pkg/config"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/config/global"
diff --git a/pkg/runners/runners.go b/pkg/runners/runners.go

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ import (`
`18`	`18`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/databases/postgres/pgconfig"`
`19`	`19`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/docker"`
`20`	`20`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"`
`21`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
`22`	`21`	`"gitlab.com/postgres-ai/database-lab/v3/pkg/log"`
	`22`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/stretchr/testify/mock"`
`10`	`10`
`11`	`11`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"`
`12`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
	`12`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type MockRunner struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`"github.com/shirou/gopsutil/host"`
`21`	`21`
`22`	`22`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"`
`23`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
`24`	`23`	`"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"`
	`24`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/pkg/errors"`
`14`	`14`
`15`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
`16`	`15`	`"gitlab.com/postgres-ai/database-lab/v3/pkg/log"`
	`16`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`"github.com/pkg/errors"`
`12`	`12`
`13`	`13`	`"gitlab.com/postgres-ai/database-lab/v3/internal/provision/resources"`
`14`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
`15`	`14`	`"gitlab.com/postgres-ai/database-lab/v3/pkg/log"`
`16`	`15`	`"gitlab.com/postgres-ai/database-lab/v3/pkg/models"`
	`16`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ package snapshot`
`8`	`8`	`import (`
`9`	`9`	`"github.com/pkg/errors"`
`10`	`10`
`11`		`- "gitlab.com/postgres-ai/database-lab/v3/internal/provision/runners"`
`12`	`11`	`"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/dbmarker"`
`13`	`12`	`"gitlab.com/postgres-ai/database-lab/v3/pkg/log"`
	`13`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/runners"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func extractDataStateAt(dbMarker *dbmarker.Marker) string {`