Merge pull request #4 from bmcstdio/allow-vendoring

Allow for vendoring the kubesec.io client.

Author: stefanprodan

main.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	_ "github.com/golang/glog"
+	"github.com/stefanprodan/kubectl-kubesec/pkg/kubesec"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kjson "k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/kubernetes"
@@ -119,13 +120,17 @@ func main() {
 
 	writer.Flush()
 
-	result, err := getResult(buffer)
+	result, err := kubesec.NewClient().ScanDefinition(buffer)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+	if result.Error != "" {
+		fmt.Println(result.Error)
+		os.Exit(1)
+	}
 
-	result.print(resource)
+	result.Dump(os.Stdout)
 }
 
 func loadConfig() (*kubernetes.Clientset, string) {

kubesec.go pkg/kubesec/kubesec.gokubesec.go renamed to pkg/kubesec/kubesec.go

@@ -1,4 +1,4 @@
-package main
+package kubesec
 
 import (
 	"bytes"
@@ -11,79 +11,42 @@ import (
 	"net/http"
 )
 
-type KubesecResult struct {
-	Score   int `json:"score"`
-	Scoring struct {
-		Critical []struct {
-			Selector string `json:"selector"`
-			Reason   string `json:"reason"`
-			Weight   int    `json:"weight"`
-		} `json:"critical"`
-		Advise []struct {
-			Selector string `json:"selector"`
-			Reason   string `json:"reason"`
-			Href     string `json:"href,omitempty"`
-		} `json:"advise"`
-	} `json:"scoring"`
+// KubesecClient represent a client for kubesec.io.
+type KubesecClient struct {
 }
 
-func (r *KubesecResult) print(resource string) {
-	fmt.Println(fmt.Sprintf("%v kubesec.io score %v", resource, r.Score))
-	fmt.Println("-----------------")
-	if len(r.Scoring.Critical) > 0 {
-		fmt.Println("Critical")
-		for i, el := range r.Scoring.Critical {
-			fmt.Println(fmt.Sprintf("%v. %v", i+1, el.Selector))
-			if len(el.Reason) > 0 {
-				fmt.Println(el.Reason)
-			}
-
-		}
-		fmt.Println("-----------------")
-	}
-	if len(r.Scoring.Advise) > 0 {
-		fmt.Println("Advise")
-		for i, el := range r.Scoring.Advise {
-			fmt.Println(fmt.Sprintf("%v. %v", i+1, el.Selector))
-			if len(el.Reason) > 0 {
-				fmt.Println(el.Reason)
-			}
-		}
-	}
+// NewClient returns a new client for kubesec.io.
+func NewClient() *KubesecClient {
+	return &KubesecClient{}
 }
 
-func getResult(definition bytes.Buffer) (*KubesecResult, error) {
-
+// ScanDefinition scans the provided resource definition.
+func (kc *KubesecClient) ScanDefinition(def bytes.Buffer) (*KubesecResult, error) {
 	bodyBuf := &bytes.Buffer{}
 	bodyWriter := multipart.NewWriter(bodyBuf)
-
 	fileWriter, err := bodyWriter.CreateFormFile("uploadfile", "object.yaml")
 	if err != nil {
 		return nil, err
 	}
-
-	_, err = io.Copy(fileWriter, &definition)
+	_, err = io.Copy(fileWriter, &def)
 	if err != nil {
 		return nil, err
 	}
-
 	contentType := bodyWriter.FormDataContentType()
 	bodyWriter.Close()
 
 	resp, err := http.Post("https://kubesec.io/", contentType, bodyBuf)
 	if err != nil {
 		return nil, err
 	}
-
 	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
-
 	if len(body) < 1 {
-		return nil, errors.New("unknown result")
+		return nil, errors.New("failed to scan definition")
 	}
 
 	var result KubesecResult
@@ -94,3 +57,47 @@ func getResult(definition bytes.Buffer) (*KubesecResult, error) {
 
 	return &result, nil
 }
+
+// KubesecResult represents a result returned by kubesec.io.
+type KubesecResult struct {
+	Error   string `json:"error"`
+	Score   int    `json:"score"`
+	Scoring struct {
+		Critical []struct {
+			Selector string `json:"selector"`
+			Reason   string `json:"reason"`
+			Weight   int    `json:"weight"`
+		} `json:"critical"`
+		Advise []struct {
+			Selector string `json:"selector"`
+			Reason   string `json:"reason"`
+			Href     string `json:"href,omitempty"`
+		} `json:"advise"`
+	} `json:"scoring"`
+}
+
+// Dump writes the result in a human-readable format to the specified writer.
+func (r *KubesecResult) Dump(w io.Writer) {
+	io.WriteString(w, fmt.Sprintf("kubesec.io score: %v", r.Score))
+	io.WriteString(w, "-----------------")
+	if len(r.Scoring.Critical) > 0 {
+		io.WriteString(w, "Critical")
+		for i, el := range r.Scoring.Critical {
+			io.WriteString(w, fmt.Sprintf("%v. %v", i+1, el.Selector))
+			if len(el.Reason) > 0 {
+				io.WriteString(w, el.Reason)
+			}
+
+		}
+		io.WriteString(w, "-----------------")
+	}
+	if len(r.Scoring.Advise) > 0 {
+		io.WriteString(w, "Advise")
+		for i, el := range r.Scoring.Advise {
+			io.WriteString(w, fmt.Sprintf("%v. %v", i+1, el.Selector))
+			if len(el.Reason) > 0 {
+				io.WriteString(w, el.Reason)
+			}
+		}
+	}
+}