From 3dc1b8e83f2459a58d65f3bb918975cd6f1bb794 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 16 Feb 2022 06:04:22 -0500
Subject: Add podman volume mount support

Fixes: https://github.com/containers/podman/issues/12768

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/domain/entities/engine_container.go |  2 ++
 pkg/domain/entities/volumes.go          | 14 ++++++++++++++
 pkg/domain/infra/abi/volumes.go         | 32 ++++++++++++++++++++++++++++++++
 pkg/domain/infra/tunnel/volumes.go      |  8 ++++++++
 4 files changed, 56 insertions(+)

(limited to 'pkg/domain')

diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index 21272d33f..7cf7ca17f 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -99,6 +99,8 @@ type ContainerEngine interface {
 	VolumeMounted(ctx context.Context, namesOrID string) (*BoolReport, error)
 	VolumeInspect(ctx context.Context, namesOrIds []string, opts InspectOptions) ([]*VolumeInspectReport, []error, error)
 	VolumeList(ctx context.Context, opts VolumeListOptions) ([]*VolumeListReport, error)
+	VolumeMount(ctx context.Context, namesOrIds []string) ([]*VolumeMountReport, error)
 	VolumePrune(ctx context.Context, options VolumePruneOptions) ([]*reports.PruneReport, error)
 	VolumeRm(ctx context.Context, namesOrIds []string, opts VolumeRmOptions) ([]*VolumeRmReport, error)
+	VolumeUnmount(ctx context.Context, namesOrIds []string) ([]*VolumeUnmountReport, error)
 }
diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go
index 9bdce8392..f2e60a0db 100644
--- a/pkg/domain/entities/volumes.go
+++ b/pkg/domain/entities/volumes.go
@@ -187,3 +187,17 @@ type VolumeCreateBody struct {
 	// Required: true
 	Name string `json:"Name"`
 }
+
+// VolumeMountReport describes the response from volume mount
+type VolumeMountReport struct {
+	Err  error
+	Id   string //nolint
+	Name string
+	Path string
+}
+
+// VolumeUnmountReport describes the response from umounting a volume
+type VolumeUnmountReport struct {
+	Err error
+	Id  string //nolint
+}
diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go
index ee7269807..19fc6d2d3 100644
--- a/pkg/domain/infra/abi/volumes.go
+++ b/pkg/domain/infra/abi/volumes.go
@@ -178,3 +178,35 @@ func (ic *ContainerEngine) VolumeMounted(ctx context.Context, nameOrID string) (
 	}
 	return &entities.BoolReport{Value: false}, nil
 }
+
+func (ic *ContainerEngine) VolumeMount(ctx context.Context, nameOrIDs []string) ([]*entities.VolumeMountReport, error) {
+	reports := []*entities.VolumeMountReport{}
+	for _, name := range nameOrIDs {
+		report := entities.VolumeMountReport{Id: name}
+		vol, err := ic.Libpod.LookupVolume(name)
+		if err != nil {
+			report.Err = err
+		} else {
+			report.Path, report.Err = vol.Mount()
+		}
+		reports = append(reports, &report)
+	}
+
+	return reports, nil
+}
+
+func (ic *ContainerEngine) VolumeUnmount(ctx context.Context, nameOrIDs []string) ([]*entities.VolumeUnmountReport, error) {
+	reports := []*entities.VolumeUnmountReport{}
+	for _, name := range nameOrIDs {
+		report := entities.VolumeUnmountReport{Id: name}
+		vol, err := ic.Libpod.LookupVolume(name)
+		if err != nil {
+			report.Err = err
+		} else {
+			report.Err = vol.Unmount()
+		}
+		reports = append(reports, &report)
+	}
+
+	return reports, nil
+}
diff --git a/pkg/domain/infra/tunnel/volumes.go b/pkg/domain/infra/tunnel/volumes.go
index f4abeab0f..33e090148 100644
--- a/pkg/domain/infra/tunnel/volumes.go
+++ b/pkg/domain/infra/tunnel/volumes.go
@@ -100,3 +100,11 @@ func (ic *ContainerEngine) VolumeExists(ctx context.Context, nameOrID string) (*
 func (ic *ContainerEngine) VolumeMounted(ctx context.Context, nameOrID string) (*entities.BoolReport, error) {
 	return nil, errors.New("not implemented")
 }
+
+func (ic *ContainerEngine) VolumeMount(ctx context.Context, nameOrIDs []string) ([]*entities.VolumeMountReport, error) {
+	return nil, errors.New("mounting volumes is not supported for remote clients")
+}
+
+func (ic *ContainerEngine) VolumeUnmount(ctx context.Context, nameOrIDs []string) ([]*entities.VolumeUnmountReport, error) {
+	return nil, errors.New("unmounting volumes is not supported for remote clients")
+}
-- 
cgit v1.2.3-54-g00ecf