Merge pull request #172 from replicatedhq/laverya/refactor-byte-array-interfaces

refactor byte array interfaces

Author: laverya

cmd/troubleshoot/cli/run.go

@@ -2,8 +2,6 @@ package cli
 
 import (
 	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -262,7 +260,7 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, prog
 		}
 
 		if result != nil {
-			err = parseAndSaveCollectorOutput(string(result), bundlePath)
+			err = saveCollectorOutput(result, bundlePath)
 			if err != nil {
 				progressChan <- fmt.Errorf("failed to parse collector spec %q: %v", collector.GetDisplayName(), err)
 				continue
@@ -282,46 +280,17 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, prog
 	return filename, nil
 }
 
-func parseAndSaveCollectorOutput(output string, bundlePath string) error {
-	input := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(output), &input); err != nil {
-		return errors.Wrap(err, "unmarshal output")
-	}
-
-	for filename, maybeContents := range input {
+func saveCollectorOutput(output map[string][]byte, bundlePath string) error {
+	for filename, maybeContents := range output {
 		fileDir, fileName := filepath.Split(filename)
 		outPath := filepath.Join(bundlePath, fileDir)
 
 		if err := os.MkdirAll(outPath, 0777); err != nil {
 			return errors.Wrap(err, "create output file")
 		}
 
-		switch maybeContents.(type) {
-		case string:
-			decoded, err := base64.StdEncoding.DecodeString(maybeContents.(string))
-			if err != nil {
-				return errors.Wrap(err, "decode collector output")
-			}
-
-			if err := writeFile(filepath.Join(outPath, fileName), decoded); err != nil {
-				return errors.Wrap(err, "write collector output")
-			}
-
-		case map[string]interface{}:
-			for k, v := range maybeContents.(map[string]interface{}) {
-				s, _ := filepath.Split(filepath.Join(outPath, fileName, k))
-				if err := os.MkdirAll(s, 0777); err != nil {
-					return errors.Wrap(err, "write output directories")
-				}
-
-				decoded, err := base64.StdEncoding.DecodeString(v.(string))
-				if err != nil {
-					return errors.Wrap(err, "decode output")
-				}
-				if err := writeFile(filepath.Join(outPath, fileName, k), decoded); err != nil {
-					return errors.Wrap(err, "write output")
-				}
-			}
+		if err := writeFile(filepath.Join(outPath, fileName), maybeContents); err != nil {
+			return errors.Wrap(err, "write collector output")
 		}
 	}
 

pkg/collect/cluster_info.go

@@ -18,28 +18,23 @@ type ClusterInfoOutput struct {
 	Errors         []byte `json:"cluster-info/errors.json,omitempty"`
 }
 
-func ClusterInfo(ctx *Context) ([]byte, error) {
+func ClusterInfo(ctx *Context) (map[string][]byte, error) {
 	client, err := kubernetes.NewForConfig(ctx.ClientConfig)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create kubernetes clientset")
 	}
 
-	clusterInfoOutput := ClusterInfoOutput{}
+	clusterInfoOutput := map[string][]byte{}
 
 	// cluster version
 	clusterVersion, clusterErrors := clusterVersion(client)
-	clusterInfoOutput.ClusterVersion = clusterVersion
-	clusterInfoOutput.Errors, err = marshalNonNil(clusterErrors)
+	clusterInfoOutput["cluster-info/cluster_version.json"] = clusterVersion
+	clusterInfoOutput["cluster-info/errors.json"], err = marshalNonNil(clusterErrors)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to marshal errors")
 	}
 
-	b, err := json.MarshalIndent(clusterInfoOutput, "", "  ")
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal cluster info")
-	}
-
-	return b, nil
+	return clusterInfoOutput, nil
 }
 
 func clusterVersion(client *kubernetes.Clientset) ([]byte, []string) {