rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-25 14:31:33 +00:00
Code Issues Releases Wiki Activity

Fix ineffassign issues reported by goreportcard

Browse Source
This commit is contained in:
niusmallnan 2019-01-26 10:52:33 +08:00
parent f90ddbc76d
commit cd19f55edb
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/control/engine.go
View File

@ -225,20 +225,15 @@ func dindEngineRemove(c *cli.Context) error {
} }
// 3. service delete // 3. service delete
changed := false
if _, ok := cfg.Rancher.ServicesInclude[name]; !ok { if _, ok := cfg.Rancher.ServicesInclude[name]; !ok {
log.Fatalf("Failed to found enabled service %s", name) log.Fatalf("Failed to found enabled service %s", name)
} }
delete(cfg.Rancher.ServicesInclude, name) delete(cfg.Rancher.ServicesInclude, name)
changed = true
if changed {
if err = config.Set("rancher.services_include", cfg.Rancher.ServicesInclude); err != nil { if err = config.Set("rancher.services_include", cfg.Rancher.ServicesInclude); err != nil {
log.Fatal(err) log.Fatal(err)
} }
}
// 4. remove service from file // 4. remove service from file
err = RemoveEngineFromCompose(name) err = RemoveEngineFromCompose(name)

16
cmd/control/install.go
View File

@ -472,7 +472,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
case "generic": case "generic":
log.Debugf("formatAndMount") log.Debugf("formatAndMount")
var err error var err error
device, partition, err = formatAndMount(baseName, device, partition) device, _, err = formatAndMount(baseName, device, partition)
if err != nil { if err != nil {
log.Errorf("formatAndMount %s", err) log.Errorf("formatAndMount %s", err)
return err return err
@ -489,7 +489,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
} }
case "arm": case "arm":
var err error var err error
device, partition, err = formatAndMount(baseName, device, partition) _, _, err = formatAndMount(baseName, device, partition)
if err != nil { if err != nil {
return err return err
} }
@ -499,7 +499,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
case "amazon-ebs-hvm": case "amazon-ebs-hvm":
CONSOLE = "ttyS0" CONSOLE = "ttyS0"
var err error var err error
device, partition, err = formatAndMount(baseName, device, partition) device, _, err = formatAndMount(baseName, device, partition)
if err != nil { if err != nil {
return err return err
} }
@ -511,7 +511,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
case "googlecompute": case "googlecompute":
CONSOLE = "ttyS0" CONSOLE = "ttyS0"
var err error var err error
device, partition, err = formatAndMount(baseName, device, partition) device, _, err = formatAndMount(baseName, device, partition)
if err != nil { if err != nil {
return err return err
} }
@ -519,7 +519,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
seedData(baseName, cloudConfig, FILES) seedData(baseName, cloudConfig, FILES)
case "noformat": case "noformat":
var err error var err error
device, partition, err = install.MountDevice(baseName, device, partition, false) device, _, err = install.MountDevice(baseName, device, partition, false)
if err != nil { if err != nil {
return err return err
} }
@ -534,7 +534,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
} }
case "raid": case "raid":
var err error var err error
device, partition, err = install.MountDevice(baseName, device, partition, false) device, _, err = install.MountDevice(baseName, device, partition, false)
if err != nil { if err != nil {
return err return err
} }
@ -542,7 +542,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
case "bootstrap": case "bootstrap":
CONSOLE = "ttyS0" CONSOLE = "ttyS0"
var err error var err error
device, partition, err = install.MountDevice(baseName, device, partition, true) _, _, err = install.MountDevice(baseName, device, partition, true)
if err != nil { if err != nil {
return err return err
} }
@ -552,7 +552,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
fallthrough fallthrough
case "upgrade": case "upgrade":
var err error var err error
device, partition, err = install.MountDevice(baseName, device, partition, false) device, _, err = install.MountDevice(baseName, device, partition, false)
if err != nil { if err != nil {
return err return err
} }

4
config/cloudinit/datasource/vmware/vmware_test.go
View File

@ -361,8 +361,8 @@ func TestOvfTransport(t *testing.T) {
} }
v.urlDownload = fakeDownloader v.urlDownload = fakeDownloader
metadata, err := v.FetchMetadata() metadata, _ := v.FetchMetadata()
userdata, err := v.FetchUserdata() userdata, _ := v.FetchUserdata()
if !reflect.DeepEqual(tt.metadata, metadata) { if !reflect.DeepEqual(tt.metadata, metadata) {
t.Errorf("bad metadata (#%d): want %#v, got %#v", i, tt.metadata, metadata) t.Errorf("bad metadata (#%d): want %#v, got %#v", i, tt.metadata, metadata)