Add ReadOnly() function

gabriel-samfira · gabriel-samfira · commit e4307926f327 · 2023-05-31T02:11:52.000+03:00
Signed-off-by: Gabriel Adrian Samfira &lt;gsamfira@cloudbasesolutions.com&gt;
diff --git a/diff/windows/windows.go b/diff/windows/windows.go
@@ -335,15 +335,7 @@ func mountsToLayerAndParents(mounts []mount.Mount) (string, []string, error) {
 		return "", nil, err
 	}
 
-	isView := false
-	for _, o := range mnt.Options {
-		if o == "ro" {
-			isView = true
-			break
-		}
-	}
-
-	if isView {
+	if mnt.ReadOnly() {
 		if mnt.Type == "bind" && len(parentLayerPaths) != 0 {
 			return "", nil, fmt.Errorf("unexpected bind-mount View with parents: %w", errdefs.ErrInvalidArgument)
 		} else if mnt.Type == "bind" {
diff --git a/mount/mount_windows.go b/mount/mount_windows.go
@@ -38,18 +38,19 @@ var (
 	ErrNotImplementOnWindows = errors.New("not implemented under windows")
 )
 
-// Mount to the provided target.
-func (m *Mount) mount(target string) (retErr error) {
-	readOnly := false
+func (m *Mount) ReadOnly() bool {
 	for _, option := range m.Options {
 		if option == "ro" {
-			readOnly = true
-			break
+			return true
 		}
 	}
+	return false
+}
 
+// Mount to the provided target.
+func (m *Mount) mount(target string) (retErr error) {
 	if m.Type == "bind" {
-		if err := bindfilter.ApplyFileBinding(target, m.Source, readOnly); err != nil {
+		if err := bindfilter.ApplyFileBinding(target, m.Source, m.ReadOnly()); err != nil {
 			return fmt.Errorf("failed to bind-mount to %s: %w", target, err)
 		}
 		return nil
@@ -98,7 +99,7 @@ func (m *Mount) mount(target string) (retErr error) {
 		return fmt.Errorf("failed to get volume path for layer %s: %w", m.Source, err)
 	}
 
-	if err := bindfilter.ApplyFileBinding(target, volume, readOnly); err != nil {
+	if err := bindfilter.ApplyFileBinding(target, volume, m.ReadOnly()); err != nil {
 		return fmt.Errorf("failed to set volume mount path for layer %s: %w", m.Source, err)
 	}
 	defer func() {

Original file line number	Diff line number	Diff line change
`@@ -38,18 +38,19 @@ var (`
`38`	`38`	`ErrNotImplementOnWindows = errors.New("not implemented under windows")`
`39`	`39`	`)`
`40`	`40`
`41`		`-// Mount to the provided target.`
`42`		`-func (m *Mount) mount(target string) (retErr error) {`
`43`		`- readOnly := false`
	`41`	`+func (m *Mount) ReadOnly() bool {`
`44`	`42`	`for _, option := range m.Options {`
`45`	`43`	`if option == "ro" {`
`46`		`- readOnly = true`
`47`		`- break`
	`44`	`+ return true`
`48`	`45`	`}`
`49`	`46`	`}`
	`47`	`+ return false`
	`48`	`+}`
`50`	`49`
	`50`	`+// Mount to the provided target.`
	`51`	`+func (m *Mount) mount(target string) (retErr error) {`
`51`	`52`	`if m.Type == "bind" {`
`52`		`- if err := bindfilter.ApplyFileBinding(target, m.Source, readOnly); err != nil {`
	`53`	`+ if err := bindfilter.ApplyFileBinding(target, m.Source, m.ReadOnly()); err != nil {`
`53`	`54`	`return fmt.Errorf("failed to bind-mount to %s: %w", target, err)`
`54`	`55`	`}`
`55`	`56`	`return nil`
`@@ -98,7 +99,7 @@ func (m *Mount) mount(target string) (retErr error) {`
`98`	`99`	`return fmt.Errorf("failed to get volume path for layer %s: %w", m.Source, err)`
`99`	`100`	`}`
`100`	`101`
`101`		`- if err := bindfilter.ApplyFileBinding(target, volume, readOnly); err != nil {`
	`102`	`+ if err := bindfilter.ApplyFileBinding(target, volume, m.ReadOnly()); err != nil {`
`102`	`103`	`return fmt.Errorf("failed to set volume mount path for layer %s: %w", m.Source, err)`
`103`	`104`	`}`
`104`	`105`	`defer func() {`