Merge branch '349-error-shadowing' into 'master'

fix(engine): avoid shadow copying errors when collecting diagnostic logs (#349)

Closes #349

See merge request postgres-ai/database-lab!570

Author: agneum

engine/internal/provision/databases/postgres/postgres.go

@@ -137,9 +137,7 @@ func collectDiagnostics(c *resources.AppConfig) error {
 		filters.KeyValuePair{Key: "label",
 			Value: fmt.Sprintf("%s=%s", docker.LabelClone, c.Pool.Name)})
 
-	err = diagnostic.CollectDiagnostics(context.Background(), dockerClient, filterArgs, c.CloneName, c.DataDir())
-
-	if err != nil {
+	if err := diagnostic.CollectDiagnostics(context.Background(), dockerClient, filterArgs, c.CloneName, c.DataDir()); err != nil {
 		log.Err("Failed to collect container diagnostics", err)
 	}
 

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

@@ -382,9 +382,7 @@ func collectDiagnostics(ctx context.Context, client *client.Client, postgresName
 		filters.KeyValuePair{Key: "label",
 			Value: fmt.Sprintf("%s=%s", cont.DBLabControlLabel, cont.DBLabDumpLabel)})
 
-	err := diagnostic.CollectDiagnostics(ctx, client, filterArgs, postgresName, dataDir)
-
-	if err != nil {
+	if err := diagnostic.CollectDiagnostics(ctx, client, filterArgs, postgresName, dataDir); err != nil {
 		log.Err("Failed to collect container diagnostics", err)
 	}
 }

engine/internal/retrieval/engine/postgres/physical/physical.go

@@ -340,9 +340,7 @@ func (r *RestoreJob) runSyncInstance(ctx context.Context) (err error) {
 				filters.KeyValuePair{Key: "label",
 					Value: fmt.Sprintf("%s=%s", cont.DBLabControlLabel, cont.DBLabSyncLabel)})
 
-			err = diagnostic.CollectDiagnostics(ctx, r.dockerClient, filterArgs, r.syncInstanceName(), r.fsPool.DataDir())
-
-			if err != nil {
+			if err := diagnostic.CollectDiagnostics(ctx, r.dockerClient, filterArgs, r.syncInstanceName(), r.fsPool.DataDir()); err != nil {
 				log.Err("Failed to collect container diagnostics", err)
 			}
 		}

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

@@ -235,9 +235,7 @@ func (s *LogicalInitial) runPreprocessingQueries(ctx context.Context, dataDir st
 				filters.KeyValuePair{Key: "label",
 					Value: fmt.Sprintf("%s=%s", cont.DBLabControlLabel, cont.DBLabPatchLabel)})
 
-			err = diagnostic.CollectDiagnostics(ctx, s.dockerClient, filterArgs, s.patchContainerName(), dataDir)
-
-			if err != nil {
+			if err := diagnostic.CollectDiagnostics(ctx, s.dockerClient, filterArgs, s.patchContainerName(), dataDir); err != nil {
 				log.Err("Failed to collect container diagnostics", err)
 			}
 		}

engine/internal/retrieval/engine/postgres/snapshot/physical.go

@@ -570,9 +570,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,
 				filters.KeyValuePair{Key: "label",
 					Value: fmt.Sprintf("%s=%s", cont.DBLabControlLabel, cont.DBLabPromoteLabel)})
 
-			err = diagnostic.CollectDiagnostics(ctx, p.dockerClient, filterArgs, p.promoteContainerName(), clonePath)
-
-			if err != nil {
+			if err := diagnostic.CollectDiagnostics(ctx, p.dockerClient, filterArgs, p.promoteContainerName(), clonePath); err != nil {
 				log.Err("Failed to collect container diagnostics", err)
 			}
 		}