fix lint errors from updated go lint (#692)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

examples/instance/docker/instance.go

@@ -347,10 +347,7 @@ func (p dockerInstancePlugin) Destroy(id instance.ID, dc instance.Context) error
 	cli := p.client
 	ctx := context.Background()
 	log.Debugf("Destroying container ID %s", string(id))
-	if err := cli.ContainerRemove(ctx, string(id), options); err != nil {
-		return err
-	}
-	return nil
+	return cli.ContainerRemove(ctx, string(id), options)
 }
 
 func describeGroupRequest(namespaceTags, tags map[string]string) *apitypes.ContainerListOptions {

examples/instance/vagrant/instance.go

@@ -206,11 +206,7 @@ func (v vagrantPlugin) Destroy(id instance.ID, context instance.Context) error {
 		fmt.Println("Vagrant destroy failed: ", err)
 	}
 
-	if err := os.RemoveAll(machineDir); err != nil {
-		return err
-	}
-
-	return nil
+	return os.RemoveAll(machineDir)
 }
 
 // DescribeInstances returns descriptions of all instances matching all of the provided tags.

pkg/fsm/set.go

@@ -454,10 +454,7 @@ func (s *Set) handleEvent(tid int64, event *event) error {
 	s.bystate[next][instance.id] = instance
 
 	// visits limit trigger
-	if err := s.processVisitLimit(tid, instance, next); err != nil {
-		return err
-	}
-	return nil
+	return s.processVisitLimit(tid, instance, next)
 }
 
 func (s *Set) tid() int64 {

pkg/plugin/flavor/kubernetes/flavor.go

@@ -115,10 +115,7 @@ func (s *baseFlavor) Validate(flavorProperties *types.Any, allocation group_type
 		}
 	}
 
-	if err := validateIDsAndAttachments(allocation.LogicalIDs, spec.Attachments); err != nil {
-		return err
-	}
-	return nil
+	return validateIDsAndAttachments(allocation.LogicalIDs, spec.Attachments)
 }
 
 // Healthy determines whether an instance is healthy.

pkg/plugin/flavor/swarm/flavor.go

@@ -159,11 +159,7 @@ func (s *baseFlavor) Validate(flavorProperties *types.Any, allocation group_type
 		}
 	}
 
-	if err := validateIDsAndAttachments(allocation.LogicalIDs, spec.Attachments); err != nil {
-		return err
-	}
-
-	return nil
+	return validateIDsAndAttachments(allocation.LogicalIDs, spec.Attachments)
 }
 
 // Healthy determines whether an instance is healthy.  This is determined by whether it has successfully joined the

pkg/plugin/instance/packet/plugin.go

@@ -60,11 +60,7 @@ func (p *plugin) VendorInfo() *spi.VendorInfo {
 // Validate performs local validation on a provision request.
 func (p *plugin) Validate(req *types.Any) error {
 	properties := &Properties{}
-	if err := req.Decode(&properties); err != nil {
-		return err
-	}
-
-	return nil
+	return req.Decode(&properties)
 }
 
 // Label labels the instance

pkg/x/remoteboot/remoteboot.go

@@ -310,10 +310,7 @@ func (c *BootController) serveHTTP() error {
 
 	httpHandler := http.FileServer(http.Dir(docroot))
 
-	if err = http.ListenAndServe(":80", httpHandler); err != nil {
-		return err
-	}
-	return nil
+	return http.ListenAndServe(":80", httpHandler)
 }
 
 //////////////////////////////