Merge pull request #1685 from endocode/dongsu/fix-shadow-error-vars

registry,fleetctl: fix bugs regarding shadowed error variables

Author: Dongsu Park

fleetctl/fleetctl.go

@@ -833,18 +833,19 @@ func lazyCreateUnits(cCmd *cobra.Command, args []string) error {
 // Returns true if the contents of the file matches the unit one, false
 // otherwise; and any error encountered.
 func matchLocalFileAndUnit(file string, su *schema.Unit) (bool, error) {
-	result := false
 	a := schema.MapSchemaUnitOptionsToUnitFile(su.Options)
 
 	_, err := os.Stat(file)
-	if err == nil {
-		b, err := getUnitFromFile(file)
-		if err == nil {
-			result = unit.MatchUnitFiles(a, b)
-		}
+	if err != nil {
+		return false, err
+	}
+
+	b, err := getUnitFromFile(file)
+	if err != nil {
+		return false, err
 	}
 
-	return result, err
+	return unit.MatchUnitFiles(a, b), nil
 }
 
 // isLocalUnitDifferent compares a Unit on the file system with a one

registry/job.go

@@ -312,7 +312,7 @@ func (r *EtcdRegistry) DestroyUnit(name string) error {
 }
 
 // CreateUnit attempts to store a Unit and its associated unit file in the registry
-func (r *EtcdRegistry) CreateUnit(u *job.Unit) (err error) {
+func (r *EtcdRegistry) CreateUnit(u *job.Unit) error {
 	if err := r.storeOrGetUnitFile(u.Unit); err != nil {
 		return err
 	}
@@ -323,7 +323,7 @@ func (r *EtcdRegistry) CreateUnit(u *job.Unit) (err error) {
 	}
 	val, err := marshal(jm)
 	if err != nil {
-		return
+		return err
 	}
 
 	opts := &etcd.SetOptions{
@@ -335,7 +335,7 @@ func (r *EtcdRegistry) CreateUnit(u *job.Unit) (err error) {
 	key := r.prefixed(jobPrefix, u.Name, "object")
 	_, err = r.kAPI.Set(context.Background(), key, val, opts)
 	if err != nil {
-		return
+		return err
 	}
 
 	return r.SetUnitTargetState(u.Name, u.TargetState)