chore: remove unused code (#1013)

Remove code snippets that are not used across the codebase.

Author: twz123

cmd/troubleshoot/cli/run.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"net/url"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -14,7 +13,6 @@ import (
 
 	cursor "github.com/ahmetalpbalkan/go-cursor"
 	"github.com/fatih/color"
-	"github.com/manifoldco/promptui"
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 	analyzer "github.com/replicatedhq/troubleshoot/pkg/analyze"
@@ -340,14 +338,6 @@ the %s Admin Console to begin analysis.`
 	return nil
 }
 
-func getExpectedContentType(uploadURL string) string {
-	parsedURL, err := url.Parse(uploadURL)
-	if err != nil {
-		return ""
-	}
-	return parsedURL.Query().Get("Content-Type")
-}
-
 func parseTimeFlags(v *viper.Viper) (*time.Time, error) {
 	var (
 		sinceTime time.Time
@@ -373,29 +363,6 @@ func parseTimeFlags(v *viper.Viper) (*time.Time, error) {
 	return &sinceTime, nil
 }
 
-func shouldRetryRequest(err error) bool {
-	if strings.Contains(err.Error(), "x509") && canTryInsecure() {
-		httputil.AddTransport(&http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		})
-		return true
-	}
-	return false
-}
-
-func canTryInsecure() bool {
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		return false
-	}
-	prompt := promptui.Prompt{
-		Label:     "Connection appears to be insecure. Would you like to attempt to create a support bundle anyway?",
-		IsConfirm: true,
-	}
-
-	_, err := prompt.Run()
-	return err == nil
-}
-
 type analysisOutput struct {
 	Analysis    []*analyzer.AnalyzeResult
 	ArchivePath string

cmd/troubleshoot/cli/util.go

@@ -3,14 +3,8 @@ package cli
 import (
 	"fmt"
 
-	"io/ioutil"
-	"path/filepath"
-
-	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
-	"github.com/replicatedhq/troubleshoot/pkg/constants"
 	"github.com/replicatedhq/troubleshoot/pkg/version"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
 )
 
 func VersionCmd() *cobra.Command {
@@ -26,25 +20,3 @@ func VersionCmd() *cobra.Command {
 	}
 	return cmd
 }
-
-func writeVersionFile(path string) error {
-	version := troubleshootv1beta2.SupportBundleVersion{
-		ApiVersion: "troubleshoot.sh/v1beta2",
-		Kind:       "SupportBundle",
-		Spec: troubleshootv1beta2.SupportBundleVersionSpec{
-			VersionNumber: version.Version(),
-		},
-	}
-	b, err := yaml.Marshal(version)
-	if err != nil {
-		return err
-	}
-
-	filename := filepath.Join(path, constants.VERSION_FILENAME)
-	err = ioutil.WriteFile(filename, b, 0644)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

cmd/troubleshoot/cli/version.go

@@ -104,13 +104,6 @@ func GetCollector(collector *troubleshootv1beta2.Collect, bundlePath string, nam
 	}
 }
 
-func collectorTitleOrDefault(meta troubleshootv1beta2.CollectorMeta, defaultTitle string) string {
-	if meta.CollectorName != "" {
-		return meta.CollectorName
-	}
-	return defaultTitle
-}
-
 func getCollectorName(c interface{}) string {
 	var collector, name, selector string
 

pkg/collect/collector.go

@@ -9,15 +9,10 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 	testclient "k8s.io/client-go/kubernetes/fake"
 )
 
 func TestConfigMap(t *testing.T) {
-	type args struct {
-		ctx    context.Context
-		client kubernetes.Interface
-	}
 	tests := []struct {
 		name               string
 		configMapCollector *troubleshootv1beta2.ConfigMap

pkg/collect/configmap_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -186,53 +185,3 @@ func getCopyErrosFileName(copyCollector *troubleshootv1beta2.Copy) string {
 	// TODO: random part
 	return "errors.json"
 }
-
-func extractTar(reader io.Reader) (map[string][]byte, error) {
-	files := map[string][]byte{}
-
-	tr := tar.NewReader(reader)
-	for {
-		header, err := tr.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return files, errors.Wrap(err, "read header")
-		}
-
-		switch header.Typeflag {
-		case tar.TypeReg:
-			data, err := ioutil.ReadAll(tr)
-			if err != nil {
-				return files, errors.Wrapf(err, "read file %s", header.Name)
-			}
-			files[header.Name] = data
-		default:
-			continue
-		}
-	}
-
-	return files, nil
-}
-
-func saveFromTar(rootDir string, reader io.Reader) (CollectorResult, error) {
-	result := NewResult()
-
-	tr := tar.NewReader(reader)
-	for {
-		header, err := tr.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return result, errors.Wrap(err, "read header")
-		}
-
-		switch header.Typeflag {
-		case tar.TypeReg:
-			result.SaveResult(rootDir, header.Name, tr)
-		default:
-			continue
-		}
-	}
-
-	return result, nil
-}

pkg/collect/copy.go

@@ -10,15 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 	testclient "k8s.io/client-go/kubernetes/fake"
 )
 
 func TestSecret(t *testing.T) {
-	type args struct {
-		ctx    context.Context
-		client kubernetes.Interface
-	}
 	tests := []struct {
 		name            string
 		secretCollector *troubleshootv1beta2.Secret

pkg/collect/secret_test.go

@@ -2,13 +2,10 @@ package debug
 
 import (
 	"log"
-	"os"
 
 	"github.com/spf13/viper"
 )
 
-var logger = log.New(os.Stderr, "[debug]", log.Lshortfile)
-
 func Print(v ...interface{}) {
 	if viper.GetBool("debug") {
 		log.Print(v...)

pkg/debug/log.go

@@ -8,15 +8,10 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 	testclient "k8s.io/client-go/kubernetes/fake"
 )
 
 func Test_LoadFromConfigMapMatchingLabel(t *testing.T) {
-	type args struct {
-		ctx    context.Context
-		client kubernetes.Interface
-	}
 	tests := []struct {
 		name                    string
 		supportBundleConfigMaps []corev1.ConfigMap
@@ -376,10 +371,6 @@ spec:
 }
 
 func TestUserProvidedNamespace_LoadFromConfigMapMatchingLabel(t *testing.T) {
-	type args struct {
-		ctx    context.Context
-		client kubernetes.Interface
-	}
 	tests := []struct {
 		name                    string
 		supportBundleConfigMaps []corev1.ConfigMap
@@ -472,10 +463,6 @@ spec:
 }
 
 func TestRedactors_LoadFromConfigMapMatchingLabel(t *testing.T) {
-	type args struct {
-		ctx    context.Context
-		client kubernetes.Interface
-	}
 	tests := []struct {
 		name                    string
 		supportBundleConfigMaps []corev1.ConfigMap