Skip to content

Commit baaa08f

Browse files
committed
pick fix linter
Signed-off-by: Songpon Srisawai <songpon.ssw@gmail.com>
1 parent c4b92cf commit baaa08f

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

cmd/limactl/disk.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"fmt"
1010
"io/fs"
1111
"os"
12-
"text/tabwriter"
1312
"path/filepath"
13+
"text/tabwriter"
1414

1515
"github.com/docker/go-units"
1616
"github.com/lima-vm/go-qcow2reader"
@@ -422,7 +422,6 @@ func diskBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra
422422
return bashCompleteDiskNames(cmd)
423423
}
424424

425-
// func newDiskRegisterCommand()
426425
func newDiskAddCommand() *cobra.Command {
427426
diskAddCommand := &cobra.Command{
428427
Use: "add existing DISK to Lima",
@@ -447,19 +446,17 @@ func diskAddAction(cmd *cobra.Command, args []string) error {
447446
}
448447

449448
f, err := os.Open(fName)
450-
defer f.Close()
451449
if err != nil {
452450
return err
453451
}
452+
defer f.Close()
454453

455454
img, err := qcow2reader.Open(f)
456455
if err != nil {
457456
return err
458457
}
459458

460459
diskName := args[0]
461-
// diskName := filepath.Base(fName)
462-
// diskName = strings.TrimSuffix(diskName, filepath.Ext(diskName))
463460
diskSize := img.Size()
464461
format := img.Type()
465462

@@ -470,7 +467,11 @@ func diskAddAction(cmd *cobra.Command, args []string) error {
470467
}
471468

472469
diskDir, err := store.DiskDir(diskName)
473-
if err := os.MkdirAll(diskDir, 0755); err != nil {
470+
if err != nil {
471+
return err
472+
}
473+
474+
if err := os.MkdirAll(diskDir, 0o755); err != nil {
474475
return err
475476
}
476477

cmd/limactl/edit.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,11 @@ func editAction(cmd *cobra.Command, args []string) error {
158158
return err
159159
}
160160

161-
// Apply config from .ymal to store.instance
162-
inst, err = store.Inspect(inst.Name)
161+
// Apply config from .ymal to store.instance
162+
inst, err = store.Inspect(inst.Name)
163+
if err != nil {
164+
return err
165+
}
163166

164167
if err := inst.ResizeGuestOSDisk(); err != nil {
165168
return err

pkg/store/instance.go

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ func Inspect(instName string) (*Instance, error) {
132132
}
133133
disk, err := units.RAMInBytes(*y.Disk)
134134
if err == nil {
135-
// logrus.Infof("Inst:%s changing size %d to %d \n", inst.Name, inst.Disk, disk)
136135
inst.Disk = disk
137136
}
138137
inst.AdditionalDisks = y.AdditionalDisks

0 commit comments

Comments
 (0)