Merge pull request #17 from redhat-nfvpe/dev/add_check_go

Add 'go fmt', golint and 'go vet' in CI
This commit is contained in:
Doug Smith
2018-04-03 08:06:35 -04:00
committed by GitHub
2 changed files with 15 additions and 15 deletions

View File

@@ -7,13 +7,14 @@ dist: trusty
before_install:
- sudo apt-get update -qq
#install:
# - go get .
# - go get github.com/golang/lint/golint
install:
- go get github.com/golang/lint/golint
#before_script:
# - go vet .
# - golint . | xargs -r false
before_script:
- golint ./multus/... | grep -v ALL_CAPS | xargs -r false
- go fmt ./multus/...
- go vet ./multus/...
# - gocyclo -over 15 ./multus
script:
- ./build

View File

@@ -43,6 +43,7 @@ const defaultCNIDir = "/var/lib/cni/multus"
var masterpluginEnabled bool
var defaultcninetwork bool
// NetConf for cni config file written in json
type NetConf struct {
types.NetConf
CNIDir string `json:"cniDir"`
@@ -50,10 +51,6 @@ type NetConf struct {
Kubeconfig string `json:"kubeconfig"`
}
type PodNet struct {
Networkname string `json:"name"`
}
type netplugin struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"`
@@ -439,7 +436,9 @@ func getMultusDelegates(delegate string) ([]map[string]interface{}, error) {
return tmpNetconf.Delegates, nil
}
// NoK8sNetworkError indicates error, no network in kubernetes
type NoK8sNetworkError string
func (e NoK8sNetworkError) Error() string { return string(e) }
func getK8sNetwork(args *skel.CmdArgs, kubeconfig string) ([]map[string]interface{}, error) {