fmt:

Author: marccampbell

cmd/preflight/cli/convert.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/troubleshoot/pkg/convert"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/replicatedhq/troubleshoot/pkg/convert"
 )
 
 func ConvertCmd() *cobra.Command {
@@ -129,4 +129,4 @@ func runConvert(v *viper.Viper, inputFile, outputSpec, outputValues string) erro
 	fmt.Printf("   preflight run %s --values %s\n", outputSpec, outputValues)
 
 	return nil
-}
+}

pkg/convert/v1beta3.go

@@ -12,8 +12,8 @@ import (
 
 // V1Beta2ToV1Beta3Result holds the conversion results
 type V1Beta2ToV1Beta3Result struct {
-	TemplatedSpec string            `yaml:"-"`
-	ValuesFile    string            `yaml:"-"`
+	TemplatedSpec string                 `yaml:"-"`
+	ValuesFile    string                 `yaml:"-"`
 	Values        map[string]interface{} `yaml:"-"`
 }
 
@@ -134,9 +134,9 @@ func (c *v1beta3Converter) convert() (string, error) {
 
 func (c *v1beta3Converter) initializeValues() {
 	c.values["kubernetes"] = map[string]interface{}{
-		"enabled":             false,
-		"minVersion":          "1.20.0",
-		"recommendedVersion":  "1.22.0",
+		"enabled":            false,
+		"minVersion":         "1.20.0",
+		"recommendedVersion": "1.22.0",
 	}
 
 	c.values["storage"] = map[string]interface{}{
@@ -151,9 +151,9 @@ func (c *v1beta3Converter) initializeValues() {
 	}
 
 	c.values["node"] = map[string]interface{}{
-		"minMemoryGi":         8,
-		"recommendedMemoryGi": 32,
-		"minEphemeralGi":      40,
+		"minMemoryGi":            8,
+		"recommendedMemoryGi":    32,
+		"minEphemeralGi":         40,
 		"recommendedEphemeralGi": 100,
 	}
 
@@ -630,4 +630,3 @@ func (c *v1beta3Converter) setNestedValue(path string, value interface{}) {
 
 	current[parts[len(parts)-1]] = value
 }
-

pkg/preflight/template_test.go

@@ -212,7 +212,7 @@ func TestRender_V1Beta3_CLI_ValuesAndSetFlags(t *testing.T) {
 		}
 	}
 	require.NotNil(t, clusterVersionAnalyzer, "cluster version analyzer should be present")
-	
+
 	// Check that our --set values are used in the rendered outcomes
 	foundMinVersion := false
 	foundRecommendedVersion := false
@@ -261,7 +261,7 @@ spec:
 	vals := map[string]interface{}{}
 	rendered, err := RenderWithHelmTemplate(invalidYaml, vals)
 	require.NoError(t, err, "template rendering should succeed even with malformed YAML")
-	
+
 	// But loading the spec should fail due to invalid YAML structure
 	_, err = loader.LoadSpecs(context.Background(), loader.LoadOptions{RawSpec: rendered, Strict: true})
 	assert.Error(t, err, "loading malformed YAML should produce an error")

pkg/supportbundle/extract_license.go

@@ -54,8 +54,8 @@ func ExtractLicenseFromBundle(bundlePath string) (string, string, error) {
 
 		// Process .yaml, .yml, and .json files
 		if !strings.HasSuffix(header.Name, ".yaml") &&
-		   !strings.HasSuffix(header.Name, ".yml") &&
-		   !strings.HasSuffix(header.Name, ".json") {
+			!strings.HasSuffix(header.Name, ".yml") &&
+			!strings.HasSuffix(header.Name, ".json") {
 			continue
 		}
 
@@ -158,7 +158,7 @@ func extractLicenseWithRegex(content string) string {
 		`"licenseID":\s*"([a-zA-Z0-9]{20,30})"`,
 		`"license_id":\s*"([a-zA-Z0-9]{20,30})"`,
 		`"license":\s*"([a-zA-Z0-9]{20,30})"`,
-		`licenseID: ([a-zA-Z0-9]{20,30})`, // YAML format without quotes
+		`licenseID: ([a-zA-Z0-9]{20,30})`,    // YAML format without quotes
 		`\\nlicenseID: ([a-zA-Z0-9]{20,30})`, // With escaped newline
 	}
 
@@ -282,8 +282,8 @@ func ExtractAppSlugFromBundle(bundlePath string) (string, error) {
 
 		// Process .yaml, .yml, and .json files
 		if !strings.HasSuffix(header.Name, ".yaml") &&
-		   !strings.HasSuffix(header.Name, ".yml") &&
-		   !strings.HasSuffix(header.Name, ".json") {
+			!strings.HasSuffix(header.Name, ".yml") &&
+			!strings.HasSuffix(header.Name, ".json") {
 			continue
 		}
 
@@ -306,7 +306,7 @@ func ExtractAppSlugFromBundle(bundlePath string) (string, error) {
 
 		// Skip common Kubernetes configmaps
 		if filename == "kube-root-ca.crt" || strings.HasPrefix(filename, "kube-") ||
-		   strings.HasPrefix(filename, "kotsadm-") {
+			strings.HasPrefix(filename, "kotsadm-") {
 			continue
 		}
 
@@ -327,7 +327,7 @@ func extractAppSlugFromContent(content string) string {
 		`app_slug:\s*["']?([a-zA-Z0-9\-]+)["']?`,
 		`"appSlug":\s*"([a-zA-Z0-9\-]+)"`,
 		`"app_slug":\s*"([a-zA-Z0-9\-]+)"`,
-		`appSlug: ([a-zA-Z0-9\-]+)`, // YAML format without quotes
+		`appSlug: ([a-zA-Z0-9\-]+)`,    // YAML format without quotes
 		`\\nappSlug: ([a-zA-Z0-9\-]+)`, // With escaped newline
 	}
 
@@ -339,4 +339,4 @@ func extractAppSlugFromContent(content string) string {
 	}
 
 	return ""
-}
+}

pkg/supportbundle/upload.go

@@ -88,4 +88,3 @@ func UploadBundleAutoDetect(bundlePath string, providedLicenseID, providedAppSlu
 	fmt.Printf("Successfully uploaded support bundle\n")
 	return nil
 }
-

pkg/updater/pkgmgr/homebrew.go

@@ -7,17 +7,17 @@ import (
 )
 
 // HomebrewPackageManager detects if a binary was installed via Homebrew
-type HomebrewPackageManager struct{
+type HomebrewPackageManager struct {
 	formula string
 }
 
 var _ PackageManager = (*HomebrewPackageManager)(nil)
 
 type homebrewInfoOutput struct {
 	Installed []struct {
-		Version      string `json:"version"`
-		InstalledOn  bool   `json:"installed_on_request"`
-		LinkedKeg    string `json:"linked_keg"`
+		Version     string `json:"version"`
+		InstalledOn bool   `json:"installed_on_request"`
+		LinkedKeg   string `json:"linked_keg"`
 	} `json:"installed"`
 }
 
@@ -71,4 +71,3 @@ func (h *HomebrewPackageManager) IsInstalled() (bool, error) {
 func (h *HomebrewPackageManager) UpgradeCommand() string {
 	return fmt.Sprintf("brew upgrade %s", h.formula)
 }
-

pkg/updater/pkgmgr/krew.go

@@ -7,7 +7,7 @@ import (
 )
 
 // KrewPackageManager detects if a binary was installed via kubectl krew
-type KrewPackageManager struct{
+type KrewPackageManager struct {
 	pluginName string
 }
 
@@ -66,4 +66,3 @@ func (k *KrewPackageManager) IsInstalled() (bool, error) {
 func (k *KrewPackageManager) UpgradeCommand() string {
 	return fmt.Sprintf("kubectl krew upgrade %s", k.pluginName)
 }
-

pkg/updater/pkgmgr/pkgmgr.go

@@ -8,4 +8,4 @@ type PackageManager interface {
 	UpgradeCommand() string
 	// Name returns the human-readable name of the package manager
 	Name() string
-}
+}

pkg/updater/updater.go

@@ -86,7 +86,7 @@ func CheckAndUpdate(ctx context.Context, o Options) error {
 	// Check if installed via package manager - only show message if newer version exists
 	if pkgMgr := detectPackageManager(o.BinaryName); pkgMgr != nil {
 		if o.Printf != nil {
-			o.Printf("A newer version (%s) is available. Please run: %s\n", 
+			o.Printf("A newer version (%s) is available. Please run: %s\n",
 				latest, pkgMgr.UpgradeCommand())
 		}
 		return nil
@@ -277,7 +277,7 @@ func detectPackageManager(binaryName string) pkgmgr.PackageManager {
 	// Map binary names to their package manager formula/plugin names
 	formulaName := getHomebrewFormulaName(binaryName)
 	pluginName := getKrewPluginName(binaryName)
-	
+
 	// List of package managers to check
 	packageManagers := []pkgmgr.PackageManager{
 		pkgmgr.NewHomebrewPackageManager(formulaName),