Merge pull request #502 from byepolr/refactor-writable

Refactor Mount#Writable to be boolean pointer

Author: jandubois

pkg/hostagent/mount.go

@@ -52,7 +52,7 @@ func (a *HostAgent) setupMount(ctx context.Context, m limayaml.Mount) (*mount, e
 		Host:                "127.0.0.1",
 		Port:                a.sshLocalPort,
 		RemotePath:          expanded,
-		Readonly:            !m.Writable,
+		Readonly:            !(*m.Writable),
 		SSHFSAdditionalArgs: []string{"-o", sshfsOptions},
 	}
 	if err := rsf.Prepare(); err != nil {

pkg/limayaml/defaults.go

@@ -301,7 +301,9 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 			if mount.SSHFS.FollowSymlinks != nil {
 				mounts[i].SSHFS.FollowSymlinks = mount.SSHFS.FollowSymlinks
 			}
-			mounts[i].Writable = mount.Writable
+			if mount.Writable != nil {
+				mounts[i].Writable = mount.Writable
+			}
 		} else {
 			location[mount.Location] = len(mounts)
 			mounts = append(mounts, mount)
@@ -314,6 +316,9 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 		if mount.SSHFS.FollowSymlinks == nil {
 			mount.SSHFS.FollowSymlinks = pointer.Bool(false)
 		}
+		if mount.Writable == nil {
+			mount.Writable = pointer.Bool(false)
+		}
 	}
 
 	// Note: DNS lists are not combined; highest priority setting is picked

pkg/limayaml/defaults_test.go

@@ -116,6 +116,7 @@ func TestFillDefault(t *testing.T) {
 
 	expect := builtin
 	expect.Mounts = y.Mounts
+	expect.Mounts[0].Writable = pointer.Bool(false)
 	expect.Mounts[0].SSHFS.FollowSymlinks = pointer.Bool(false)
 	// Only missing Mounts field is Writable, and the default value is also the null value: false
 
@@ -191,7 +192,7 @@ func TestFillDefault(t *testing.T) {
 		Mounts: []Mount{
 			{
 				Location: "/var/log",
-				Writable: false,
+				Writable: pointer.Bool(false),
 			},
 		},
 		Provision: []Provision{
@@ -303,7 +304,7 @@ func TestFillDefault(t *testing.T) {
 		Mounts: []Mount{
 			{
 				Location: "/var/log",
-				Writable: true,
+				Writable: pointer.Bool(true),
 				SSHFS:    SSHFS{FollowSymlinks: pointer.Bool(true)},
 			},
 		},
@@ -360,7 +361,7 @@ func TestFillDefault(t *testing.T) {
 
 	// o.Mounts just makes d.Mounts[0] writable because the Location matches
 	expect.Mounts = append(d.Mounts, y.Mounts...)
-	expect.Mounts[0].Writable = true
+	expect.Mounts[0].Writable = pointer.Bool(true)
 	expect.Mounts[0].SSHFS.FollowSymlinks = pointer.Bool(true)
 
 	// o.Networks[1] is overriding the d.Networks[0].Lima entry for the "def0" interface

pkg/limayaml/limayaml.go

@@ -44,7 +44,7 @@ type File struct {
 
 type Mount struct {
 	Location string `yaml:"location" json:"location"` // REQUIRED
-	Writable bool   `yaml:"writable,omitempty" json:"writable,omitempty"`
+	Writable *bool  `yaml:"writable,omitempty" json:"writable,omitempty"`
 	SSHFS    SSHFS  `yaml:"sshfs,omitempty" json:"sshfs,omitempty"`
 }