Merge pull request #75 from replicatedhq/analyze-spec

marccampbell · web-flow · commit 218b9c006d7d · 2019-10-29T14:10:05.000-07:00
Fix
diff --git a/ffi/main.go b/ffi/main.go
@@ -4,7 +4,6 @@ import "C"
 
 import (
 	"fmt"
-	"context"
 	"encoding/json"
 	
 	"gopkg.in/yaml.v2"
diff --git a/pkg/analyze/download.go b/pkg/analyze/download.go
@@ -20,7 +20,7 @@ type fileContentProvider struct {
 	rootDir string
 }
 
-func DownloadAndAnalyze(analyzersSpec string, bundleURL string) ([]*AnalyzeResult, error) {
+func DownloadAndAnalyze(bundleURL string, analyzersSpec string) ([]*AnalyzeResult, error) {
 	tmpDir, err := ioutil.TempDir("", "troubleshoot-k8s")
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create temp dir")

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type fileContentProvider struct {`
`20`	`20`	`rootDir string`
`21`	`21`	`}`
`22`	`22`
`23`		`-func DownloadAndAnalyze(analyzersSpec string, bundleURL string) ([]*AnalyzeResult, error) {`
	`23`	`+func DownloadAndAnalyze(bundleURL string, analyzersSpec string) ([]*AnalyzeResult, error) {`
`24`	`24`	`tmpDir, err := ioutil.TempDir("", "troubleshoot-k8s")`
`25`	`25`	`if err != nil {`
`26`	`26`	`return nil, errors.Wrap(err, "failed to create temp dir")`