Merge pull request #620 from erikh/golint

mgmtfn,netmaster: fix golint warnings about string errors

Author: Erik Hollensbe

mgmtfn/k8splugin/contivk8s/clients/network.go

@@ -19,11 +19,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/contiv/netplugin/mgmtfn/k8splugin/cniapi"
 	"io/ioutil"
 	"net"
 	"net/http"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/contiv/netplugin/mgmtfn/k8splugin/cniapi"
 )
 
 const (
@@ -71,10 +72,10 @@ func (c *NWClient) AddPod(podInfo interface{}) (*cniapi.RspAddPod, error) {
 
 	switch {
 	case r.StatusCode == int(404):
-		return nil, fmt.Errorf("Page not found!")
+		return nil, fmt.Errorf("page not found")
 
 	case r.StatusCode == int(403):
-		return nil, fmt.Errorf("Access denied!")
+		return nil, fmt.Errorf("access denied")
 
 	case r.StatusCode == int(500):
 		info, err := ioutil.ReadAll(r.Body)
@@ -123,9 +124,9 @@ func (c *NWClient) DelPod(podInfo interface{}) error {
 
 	switch {
 	case r.StatusCode == int(404):
-		return fmt.Errorf("Page not found!")
+		return fmt.Errorf("page not found")
 	case r.StatusCode == int(403):
-		return fmt.Errorf("Access denied!")
+		return fmt.Errorf("access denied")
 	case r.StatusCode != int(200):
 		log.Errorf("GET Status '%s' status code %d \n", r.Status, r.StatusCode)
 		return fmt.Errorf("%s", r.Status)

mgmtfn/k8splugin/kubeClient.go

@@ -21,13 +21,14 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"sync"
+
 	log "github.com/Sirupsen/logrus"
 	"github.com/contiv/netplugin/core"
 	"golang.org/x/net/context"
 	"golang.org/x/net/context/ctxhttp"
-	"io/ioutil"
-	"net/http"
-	"sync"
 )
 
 const (
@@ -141,9 +142,9 @@ func (c *APIClient) fetchPodLabels(ns, name string) error {
 	defer r.Body.Close()
 	switch {
 	case r.StatusCode == int(404):
-		return fmt.Errorf("Page not found!")
+		return fmt.Errorf("page not found")
 	case r.StatusCode == int(403):
-		return fmt.Errorf("Access denied!")
+		return fmt.Errorf("access denied")
 	case r.StatusCode != int(200):
 		log.Errorf("GET Status '%s' status code %d \n", r.Status, r.StatusCode)
 		return fmt.Errorf("%s", r.Status)

netmaster/master/bgp.go

@@ -17,6 +17,7 @@ package master
 
 import (
 	"errors"
+
 	log "github.com/Sirupsen/logrus"
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/netmaster/intent"
@@ -30,7 +31,7 @@ func AddBgp(stateDriver core.StateDriver, bgpCfg *intent.ConfigBgp) error {
 	aci, _ := IsAciConfigured()
 	if aci {
 		log.Errorf("Invalid configuration. Not supported in ACI fabric mode.")
-		return errors.New("Not supported in ACI fabric mode.")
+		return errors.New("not supported in ACI fabric mode")
 	}
 	bgpState := &mastercfg.CfgBgpState{}
 	bgpState.Hostname = bgpCfg.Hostname

netmaster/objApi/apiController.go

@@ -1865,9 +1865,9 @@ func (ac *APIController) BgpGetOper(bgp *contivModel.BgpInspect) error {
 
 	switch {
 	case r.StatusCode == int(404):
-		return errors.New("Page not found!")
+		return errors.New("page not found")
 	case r.StatusCode == int(403):
-		return errors.New("Access denied!")
+		return errors.New("access denied")
 	case r.StatusCode == int(500):
 		response, err := ioutil.ReadAll(r.Body)
 		if err != nil {

netmaster/objApi/infraproxy.go

@@ -93,9 +93,9 @@ func httpPost(url string, jdata interface{}) (*gwResp, error) {
 
 	switch {
 	case r.StatusCode == int(404):
-		return nil, errors.New("Page not found!")
+		return nil, errors.New("page not found")
 	case r.StatusCode == int(403):
-		return nil, errors.New("Access denied!")
+		return nil, errors.New("access denied")
 	case r.StatusCode != int(200):
 		log.Debugf("POST Status '%s' status code %d \n", r.Status, r.StatusCode)
 		return nil, errors.New(r.Status)