Merge pull request #161 from replicatedhq/laverya/check-filepath-before-attempting-url

attempt to read the file at the provided path before trying url

Author: laverya

cmd/analyze/cli/run.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"net/url"
 	"os"
 
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/troubleshoot/cmd/util"
 	analyzer "github.com/replicatedhq/troubleshoot/pkg/analyze"
 	"github.com/spf13/viper"
 )
@@ -16,18 +16,19 @@ func runAnalyzers(v *viper.Viper, bundlePath string) error {
 	specPath := v.GetString("analyzers")
 
 	specContent := ""
-	if !isURL(specPath) {
-		if _, err := os.Stat(specPath); os.IsNotExist(err) {
-			return fmt.Errorf("%s was not found", specPath)
-		}
-
+	var err error
+	if _, err = os.Stat(specPath); err == nil {
 		b, err := ioutil.ReadFile(specPath)
 		if err != nil {
 			return err
 		}
 
 		specContent = string(b)
 	} else {
+		if !util.IsURL(specPath) {
+			return fmt.Errorf("%s is not a URL and was not found (err %s)", specPath, err)
+		}
+
 		req, err := http.NewRequest("GET", specPath, nil)
 		if err != nil {
 			return err
@@ -64,12 +65,3 @@ func runAnalyzers(v *viper.Viper, bundlePath string) error {
 
 	return nil
 }
-
-func isURL(str string) bool {
-	parsed, err := url.ParseRequestURI(str)
-	if err != nil {
-		return false
-	}
-
-	return parsed.Scheme != ""
-}

cmd/preflight/cli/interactive_results.go

@@ -11,6 +11,7 @@ import (
 	ui "github.com/gizak/termui/v3"
 	"github.com/gizak/termui/v3/widgets"
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/troubleshoot/cmd/util"
 	analyzerunner "github.com/replicatedhq/troubleshoot/pkg/analyze"
 )
 
@@ -214,7 +215,7 @@ func estimateNumberOfLines(text string, width int) int {
 }
 
 func save(preflightName string, analyzeResults []*analyzerunner.AnalyzeResult) (string, error) {
-	filename := path.Join(homeDir(), fmt.Sprintf("%s-results.txt", preflightName))
+	filename := path.Join(util.HomeDir(), fmt.Sprintf("%s-results.txt", preflightName))
 	_, err := os.Stat(filename)
 	if err == nil {
 		os.Remove(filename)

cmd/preflight/cli/run.go

@@ -10,6 +10,7 @@ import (
 	cursor "github.com/ahmetalpbalkan/go-cursor"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/troubleshoot/cmd/util"
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 	troubleshootclientsetscheme "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/scheme"
 	"github.com/replicatedhq/troubleshoot/pkg/preflight"
@@ -23,18 +24,19 @@ func runPreflights(v *viper.Viper, arg string) error {
 	defer fmt.Print(cursor.Show())
 
 	preflightContent := ""
-	if !isURL(arg) {
-		if _, err := os.Stat(arg); os.IsNotExist(err) {
-			return fmt.Errorf("%s was not found", arg)
-		}
-
+	var err error
+	if _, err = os.Stat(arg); err == nil {
 		b, err := ioutil.ReadFile(arg)
 		if err != nil {
 			return err
 		}
 
 		preflightContent = string(b)
 	} else {
+		if !util.IsURL(arg) {
+			return fmt.Errorf("%s is not a URL and was not found (err %s)", arg, err)
+		}
+
 		req, err := http.NewRequest("GET", arg, nil)
 		if err != nil {
 			return err

cmd/preflight/cli/util.go

@@ -1,30 +1,11 @@
 package cli
 
 import (
-	"net/url"
-	"os"
-
 	"github.com/pkg/errors"
 	troubleshootclientv1beta1 "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
 
-func homeDir() string {
-	if h := os.Getenv("HOME"); h != "" {
-		return h
-	}
-	return os.Getenv("USERPROFILE") // windows
-}
-
-func isURL(str string) bool {
-	parsed, err := url.ParseRequestURI(str)
-	if err != nil {
-		return false
-	}
-
-	return parsed.Scheme != ""
-}
-
 func createTroubleshootK8sClient(configFlags *genericclioptions.ConfigFlags) (*troubleshootclientv1beta1.TroubleshootV1beta1Client, error) {
 	config, err := configFlags.ToRESTConfig()
 	if err != nil {

cmd/troubleshoot/cli/analyze.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/replicatedhq/troubleshoot/cmd/util"
 	analyzer "github.com/replicatedhq/troubleshoot/pkg/analyze"
 	"github.com/replicatedhq/troubleshoot/pkg/convert"
 	"github.com/replicatedhq/troubleshoot/pkg/logger"
@@ -83,7 +84,8 @@ func Analyze() *cobra.Command {
 
 func downloadAnalyzerSpec(specPath string) (string, error) {
 	specContent := ""
-	if !isURL(specPath) {
+	var err error
+	if _, err = os.Stat(specPath); err == nil {
 		if _, err := os.Stat(specPath); os.IsNotExist(err) {
 			return "", fmt.Errorf("%s was not found", specPath)
 		}
@@ -95,6 +97,10 @@ func downloadAnalyzerSpec(specPath string) (string, error) {
 
 		specContent = string(b)
 	} else {
+		if !util.IsURL(specPath) {
+			return "", fmt.Errorf("%s is not a URL and was not found (err %s)", specPath, err)
+		}
+
 		req, err := http.NewRequest("GET", specPath, nil)
 		if err != nil {
 			return "", err

cmd/troubleshoot/cli/run.go

@@ -19,6 +19,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/mholt/archiver"
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/troubleshoot/cmd/util"
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 	"github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/scheme"
 	troubleshootclientsetscheme "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/scheme"
@@ -137,17 +138,16 @@ the %s Admin Console to begin analysis.`
 }
 
 func loadSpec(v *viper.Viper, arg string) ([]byte, error) {
-	if !isURL(arg) {
-		if _, err := os.Stat(arg); os.IsNotExist(err) {
-			return nil, fmt.Errorf("%s was not found", arg)
-		}
-
+	var err error
+	if _, err = os.Stat(arg); err == nil {
 		b, err := ioutil.ReadFile(arg)
 		if err != nil {
 			return nil, errors.Wrap(err, "read spec file")
 		}
 
 		return b, nil
+	} else if !util.IsURL(arg) {
+		return nil, fmt.Errorf("%s is not a URL and was not found (err %s)", arg, err)
 	}
 
 	for {

cmd/troubleshoot/cli/util.go

@@ -2,30 +2,13 @@ package cli
 
 import (
 	"fmt"
-	"net/url"
 	"os"
 
 	"github.com/pkg/errors"
 	troubleshootclientv1beta1 "github.com/replicatedhq/troubleshoot/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )
 
-func homeDir() string {
-	if h := os.Getenv("HOME"); h != "" {
-		return h
-	}
-	return os.Getenv("USERPROFILE") // windows
-}
-
-func isURL(str string) bool {
-	parsed, err := url.ParseRequestURI(str)
-	if err != nil {
-		return false
-	}
-
-	return parsed.Scheme != ""
-}
-
 func createTroubleshootK8sClient(configFlags *genericclioptions.ConfigFlags) (*troubleshootclientv1beta1.TroubleshootV1beta1Client, error) {
 	config, err := configFlags.ToRESTConfig()
 	if err != nil {

cmd/util/util.go

@@ -0,0 +1,22 @@
+package util
+
+import (
+	"net/url"
+	"os"
+)
+
+func HomeDir() string {
+	if h := os.Getenv("HOME"); h != "" {
+		return h
+	}
+	return os.Getenv("USERPROFILE") // windows
+}
+
+func IsURL(str string) bool {
+	parsed, err := url.ParseRequestURI(str)
+	if err != nil {
+		return false
+	}
+
+	return parsed.Scheme != ""
+}