From bc6695d61d2bb6801e6f60e4f73681045edd9db1 Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Mon, 23 Oct 2023 11:32:32 +0530
Subject: [PATCH 1/7] Add mount host volume action argument

- Fixes #475
- Add option to mount host volume

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 cmd/porter/installations.go         |   1 +
 pkg/cnab/provider/action.go         |   9 ++
 pkg/cnab/provider/docker_linux.go   |  11 ++
 pkg/cnab/provider/driver.go         |  60 +++++++---
 pkg/cnab/provider/driver_darwin.go  |  11 ++
 pkg/cnab/provider/driver_test.go    | 178 ++++++++++++++++++++++++++++
 pkg/cnab/provider/driver_windows.go |  11 ++
 pkg/porter/lifecycle.go             |  40 +++++++
 pkg/porter/lifecycle_test.go        |  64 ++++++++++
 9 files changed, 371 insertions(+), 14 deletions(-)

diff --git a/cmd/porter/installations.go b/cmd/porter/installations.go
index 2d9daedc2..94105b77b 100644
--- a/cmd/porter/installations.go
+++ b/cmd/porter/installations.go
@@ -418,6 +418,7 @@ func addBundleActionFlags(f *pflag.FlagSet, actionOpts porter.BundleAction) {
 	addBundlePullFlags(f, &opts.BundlePullOptions)
 	f.BoolVar(&opts.AllowDockerHostAccess, "allow-docker-host-access", false,
 		"Controls if the bundle should have access to the host's Docker daemon with elevated privileges. See https://getporter.org/configuration/#allow-docker-host-access for the full implications of this flag.")
+	f.StringArrayVar(&opts.HostVolumeMounts, "mount-host-volume", nil, "Mount a host volume into the bundle. Format is <host path>:<container path>[:<option>]. May be specified multiple times. Option can be ro (read-only), rw (read-write), default is ro.")
 	f.BoolVar(&opts.NoLogs, "no-logs", false,
 		"Do not persist the bundle execution logs")
 	f.StringArrayVarP(&opts.ParameterSets, "parameter-set", "p", nil,
diff --git a/pkg/cnab/provider/action.go b/pkg/cnab/provider/action.go
index 2f3d9813b..75940d366 100644
--- a/pkg/cnab/provider/action.go
+++ b/pkg/cnab/provider/action.go
@@ -18,6 +18,12 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
+type HostVolumeMountSpec struct {
+	Source   string
+	Target   string
+	ReadOnly bool
+}
+
 // Shared arguments for all CNAB actions
 type ActionArguments struct {
 	// Action to execute, e.g. install, upgrade.
@@ -42,6 +48,9 @@ type ActionArguments struct {
 	// Give the bundle privileged access to the docker daemon.
 	AllowDockerHostAccess bool
 
+	// MountHostVolumes is a map of host paths to container paths to mount.
+	HostVolumeMounts []HostVolumeMountSpec
+
 	// PersistLogs specifies if the invocation image output should be saved as an output.
 	PersistLogs bool
 }
diff --git a/pkg/cnab/provider/docker_linux.go b/pkg/cnab/provider/docker_linux.go
index 73934e3a8..9b8a9fc07 100644
--- a/pkg/cnab/provider/docker_linux.go
+++ b/pkg/cnab/provider/docker_linux.go
@@ -47,3 +47,14 @@ func (r *Runtime) mountDockerSocket(cfg *container.Config, hostCfg *container.Ho
 	hostCfg.Mounts = append(hostCfg.Mounts, dockerSockMount)
 	return nil
 }
+
+func (r *Runtime) addVolumeMountToHostConfig(hostConfig *container.HostConfig, source string, target string, readOnly bool) error {
+	mount := mount.Mount{
+		Source:   source,
+		Target:   target,
+		Type:     "bind",
+		ReadOnly: readOnly,
+	}
+	hostConfig.Mounts = append(hostConfig.Mounts, mount)
+	return nil
+}
diff --git a/pkg/cnab/provider/driver.go b/pkg/cnab/provider/driver.go
index fd04ee2f1..aedce7f84 100644
--- a/pkg/cnab/provider/driver.go
+++ b/pkg/cnab/provider/driver.go
@@ -28,21 +28,44 @@ func (r *Runtime) newDriver(driverName string, args ActionArguments) (driver.Dri
 		return nil, err
 	}
 
-	if args.AllowDockerHostAccess {
-		if driverName != DriverNameDocker {
-			return nil, fmt.Errorf("allow-docker-host-access was enabled, but the driver is %s", driverName)
-		}
+	if args.AllowDockerHostAccess && driverName != DriverNameDocker {
+		return nil, fmt.Errorf("allow-docker-host-access was enabled, but the driver is %s", driverName)
+	}
 
-		driverImpl, err = r.dockerDriverWithHostAccess(dockerExt)
-	} else {
-		if dockerRequired {
-			return nil, fmt.Errorf("extension %q is required but allow-docker-host-access was not enabled",
-				cnab.DockerExtensionKey)
-		}
+	if dockerRequired && !args.AllowDockerHostAccess {
+		return nil, fmt.Errorf("extension %q is required but allow-docker-host-access was not enabled", cnab.DockerExtensionKey)
+	}
+
+	if len(args.HostVolumeMounts) > 0 && driverName != DriverNameDocker {
+		return nil, fmt.Errorf("mount-host-volume was was used to mount a volume, but the driver is %s", driverName)
+	}
+
+	if !args.AllowDockerHostAccess && len(args.HostVolumeMounts) == 0 {
 		driverImpl, err = drivers.LookupDriver(r.Context, driverName)
 	}
-	if err != nil {
-		return nil, err
+
+	var d *docker.Driver
+	if args.AllowDockerHostAccess || len(args.HostVolumeMounts) > 0 {
+		d = &docker.Driver{}
+	}
+
+	if args.AllowDockerHostAccess {
+		driverImpl, err = r.dockerDriverWithHostAccess(dockerExt, d)
+	}
+
+	if len(args.HostVolumeMounts) > 0 {
+		driverImpl, err = func(dr *docker.Driver) (driver.Driver, error) {
+
+			dr.AddConfigurationOptions(func(cfg *container.Config, hostCfg *container.HostConfig) error {
+				err := r.addVolumeMountsToHostConfig(hostCfg, args.HostVolumeMounts)
+				if err != nil {
+					return err
+				}
+				return nil
+			})
+
+			return driver.Driver(dr), nil
+		}(d)
 	}
 
 	if configurable, ok := driverImpl.(driver.Configurable); ok {
@@ -60,8 +83,7 @@ func (r *Runtime) newDriver(driverName string, args ActionArguments) (driver.Dri
 	return driverImpl, nil
 }
 
-func (r *Runtime) dockerDriverWithHostAccess(config cnab.Docker) (driver.Driver, error) {
-	d := &docker.Driver{}
+func (r *Runtime) dockerDriverWithHostAccess(config cnab.Docker, d *docker.Driver) (driver.Driver, error) {
 
 	// Run the container with privileged access if necessary
 	if config.Privileged {
@@ -78,3 +100,13 @@ func (r *Runtime) dockerDriverWithHostAccess(config cnab.Docker) (driver.Driver,
 
 	return driver.Driver(d), nil
 }
+
+func (r *Runtime) addVolumeMountsToHostConfig(hostConfig *container.HostConfig, mounts []HostVolumeMountSpec) error {
+	for _, mount := range mounts {
+		err := r.addVolumeMountToHostConfig(hostConfig, mount.Source, mount.Target, mount.ReadOnly)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/cnab/provider/driver_darwin.go b/pkg/cnab/provider/driver_darwin.go
index cdeccf883..62826cf96 100644
--- a/pkg/cnab/provider/driver_darwin.go
+++ b/pkg/cnab/provider/driver_darwin.go
@@ -19,3 +19,14 @@ func (r *Runtime) mountDockerSocket(cfg *container.Config, hostCfg *container.Ho
 	hostCfg.Mounts = append(hostCfg.Mounts, dockerSockMount)
 	return nil
 }
+
+func (r *Runtime) addVolumeMountToHostConfig(hostConfig *container.HostConfig, source string, target string, readOnly bool) error {
+	mount := mount.Mount{
+		Source:   source,
+		Target:   target,
+		Type:     "bind",
+		ReadOnly: readOnly,
+	}
+	hostConfig.Mounts = append(hostConfig.Mounts, mount)
+	return nil
+}
diff --git a/pkg/cnab/provider/driver_test.go b/pkg/cnab/provider/driver_test.go
index 32f5243bb..bf9450148 100644
--- a/pkg/cnab/provider/driver_test.go
+++ b/pkg/cnab/provider/driver_test.go
@@ -120,4 +120,182 @@ func TestNewDriver_Docker(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, true, containerHostCfg.Privileged)
 	})
+
+	t.Run("docker with host access, default config, and host volume mounts", func(t *testing.T) {
+		t.Parallel()
+
+		r := NewTestRuntime(t)
+		r.MockGetDockerGroupId()
+		defer r.Close()
+
+		// Currently, toggling Privileged is the only config exposed to users
+		// Here we supply no override, so expect Privileged to be false
+		r.Extensions[cnab.DockerExtensionKey] = cnab.Docker{}
+		r.FileSystem.Create("/var/run/docker.sock")
+		r.FileSystem.Create("/sourceFolder")
+		r.FileSystem.Create("/sourceFolder2")
+		r.FileSystem.Create("/sourceFolder3")
+
+		args := ActionArguments{
+			AllowDockerHostAccess: true,
+			HostVolumeMounts: []HostVolumeMountSpec{
+				{
+					Source: "/sourceFolder",
+					Target: "/targetFolder",
+				},
+				{
+					Source:   "/sourceFolder2",
+					Target:   "/targetFolder2",
+					ReadOnly: true,
+				},
+				{
+					Source:   "/sourceFolder3",
+					Target:   "/targetFolder3",
+					ReadOnly: false,
+				},
+			},
+		}
+
+		driver, err := r.newDriver(DriverNameDocker, args)
+		require.NoError(t, err)
+		assert.IsType(t, driver, &docker.Driver{})
+
+		dockerish, ok := driver.(*docker.Driver)
+		assert.True(t, ok)
+
+		err = dockerish.ApplyConfigurationOptions()
+		assert.NoError(t, err)
+
+		containerHostCfg, err := dockerish.GetContainerHostConfig()
+		require.NoError(t, err)
+		require.Equal(t, false, containerHostCfg.Privileged)
+
+		// Check that the host volume mounts were added to the container host config
+		require.Len(t, containerHostCfg.Mounts, 4) //includes the docker socket mount
+		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[1].Source)
+		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[1].Target)
+		assert.Equal(t, false, containerHostCfg.Mounts[1].ReadOnly)
+		assert.Equal(t, "/sourceFolder2", containerHostCfg.Mounts[2].Source)
+		assert.Equal(t, "/targetFolder2", containerHostCfg.Mounts[2].Target)
+		assert.Equal(t, true, containerHostCfg.Mounts[2].ReadOnly)
+		assert.Equal(t, "/sourceFolder3", containerHostCfg.Mounts[3].Source)
+		assert.Equal(t, "/targetFolder3", containerHostCfg.Mounts[3].Target)
+		assert.Equal(t, false, containerHostCfg.Mounts[3].ReadOnly)
+	})
+
+	t.Run("host volume mount, docker driver, with multiple mounts", func(t *testing.T) {
+		t.Parallel()
+
+		r := NewTestRuntime(t)
+		defer r.Close()
+
+		r.FileSystem.Create("/sourceFolder")
+		r.FileSystem.Create("/sourceFolder2")
+		r.FileSystem.Create("/sourceFolder3")
+
+		args := ActionArguments{
+			HostVolumeMounts: []HostVolumeMountSpec{
+				{
+					Source: "/sourceFolder",
+					Target: "/targetFolder",
+				},
+				{
+					Source:   "/sourceFolder2",
+					Target:   "/targetFolder2",
+					ReadOnly: true,
+				},
+				{
+					Source:   "/sourceFolder3",
+					Target:   "/targetFolder3",
+					ReadOnly: false,
+				},
+			},
+		}
+
+		driver, err := r.newDriver(DriverNameDocker, args)
+
+		require.NoError(t, err)
+		assert.IsType(t, driver, &docker.Driver{})
+
+		dockerish, ok := driver.(*docker.Driver)
+		assert.True(t, ok)
+
+		err = dockerish.ApplyConfigurationOptions()
+		assert.NoError(t, err)
+
+		containerHostCfg, err := dockerish.GetContainerHostConfig()
+		require.NoError(t, err)
+
+		// Check that the host volume mounts were added to the container host config
+		require.Len(t, containerHostCfg.Mounts, 3)
+		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[0].Source)
+		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[0].Target)
+		assert.Equal(t, false, containerHostCfg.Mounts[0].ReadOnly)
+		assert.Equal(t, "/sourceFolder2", containerHostCfg.Mounts[1].Source)
+		assert.Equal(t, "/targetFolder2", containerHostCfg.Mounts[1].Target)
+		assert.Equal(t, true, containerHostCfg.Mounts[1].ReadOnly)
+		assert.Equal(t, "/sourceFolder3", containerHostCfg.Mounts[2].Source)
+		assert.Equal(t, "/targetFolder3", containerHostCfg.Mounts[2].Target)
+		assert.Equal(t, false, containerHostCfg.Mounts[2].ReadOnly)
+
+	})
+
+	t.Run("host volume mount, docker driver, with single mount", func(t *testing.T) {
+		t.Parallel()
+
+		r := NewTestRuntime(t)
+		defer r.Close()
+
+		r.FileSystem.Create("/sourceFolder")
+
+		args := ActionArguments{
+			HostVolumeMounts: []HostVolumeMountSpec{
+				{
+					Source: "/sourceFolder",
+					Target: "/targetFolder",
+				},
+			},
+		}
+
+		driver, err := r.newDriver(DriverNameDocker, args)
+
+		require.NoError(t, err)
+		assert.IsType(t, driver, &docker.Driver{})
+
+		dockerish, ok := driver.(*docker.Driver)
+		assert.True(t, ok)
+
+		err = dockerish.ApplyConfigurationOptions()
+		assert.NoError(t, err)
+
+		containerHostCfg, err := dockerish.GetContainerHostConfig()
+		require.NoError(t, err)
+
+		// Check that the host volume mounts were added to the container host config
+		require.Len(t, containerHostCfg.Mounts, 1)
+		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[0].Source)
+		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[0].Target)
+		assert.Equal(t, false, containerHostCfg.Mounts[0].ReadOnly)
+	})
+
+	t.Run("host volume mount, mismatch driver name", func(t *testing.T) {
+		t.Parallel()
+
+		r := NewTestRuntime(t)
+		r.MockGetDockerGroupId()
+		defer r.Close()
+
+		args := ActionArguments{
+			HostVolumeMounts: []HostVolumeMountSpec{
+				{
+					Source: "/sourceFolder",
+					Target: "/targetFolder",
+				},
+			},
+		}
+
+		_, err := r.newDriver("custom-driver", args)
+
+		assert.EqualError(t, err, "mount-host-volume was was used to mount a volume, but the driver is custom-driver")
+	})
 }
diff --git a/pkg/cnab/provider/driver_windows.go b/pkg/cnab/provider/driver_windows.go
index 39e356a3f..029d10f75 100644
--- a/pkg/cnab/provider/driver_windows.go
+++ b/pkg/cnab/provider/driver_windows.go
@@ -17,3 +17,14 @@ func (r *Runtime) mountDockerSocket(cfg *container.Config, hostCfg *container.Ho
 	hostCfg.Mounts = append(hostCfg.Mounts, dockerSockMount)
 	return nil
 }
+
+func (r *Runtime) addVolumeMountToHostConfig(hostConfig *container.HostConfig, source string, target string, readOnly bool) error {
+	mount := mount.Mount{
+		Source:   source,
+		Target:   target,
+		Type:     "bind",
+		ReadOnly: readOnly,
+	}
+	hostConfig.Mounts = append(hostConfig.Mounts, mount)
+	return nil
+}
diff --git a/pkg/porter/lifecycle.go b/pkg/porter/lifecycle.go
index 3f3c21bce..f4140b0e9 100644
--- a/pkg/porter/lifecycle.go
+++ b/pkg/porter/lifecycle.go
@@ -43,6 +43,11 @@ type BundleExecutionOptions struct {
 	// AllowDockerHostAccess grants the bundle access to the Docker socket.
 	AllowDockerHostAccess bool
 
+	// MountHostVolume mounts provides the bundle access to a host volume.
+	// This is the unparsed list of HOST_PATH:TARGET_PATH:OPTION
+	// OPTION can be ro (read-only) or rw (read-write). Defaults to ro.
+	HostVolumeMounts []string
+
 	// DebugMode indicates if the bundle should be run in debug mode.
 	DebugMode bool
 
@@ -92,6 +97,40 @@ func (o *BundleExecutionOptions) GetParameters() map[string]interface{} {
 	return o.finalParams
 }
 
+// Sets the final resolved set of host volumes to be made availabe to the bundle
+func (o *BundleExecutionOptions) GetHostVolumeMounts() []cnabprovider.HostVolumeMountSpec {
+	var hostVolumeMounts []cnabprovider.HostVolumeMountSpec
+	for _, mount := range o.HostVolumeMounts {
+		var isReadOnlyMount bool
+		parts := strings.Split(mount, ":") // HOST_PATH:TARGET_PATH:OPTION
+
+		l := len(parts)
+		if l < 2 || l > 3 {
+			continue
+		}
+
+		switch {
+		case l == 2:
+			isReadOnlyMount = true
+			// next cases are l == 3
+		case parts[2] == "ro":
+			isReadOnlyMount = true
+		case parts[2] == "rw":
+			isReadOnlyMount = false
+		default:
+			isReadOnlyMount = true
+		}
+
+		hostVolumeMounts = append(hostVolumeMounts, cnabprovider.HostVolumeMountSpec{
+			Source:   parts[0],
+			Target:   parts[1],
+			ReadOnly: isReadOnlyMount,
+		})
+	}
+
+	return hostVolumeMounts
+}
+
 func (o *BundleExecutionOptions) Validate(ctx context.Context, args []string, p *Porter) error {
 	if err := o.BundleReferenceOptions.Validate(ctx, args, p); err != nil {
 		return err
@@ -300,6 +339,7 @@ func (p *Porter) BuildActionArgs(ctx context.Context, installation storage.Insta
 		Params:                opts.GetParameters(),
 		Driver:                opts.Driver,
 		AllowDockerHostAccess: opts.AllowDockerHostAccess,
+		HostVolumeMounts:      opts.GetHostVolumeMounts(),
 		PersistLogs:           !opts.NoLogs,
 	}
 
diff --git a/pkg/porter/lifecycle_test.go b/pkg/porter/lifecycle_test.go
index 8c7510446..894a199c3 100644
--- a/pkg/porter/lifecycle_test.go
+++ b/pkg/porter/lifecycle_test.go
@@ -10,6 +10,7 @@ import (
 	"get.porter.sh/porter/pkg"
 	"get.porter.sh/porter/pkg/cnab"
 	configadapter "get.porter.sh/porter/pkg/cnab/config-adapter"
+	cnabprovider "get.porter.sh/porter/pkg/cnab/provider"
 	"get.porter.sh/porter/pkg/config"
 	"get.porter.sh/porter/pkg/manifest"
 	"get.porter.sh/porter/pkg/secrets"
@@ -698,3 +699,66 @@ func Test_ensureVPrefix_latest(t *testing.T) {
 		})
 	}
 }
+
+func TestBundleExecutionOptions_GetHostVolumeMounts(t *testing.T) {
+	t.Run("valid host volume mounts", func(t *testing.T) {
+		opts := &BundleExecutionOptions{
+			HostVolumeMounts: []string{
+				"/host/path:/target/path:ro",
+				"/host/path:/target/path:rw",
+				"/host/path:/target/path",
+			},
+		}
+
+		expected := []cnabprovider.HostVolumeMountSpec{
+			{
+				Source:   "/host/path",
+				Target:   "/target/path",
+				ReadOnly: true,
+			},
+			{
+				Source:   "/host/path",
+				Target:   "/target/path",
+				ReadOnly: false,
+			},
+			{
+				Source:   "/host/path",
+				Target:   "/target/path",
+				ReadOnly: true,
+			},
+		}
+
+		actual := opts.GetHostVolumeMounts()
+
+		if len(expected) != len(actual) {
+			t.Errorf("expected %v but got %v", expected, actual)
+		}
+		for i := range expected {
+			if expected[i].Source != actual[i].Source {
+				t.Errorf("expected %v but got %v", expected[i].Source, actual[i].Source)
+			}
+			if expected[i].Target != actual[i].Target {
+				t.Errorf("expected %v but got %v", expected[i].Target, actual[i].Target)
+			}
+			if expected[i].ReadOnly != actual[i].ReadOnly {
+				t.Errorf("expected %v but got %v", expected[i].ReadOnly, actual[i].ReadOnly)
+			}
+		}
+	})
+
+	t.Run("invalid host volume mounts", func(t *testing.T) {
+		opts := &BundleExecutionOptions{
+			HostVolumeMounts: []string{
+				"/host/path:/target/path:invalid-option",
+				"/host/path",
+			},
+		}
+
+		hvs := opts.GetHostVolumeMounts()
+
+		if len(hvs) != 0 {
+			t.Errorf("expected no host volume mounts but got %v", hvs)
+		}
+
+	})
+}

From dd570d82409adc44abcc5a1cbb80a483d2eca7ac Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Mon, 23 Oct 2023 11:57:43 +0530
Subject: [PATCH 2/7] enhance host volume mount tests

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/porter/lifecycle_test.go | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkg/porter/lifecycle_test.go b/pkg/porter/lifecycle_test.go
index 894a199c3..4ec10ffd5 100644
--- a/pkg/porter/lifecycle_test.go
+++ b/pkg/porter/lifecycle_test.go
@@ -749,15 +749,30 @@ func TestBundleExecutionOptions_GetHostVolumeMounts(t *testing.T) {
 	t.Run("invalid host volume mounts", func(t *testing.T) {
 		opts := &BundleExecutionOptions{
 			HostVolumeMounts: []string{
-				"/host/path:/target/path:invalid-option",
+				"1=",
 				"/host/path",
 			},
 		}
 
-		hvs := opts.GetHostVolumeMounts()
+		actual := opts.GetHostVolumeMounts()
+
+		if len(actual) != 0 {
+			t.Errorf("expected no host volume mounts but got %v", actual)
+		}
+
+	})
+
+	t.Run("invalid host volume mount r/w option value", func(t *testing.T) {
+		opts := &BundleExecutionOptions{
+			HostVolumeMounts: []string{
+				"/host/path:/target/path:invalid-option",
+			},
+		}
+
+		actual := opts.GetHostVolumeMounts()
 
-		if len(hvs) != 0 {
-			t.Errorf("expected no host volume mounts but got %v", hvs)
+		if !actual[0].ReadOnly {
+			t.Errorf("expected ReadOnly to be true but got %v", actual[0].ReadOnly)
 		}
 
 	})

From c214868b57bff923b21a1595f5d69ae7384d8e12 Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Mon, 23 Oct 2023 12:10:20 +0530
Subject: [PATCH 3/7] remove redundant test comments

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/cnab/provider/driver_test.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg/cnab/provider/driver_test.go b/pkg/cnab/provider/driver_test.go
index bf9450148..770e279ac 100644
--- a/pkg/cnab/provider/driver_test.go
+++ b/pkg/cnab/provider/driver_test.go
@@ -128,8 +128,6 @@ func TestNewDriver_Docker(t *testing.T) {
 		r.MockGetDockerGroupId()
 		defer r.Close()
 
-		// Currently, toggling Privileged is the only config exposed to users
-		// Here we supply no override, so expect Privileged to be false
 		r.Extensions[cnab.DockerExtensionKey] = cnab.Docker{}
 		r.FileSystem.Create("/var/run/docker.sock")
 		r.FileSystem.Create("/sourceFolder")
@@ -170,7 +168,6 @@ func TestNewDriver_Docker(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, false, containerHostCfg.Privileged)
 
-		// Check that the host volume mounts were added to the container host config
 		require.Len(t, containerHostCfg.Mounts, 4) //includes the docker socket mount
 		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[1].Source)
 		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[1].Target)
@@ -226,7 +223,6 @@ func TestNewDriver_Docker(t *testing.T) {
 		containerHostCfg, err := dockerish.GetContainerHostConfig()
 		require.NoError(t, err)
 
-		// Check that the host volume mounts were added to the container host config
 		require.Len(t, containerHostCfg.Mounts, 3)
 		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[0].Source)
 		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[0].Target)
@@ -271,7 +267,6 @@ func TestNewDriver_Docker(t *testing.T) {
 		containerHostCfg, err := dockerish.GetContainerHostConfig()
 		require.NoError(t, err)
 
-		// Check that the host volume mounts were added to the container host config
 		require.Len(t, containerHostCfg.Mounts, 1)
 		assert.Equal(t, "/sourceFolder", containerHostCfg.Mounts[0].Source)
 		assert.Equal(t, "/targetFolder", containerHostCfg.Mounts[0].Target)

From d08f39d6161c797a997e32dae62bfb0270a6425b Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Mon, 23 Oct 2023 17:00:49 +0530
Subject: [PATCH 4/7] resolve linting issues

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/cnab/provider/driver.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/cnab/provider/driver.go b/pkg/cnab/provider/driver.go
index aedce7f84..da4952743 100644
--- a/pkg/cnab/provider/driver.go
+++ b/pkg/cnab/provider/driver.go
@@ -43,6 +43,9 @@ func (r *Runtime) newDriver(driverName string, args ActionArguments) (driver.Dri
 	if !args.AllowDockerHostAccess && len(args.HostVolumeMounts) == 0 {
 		driverImpl, err = drivers.LookupDriver(r.Context, driverName)
 	}
+	if err != nil {
+		return nil, err
+	}
 
 	var d *docker.Driver
 	if args.AllowDockerHostAccess || len(args.HostVolumeMounts) > 0 {
@@ -52,6 +55,9 @@ func (r *Runtime) newDriver(driverName string, args ActionArguments) (driver.Dri
 	if args.AllowDockerHostAccess {
 		driverImpl, err = r.dockerDriverWithHostAccess(dockerExt, d)
 	}
+	if err != nil {
+		return nil, err
+	}
 
 	if len(args.HostVolumeMounts) > 0 {
 		driverImpl, err = func(dr *docker.Driver) (driver.Driver, error) {
@@ -66,6 +72,9 @@ func (r *Runtime) newDriver(driverName string, args ActionArguments) (driver.Dri
 
 			return driver.Driver(dr), nil
 		}(d)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if configurable, ok := driverImpl.(driver.Configurable); ok {

From 484f19467acc63ea949045a64bf47440f0ae7914 Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Wed, 25 Oct 2023 21:42:52 +0530
Subject: [PATCH 5/7] handle windows source paths with : like c:\

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/porter/lifecycle.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/porter/lifecycle.go b/pkg/porter/lifecycle.go
index f4140b0e9..f60c021f6 100644
--- a/pkg/porter/lifecycle.go
+++ b/pkg/porter/lifecycle.go
@@ -5,7 +5,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"runtime"
 	"strings"
+	"unicode"
 
 	"get.porter.sh/porter/pkg/cache"
 	"get.porter.sh/porter/pkg/cnab"
@@ -104,6 +106,13 @@ func (o *BundleExecutionOptions) GetHostVolumeMounts() []cnabprovider.HostVolume
 		var isReadOnlyMount bool
 		parts := strings.Split(mount, ":") // HOST_PATH:TARGET_PATH:OPTION
 
+		// if parts[0] is a single character, it's a drive letter on Windows
+		// so we need to join it with the next part
+		if runtime.GOOS == "windows" && len(parts) > 1 && len(parts[0]) == 1 && unicode.IsLetter(rune(parts[0][0])) {
+			parts[1] = fmt.Sprintf("%s:%s", parts[0], parts[1])
+			parts = parts[1:]
+		}
+
 		l := len(parts)
 		if l < 2 || l > 3 {
 			continue

From ec1d420f0326677cfe19d2a1d7fc9f5e6761b8d0 Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Thu, 26 Oct 2023 10:37:58 +0530
Subject: [PATCH 6/7] Add Host Volume Mount tests for Windows platform

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/porter/lifecycle_test.go | 48 ++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/pkg/porter/lifecycle_test.go b/pkg/porter/lifecycle_test.go
index 4ec10ffd5..52ec4c7b9 100644
--- a/pkg/porter/lifecycle_test.go
+++ b/pkg/porter/lifecycle_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -777,3 +778,50 @@ func TestBundleExecutionOptions_GetHostVolumeMounts(t *testing.T) {
 
 	})
 }
+
+func TestBundleExecutionOptions_GetHostVolumeMountsWindows(t *testing.T) {
+
+	if runtime.GOOS != "windows" {
+		t.Skip("Skipping test on non-windows platform")
+	}
+
+	t.Run("valid host volume mounts", func(t *testing.T) {
+		opts := &BundleExecutionOptions{
+			HostVolumeMounts: []string{
+				"C:\\Users\\testuser\\folderpath:/target/path:rw",
+				"C:\\Users\\testuser\\folderpath:/target/path",
+			},
+		}
+
+		expected := []cnabprovider.HostVolumeMountSpec{
+			{
+				Source:   "C:\\Users\\testuser\\folderpath",
+				Target:   "/target/path",
+				ReadOnly: false,
+			},
+			{
+				Source:   "C:\\Users\\testuser\\folderpath",
+				Target:   "/target/path",
+				ReadOnly: true,
+			},
+		}
+
+		actual := opts.GetHostVolumeMounts()
+
+		if len(expected) != len(actual) {
+			t.Errorf("expected %v but got %v", expected, actual)
+		}
+		for i := range expected {
+			if expected[i].Source != actual[i].Source {
+				t.Errorf("expected %v but got %v", expected[i].Source, actual[i].Source)
+			}
+			if expected[i].Target != actual[i].Target {
+				t.Errorf("expected %v but got %v", expected[i].Target, actual[i].Target)
+			}
+			if expected[i].ReadOnly != actual[i].ReadOnly {
+				t.Errorf("expected %v but got %v", expected[i].ReadOnly, actual[i].ReadOnly)
+			}
+		}
+	})
+
+}

From c1538546cf4031bf0fa345425c6db64b27340e75 Mon Sep 17 00:00:00 2001
From: Maninderjit Bindra <maninder.bindra@gmail.com>
Date: Mon, 20 Nov 2023 11:48:17 +0530
Subject: [PATCH 7/7] Test for windows folder name with space added

Signed-off-by: Maninderjit Bindra <maninder.bindra@gmail.com>
---
 pkg/porter/lifecycle_test.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/porter/lifecycle_test.go b/pkg/porter/lifecycle_test.go
index 52ec4c7b9..031e62315 100644
--- a/pkg/porter/lifecycle_test.go
+++ b/pkg/porter/lifecycle_test.go
@@ -790,6 +790,7 @@ func TestBundleExecutionOptions_GetHostVolumeMountsWindows(t *testing.T) {
 			HostVolumeMounts: []string{
 				"C:\\Users\\testuser\\folderpath:/target/path:rw",
 				"C:\\Users\\testuser\\folderpath:/target/path",
+				"C:\\Users\\Test User\\test path:/target/path",
 			},
 		}
 
@@ -804,6 +805,11 @@ func TestBundleExecutionOptions_GetHostVolumeMountsWindows(t *testing.T) {
 				Target:   "/target/path",
 				ReadOnly: true,
 			},
+			{
+				Source:   "C:\\Users\\Test User\\test path",
+				Target:   "/target/path",
+				ReadOnly: true,
+			},
 		}
 
 		actual := opts.GetHostVolumeMounts()