fix: use only internal containers paths (#156)

Author: agneum

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

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -363,7 +362,7 @@ func (d *DumpJob) buildContainerConfig(password string) *container.Config {
 
 func (d *DumpJob) buildHostConfig(ctx context.Context) (*container.HostConfig, error) {
 	hostConfig := &container.HostConfig{
-		Mounts:      d.getMountVolumes(),
+		Mounts:      d.dumper.GetMounts(),
 		NetworkMode: d.getContainerNetworkMode(),
 	}
 
@@ -374,21 +373,6 @@ func (d *DumpJob) buildHostConfig(ctx context.Context) (*container.HostConfig, e
 	return hostConfig, nil
 }
 
-// getMountVolumes returns a list of mount volumes.
-func (d *DumpJob) getMountVolumes() []mount.Mount {
-	mounts := d.dumper.GetMounts()
-
-	if d.DumpOptions.DumpLocation != "" {
-		mounts = append(mounts, mount.Mount{
-			Type:   mount.TypeBind,
-			Source: filepath.Dir(d.DumpOptions.DumpLocation),
-			Target: filepath.Dir(d.DumpOptions.DumpLocation),
-		})
-	}
-
-	return mounts
-}
-
 func (d *DumpJob) getContainerNetworkMode() container.NetworkMode {
 	networkMode := networkModeDefault
 

pkg/retrieval/engine/postgres/logical/dump_rds.go

@@ -23,7 +23,7 @@ import (
 )
 
 const (
-	sslRootCert = "/tmp/cert/ssl-combined-ca-bundle.pem"
+	sslRootCert = "/cert/ssl-combined-ca-bundle.pem"
 
 	// AWS service names.
 	serviceIAM   = "iam"
@@ -98,6 +98,7 @@ func (r *rdsDumper) GetMounts() []mount.Mount {
 	mounts := []mount.Mount{}
 
 	if r.rdsCfg != nil && r.rdsCfg.SSLRootCert != "" {
+		// TODO (akartasov): Remove mounting after the image contains a built-in certificate.
 		mounts = append(mounts, mount.Mount{
 			Type:   mount.TypeBind,
 			Source: r.rdsCfg.SSLRootCert,

pkg/retrieval/engine/postgres/logical/restore.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
@@ -51,7 +50,7 @@ type RestoreJob struct {
 
 // RestoreOptions defines a logical restore options.
 type RestoreOptions struct {
-	DumpFile     string  `yaml:"dumpLocation"`
+	DumpLocation string  `yaml:"dumpLocation"`
 	DockerImage  string  `yaml:"dockerImage"`
 	DBName       string  `yaml:"dbname"`
 	ForceInit    bool    `yaml:"forceInit"`
@@ -214,15 +213,7 @@ func (r *RestoreJob) buildContainerConfig(password string) *container.Config {
 }
 
 func (r *RestoreJob) buildHostConfig(ctx context.Context) (*container.HostConfig, error) {
-	hostConfig := &container.HostConfig{
-		Mounts: []mount.Mount{
-			{
-				Type:   mount.TypeBind,
-				Source: r.RestoreOptions.DumpFile,
-				Target: r.RestoreOptions.DumpFile,
-			},
-		},
-	}
+	hostConfig := &container.HostConfig{}
 
 	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig, r.globalCfg.DataDir); err != nil {
 		return nil, err
@@ -253,7 +244,7 @@ func (r *RestoreJob) markDatabase(ctx context.Context, contID string) error {
 }
 
 func (r *RestoreJob) retrieveDataStateAt(ctx context.Context, contID string) (string, error) {
-	restoreMetaCmd := []string{"sh", "-c", "pg_restore --list " + r.RestoreOptions.DumpFile + " | head -n 10"}
+	restoreMetaCmd := []string{"sh", "-c", "pg_restore --list " + r.RestoreOptions.DumpLocation + " | head -n 10"}
 
 	log.Dbg("Running a restore metadata command: ", restoreMetaCmd)
 
@@ -295,7 +286,7 @@ func (r *RestoreJob) buildLogicalRestoreCommand() []string {
 		restoreCmd = append(restoreCmd, "--table", table)
 	}
 
-	restoreCmd = append(restoreCmd, r.RestoreOptions.DumpFile)
+	restoreCmd = append(restoreCmd, r.RestoreOptions.DumpLocation)
 
 	return restoreCmd
 }

pkg/retrieval/engine/postgres/logical/restore_test.go

@@ -22,7 +22,7 @@ func TestRestoreCommandBuilding(t *testing.T) {
 				DBName:       "testDB",
 				ParallelJobs: 1,
 				ForceInit:    false,
-				DumpFile:     "/tmp/db.dump",
+				DumpLocation: "/tmp/db.dump",
 			},
 			Command: []string{"pg_restore", "--username", "postgres", "--dbname", "postgres", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "/tmp/db.dump"},
 		},
@@ -38,7 +38,7 @@ func TestRestoreCommandBuilding(t *testing.T) {
 				DBName:       "testDB",
 				ParallelJobs: 1,
 				Partial:      Partial{Tables: []string{"test", "users"}},
-				DumpFile:     "/tmp/db.dump",
+				DumpLocation: "/tmp/db.dump",
 			},
 			Command: []string{"pg_restore", "--username", "postgres", "--dbname", "postgres", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "--table", "test", "--table", "users", "/tmp/db.dump"},
 		},

pkg/retrieval/engine/postgres/physical/custom.go

@@ -7,8 +7,6 @@ package physical
 import (
 	"bytes"
 	"fmt"
-
-	"github.com/docker/docker/api/types/mount"
 )
 
 const (
@@ -35,11 +33,6 @@ func (c *custom) GetEnvVariables() []string {
 	return []string{}
 }
 
-// GetMounts returns volume configurations for a custom restore command.
-func (c *custom) GetMounts() []mount.Mount {
-	return []mount.Mount{}
-}
-
 // GetRestoreCommand returns a custom command to restore data.
 func (c *custom) GetRestoreCommand() string {
 	return c.options.Command

pkg/retrieval/engine/postgres/physical/physical.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
@@ -70,9 +69,6 @@ type restorer interface {
 	// GetEnvVariables returns restorer environment variables.
 	GetEnvVariables() []string
 
-	// GetMounts returns restorer volume configurations for mounting.
-	GetMounts() []mount.Mount
-
 	// GetRestoreCommand returns a command to restore data.
 	GetRestoreCommand() string
 
@@ -400,9 +396,7 @@ func (r *RestoreJob) buildContainerConfig(password string) *container.Config {
 }
 
 func (r *RestoreJob) buildHostConfig(ctx context.Context) (*container.HostConfig, error) {
-	hostConfig := &container.HostConfig{
-		Mounts: r.restorer.GetMounts(),
-	}
+	hostConfig := &container.HostConfig{}
 
 	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig, r.globalCfg.DataDir); err != nil {
 		return nil, err

pkg/retrieval/engine/postgres/physical/wal_g.go

@@ -7,14 +7,11 @@ package physical
 import (
 	"bytes"
 	"fmt"
-
-	"github.com/docker/docker/api/types/mount"
 )
 
 const (
-	walgTool                = "walg"
-	credentialsInternalPath = "/etc/sa/credentials.json"
-	gcsStorage              = "gcs"
+	walgTool   = "walg"
+	gcsStorage = "gcs"
 )
 
 // walg defines a WAL-G as an archival restoration tool.
@@ -41,29 +38,12 @@ func (w *walg) GetEnvVariables() []string {
 	envVars := []string{}
 
 	if w.options.Storage == gcsStorage {
-		envVars = append(envVars, "GOOGLE_APPLICATION_CREDENTIALS="+credentialsInternalPath)
+		envVars = append(envVars, "GOOGLE_APPLICATION_CREDENTIALS="+w.options.CredentialsFile)
 	}
 
 	return envVars
 }
 
-// GetMounts returns restorer volume configurations for mounting.
-func (w *walg) GetMounts() []mount.Mount {
-	mounts := []mount.Mount{}
-
-	if w.options.CredentialsFile != "" {
-		mounts = append(mounts,
-			mount.Mount{
-				Type:   mount.TypeBind,
-				Source: w.options.CredentialsFile,
-				Target: credentialsInternalPath,
-			},
-		)
-	}
-
-	return mounts
-}
-
 // GetRestoreCommand returns a command to restore data.
 func (w *walg) GetRestoreCommand() string {
 	return fmt.Sprintf("wal-g backup-fetch %s %s", w.pgDataDir, w.options.BackupName)

pkg/retrieval/engine/postgres/tools/tools.go

@@ -115,22 +115,23 @@ func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, ho
 	log.Dbg("Virtualization system: ", hostInfo.VirtualizationSystem)
 
 	if hostInfo.VirtualizationRole == "guest" {
-		insp, err := dockerClient.ContainerInspect(ctx, hostInfo.Hostname)
+		inspection, err := dockerClient.ContainerInspect(ctx, hostInfo.Hostname)
 		if err != nil {
 			return err
 		}
 
-		for _, mountPoint := range insp.Mounts {
-			if !strings.HasPrefix(dataDir, mountPoint.Destination) {
-				continue
+		for _, mountPoint := range inspection.Mounts {
+			// Rewrite mounting to data directory.
+			if strings.HasPrefix(dataDir, mountPoint.Destination) {
+				suffix := strings.TrimPrefix(dataDir, mountPoint.Destination)
+				mountPoint.Source = path.Join(mountPoint.Source, suffix)
+				mountPoint.Destination = dataDir
 			}
 
-			suffix := strings.TrimPrefix(dataDir, mountPoint.Destination)
-
 			hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
 				Type:     mountPoint.Type,
-				Source:   path.Join(mountPoint.Source, suffix),
-				Target:   dataDir,
+				Source:   mountPoint.Source,
+				Target:   mountPoint.Destination,
 				ReadOnly: !mountPoint.RW,
 				BindOptions: &mount.BindOptions{
 					Propagation: mountPoint.Propagation,