fix(engine): update retrieval activity connection settings, improve transparency (#404)

Author: agneum

engine/internal/retrieval/engine/postgres/logical/dump.go

@@ -185,6 +185,8 @@ func (d *DumpJob) setDefaults() {
 	if d.DumpOptions.ParallelJobs == 0 {
 		d.DumpOptions.ParallelJobs = defaultParallelJobs
 	}
+
+	d.config.db = d.DumpOptions.Source.Connection
 }
 
 // setupDumper sets up a tool to perform physical restoring.

engine/internal/retrieval/engine/postgres/tools/db/pg.go

@@ -43,14 +43,6 @@ type locale struct {
 
 // CheckSource checks the readiness of the source database to dump and restore processes.
 func CheckSource(ctx context.Context, conf *models.ConnectionTest, imageContent *ImageContent) (*models.TestConnection, error) {
-	if !imageContent.IsReady() {
-		return &models.TestConnection{
-			Status:  models.TCStatusNotice,
-			Result:  models.TCResultUnexploredImage,
-			Message: "Service has not collected data about the Docker image yet. Please try again later",
-		}, nil
-	}
-
 	connStr := ConnectionString(conf.Host, conf.Port, conf.Username, conf.DBName, conf.Password)
 
 	conn, err := pgx.Connect(ctx, connStr)
@@ -80,6 +72,15 @@ func CheckSource(ctx context.Context, conf *models.ConnectionTest, imageContent
 		}, nil
 	}
 
+	if !imageContent.IsReady() {
+		return &models.TestConnection{
+			Status: models.TCStatusNotice,
+			Result: models.TCResultUnexploredImage,
+			Message: "The connection to the database was successful. " +
+				"Details about the extensions and locales of the Docker image have not yet been collected. Please try again later",
+		}, nil
+	}
+
 	if missing, unsupported, err := checkExtensions(ctx, conn, imageContent.Extensions()); err != nil {
 		return &models.TestConnection{
 			Status:  models.TCStatusWarning,

engine/internal/retrieval/retrieval.go

@@ -232,6 +232,10 @@ func (r *Retrieval) Run(ctx context.Context) error {
 
 func (r *Retrieval) collectFoundationImageContent() error {
 	if _, ok := r.cfg.JobsSpec[logical.DumpJobType]; !ok {
+		if r.State.Mode == models.Logical {
+			log.Msg("logicalDump job is not enabled. Docker image extensions and locales will not be checked")
+		}
+
 		return nil
 	}
 
@@ -665,9 +669,9 @@ var ErrStageNotFound = errors.New("stage not found")
 
 // JobConfig parses job configuration to the provided structure.
 func (r *Retrieval) JobConfig(stage string, jobCfg any) error {
-	stageSpec, ok := r.cfg.JobsSpec[stage]
-	if !ok {
-		return ErrStageNotFound
+	stageSpec, err := r.GetStageSpec(stage)
+	if err != nil {
+		return err
 	}
 
 	if err := options.Unmarshal(stageSpec.Options, jobCfg); err != nil {
@@ -676,3 +680,13 @@ func (r *Retrieval) JobConfig(stage string, jobCfg any) error {
 
 	return nil
 }
+
+// GetStageSpec returns the stage spec if exists.
+func (r *Retrieval) GetStageSpec(stage string) (config.JobSpec, error) {
+	stageSpec, ok := r.cfg.JobsSpec[stage]
+	if !ok {
+		return config.JobSpec{}, ErrStageNotFound
+	}
+
+	return stageSpec, nil
+}

engine/internal/srv/config.go

@@ -13,6 +13,7 @@ import (
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/provision"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval"
+	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/logical"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools/db"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/srv/api"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/config"
@@ -218,6 +219,10 @@ func (s *Server) applyProjectedAdminConfig(ctx context.Context, obj interface{})
 		return nil, fmt.Errorf("config is only available in logical mode")
 	}
 
+	if _, err := s.Retrieval.GetStageSpec(logical.DumpJobType); err == retrieval.ErrStageNotFound {
+		return nil, fmt.Errorf("logicalDump job is not enabled. Consider editing DLE config manually")
+	}
+
 	objMap, ok := obj.(map[string]interface{})
 	if !ok {
 		return nil, fmt.Errorf("config must be an object: %T", obj)