From 5ac873fae3d6cccd097a43e5b63f92acba81946e Mon Sep 17 00:00:00 2001 From: qasimwarraich Date: Fri, 31 Mar 2023 15:34:07 +0200 Subject: [PATCH] Fix linting errors --- internal/app/app.go | 9 ++++----- main.go | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/internal/app/app.go b/internal/app/app.go index 28fe416..5d8a85f 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -6,12 +6,11 @@ import ( "os" "path/filepath" + "github.com/bespinian/livelint/internal/livelint" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - - "github.com/bespinian/livelint/internal/livelint" ) type App struct { @@ -46,9 +45,9 @@ func New(namespace string, deploymentName string, ui livelint.UserInteraction) ( if app.namespace == "" { loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, nil) - kubeConfigNamespace, _, err := kubeConfig.Namespace() - if err != nil { - return nil, fmt.Errorf("error getting namespace from k8s config: %w", err) + kubeConfigNamespace, _, namespaceErr := kubeConfig.Namespace() + if namespaceErr != nil { + return nil, fmt.Errorf("error getting namespace from k8s config: %w", namespaceErr) } app.namespace = kubeConfigNamespace } diff --git a/main.go b/main.go index 18a458e..053e296 100644 --- a/main.go +++ b/main.go @@ -1,21 +1,17 @@ package main import ( - "errors" "fmt" "os" - tea "github.com/charmbracelet/bubbletea" - "github.com/urfave/cli/v2" - "github.com/bespinian/livelint/internal/app" "github.com/bespinian/livelint/internal/livelint" + tea "github.com/charmbracelet/bubbletea" + "github.com/urfave/cli/v2" ) var buildversion, builddate, githash string -var errNoHome = errors.New("error finding your HOME directory") - func main() { cli := &cli.App{ Name: "livelint", @@ -55,7 +51,10 @@ func main() { go func() { defer bubbletea.Quit() - app.Start() + err = app.Start() + if err != nil { + exitWithErr(err) + } }() err = bubbletea.Start()