Merge pull request #91 from bearium/stdout_results

Added Namespace for Collection and Allows for tests to output to stdout

Author: laverya

cmd/collector/cli/run.go

@@ -32,8 +32,9 @@ func Run() *cobra.Command {
 			}
 
 			collector := collect.Collector{
-				Collect: c,
-				Redact:  v.GetBool("redact"),
+				Collect:   c,
+				Redact:    v.GetBool("redact"),
+				Namespace: v.GetString("namespace"),
 			}
 			b, err := collector.RunCollectorSync()
 			if err != nil {

cmd/preflight/cli/run_nocrd.go

@@ -124,8 +124,7 @@ func runPreflightsNoCRD(v *viper.Viper, arg string) error {
 		return showInteractiveResults(preflight.Name, analyzeResults)
 	}
 
-	logger.Printf("only interactive results are supported\n")
-	return nil
+	return showStdoutResults(preflight.Name, analyzeResults)
 }
 
 func runCollectors(v *viper.Viper, preflight troubleshootv1beta1.Preflight) (map[string][]byte, error) {
@@ -149,6 +148,7 @@ func runCollectors(v *viper.Viper, preflight troubleshootv1beta1.Preflight) (map
 			Redact:       true,
 			Collect:      desiredCollector,
 			ClientConfig: config,
+			Namespace:    v.GetString("namespace"),
 		}
 
 		result, err := collector.RunCollectorSync()

cmd/preflight/cli/stdout_results.go

@@ -0,0 +1,44 @@
+package cli
+
+import (
+	"fmt"
+
+	analyzerunner "github.com/replicatedhq/troubleshoot/pkg/analyze"
+)
+
+func showStdoutResults(preflightName string, analyzeResults []*analyzerunner.AnalyzeResult) error {
+	fmt.Printf("\n=== TEST   %s\n", preflightName)
+	for _, analyzeResult := range analyzeResults {
+		fmt.Printf("=== RUN:   %s\n", analyzeResult.Title)
+	}
+	var failed bool
+	for _, analyzeResult := range analyzeResults {
+		testResultfailed := outputResult(analyzeResult)
+		if testResultfailed {
+			failed = true
+		}
+	}
+	if failed {
+		fmt.Printf("--- FAIL   %s\n", preflightName)
+		fmt.Println("FAILED")
+	} else {
+		fmt.Printf("--- PASS   %s\n", preflightName)
+		fmt.Println("PASS")
+	}
+	return nil
+}
+
+func outputResult(analyzeResult *analyzerunner.AnalyzeResult) bool {
+	if analyzeResult.IsPass {
+		fmt.Printf("   --- PASS %s\n", analyzeResult.Title)
+		fmt.Printf("      --- %s\n", analyzeResult.Message)
+	} else if analyzeResult.IsWarn {
+		fmt.Printf("   --- WARN: %s\n", analyzeResult.Title)
+		fmt.Printf("      --- %s\n", analyzeResult.Message)
+	} else if analyzeResult.IsFail {
+		fmt.Printf("   --- FAIL: %s\n", analyzeResult.Title)
+		fmt.Printf("      --- %s\n", analyzeResult.Message)
+		return true
+	}
+	return false
+}

cmd/troubleshoot/cli/run_nocrd.go

@@ -168,6 +168,7 @@ func runCollectors(v *viper.Viper, collector troubleshootv1beta1.Collector, prog
 			Redact:       true,
 			Collect:      desiredCollector,
 			ClientConfig: config,
+			Namespace:    v.GetString("namespace"),
 		}
 
 		progressChan <- collector.GetDisplayName()

go.mod

@@ -4,21 +4,46 @@ go 1.12
 
 require (
 	github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412
+	github.com/aws/aws-sdk-go v1.22.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
+	github.com/dsnet/compress v0.0.1 // indirect
+	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
+	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
+	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/fatih/color v1.7.0
+	github.com/frankban/quicktest v1.7.2 // indirect
 	github.com/gin-gonic/gin v1.4.0
 	github.com/gizak/termui/v3 v3.1.0
+	github.com/go-openapi/spec v0.19.2 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/google/gofuzz v1.0.0 // indirect
+	github.com/googleapis/gnostic v0.3.0 // indirect
 	github.com/hashicorp/go-getter v1.3.1-0.20190627223108-da0323b9545e
 	github.com/hashicorp/go-multierror v1.0.0
+	github.com/imdario/mergo v0.3.7 // indirect
+	github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mholt/archiver v3.1.1+incompatible
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/nwaples/rardecode v1.0.0 // indirect
+	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pierrec/lz4 v2.2.6+incompatible // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/replicatedhq/kots v0.2.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.3.0
 	github.com/tj/go-spin v1.1.0
+	github.com/ugorji/go v1.1.7 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	go.opencensus.io v0.20.2 // indirect
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
+	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
+	golang.org/x/sys v0.0.0-20190621203818-d432491b9138 // indirect
+	google.golang.org/appengine v1.5.0 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
@@ -29,4 +54,5 @@ require (
 	k8s.io/kube-openapi v0.0.0-20190815110238-8ff09bc626d6 // indirect
 	k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a // indirect
 	sigs.k8s.io/controller-runtime v0.2.0-beta.2
+	sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
 )