From cd19f55edbc04eeb694b65120be9c08e5b64d09b Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Sat, 26 Jan 2019 10:52:33 +0800
Subject: [PATCH] Fix ineffassign issues reported by goreportcard

---
 cmd/control/engine.go                            |  9 ++-------
 cmd/control/install.go                           | 16 ++++++++--------
 .../cloudinit/datasource/vmware/vmware_test.go   |  4 ++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cmd/control/engine.go b/cmd/control/engine.go
index ce0d3329..b25367af 100644
--- a/cmd/control/engine.go
+++ b/cmd/control/engine.go
@@ -225,19 +225,14 @@ func dindEngineRemove(c *cli.Context) error {
 	}
 
 	// 3. service delete
-	changed := false
-
 	if _, ok := cfg.Rancher.ServicesInclude[name]; !ok {
 		log.Fatalf("Failed to found enabled service %s", name)
 	}
 
 	delete(cfg.Rancher.ServicesInclude, name)
-	changed = true
 
-	if changed {
-		if err = config.Set("rancher.services_include", cfg.Rancher.ServicesInclude); err != nil {
-			log.Fatal(err)
-		}
+	if err = config.Set("rancher.services_include", cfg.Rancher.ServicesInclude); err != nil {
+		log.Fatal(err)
 	}
 
 	// 4. remove service from file
diff --git a/cmd/control/install.go b/cmd/control/install.go
index 7a588959..eed6f555 100644
--- a/cmd/control/install.go
+++ b/cmd/control/install.go
@@ -472,7 +472,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 	case "generic":
 		log.Debugf("formatAndMount")
 		var err error
-		device, partition, err = formatAndMount(baseName, device, partition)
+		device, _, err = formatAndMount(baseName, device, partition)
 		if err != nil {
 			log.Errorf("formatAndMount %s", err)
 			return err
@@ -489,7 +489,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 		}
 	case "arm":
 		var err error
-		device, partition, err = formatAndMount(baseName, device, partition)
+		_, _, err = formatAndMount(baseName, device, partition)
 		if err != nil {
 			return err
 		}
@@ -499,7 +499,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 	case "amazon-ebs-hvm":
 		CONSOLE = "ttyS0"
 		var err error
-		device, partition, err = formatAndMount(baseName, device, partition)
+		device, _, err = formatAndMount(baseName, device, partition)
 		if err != nil {
 			return err
 		}
@@ -511,7 +511,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 	case "googlecompute":
 		CONSOLE = "ttyS0"
 		var err error
-		device, partition, err = formatAndMount(baseName, device, partition)
+		device, _, err = formatAndMount(baseName, device, partition)
 		if err != nil {
 			return err
 		}
@@ -519,7 +519,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 		seedData(baseName, cloudConfig, FILES)
 	case "noformat":
 		var err error
-		device, partition, err = install.MountDevice(baseName, device, partition, false)
+		device, _, err = install.MountDevice(baseName, device, partition, false)
 		if err != nil {
 			return err
 		}
@@ -534,7 +534,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 		}
 	case "raid":
 		var err error
-		device, partition, err = install.MountDevice(baseName, device, partition, false)
+		device, _, err = install.MountDevice(baseName, device, partition, false)
 		if err != nil {
 			return err
 		}
@@ -542,7 +542,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 	case "bootstrap":
 		CONSOLE = "ttyS0"
 		var err error
-		device, partition, err = install.MountDevice(baseName, device, partition, true)
+		_, _, err = install.MountDevice(baseName, device, partition, true)
 		if err != nil {
 			return err
 		}
@@ -552,7 +552,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 		fallthrough
 	case "upgrade":
 		var err error
-		device, partition, err = install.MountDevice(baseName, device, partition, false)
+		device, _, err = install.MountDevice(baseName, device, partition, false)
 		if err != nil {
 			return err
 		}
diff --git a/config/cloudinit/datasource/vmware/vmware_test.go b/config/cloudinit/datasource/vmware/vmware_test.go
index 0d03d4ee..2318921b 100644
--- a/config/cloudinit/datasource/vmware/vmware_test.go
+++ b/config/cloudinit/datasource/vmware/vmware_test.go
@@ -361,8 +361,8 @@ func TestOvfTransport(t *testing.T) {
 		}
 		v.urlDownload = fakeDownloader
 
-		metadata, err := v.FetchMetadata()
-		userdata, err := v.FetchUserdata()
+		metadata, _ := v.FetchMetadata()
+		userdata, _ := v.FetchUserdata()
 
 		if !reflect.DeepEqual(tt.metadata, metadata) {
 			t.Errorf("bad metadata (#%d): want %#v, got %#v", i, tt.metadata, metadata)