From 72f54ae58264e6ee88b6e4aa9c0e182fbfbb2ac6 Mon Sep 17 00:00:00 2001 From: Aryan-sharma11 Date: Tue, 2 May 2023 09:06:00 +0530 Subject: [PATCH] fix: go-lint errors Signed-off-by: Aryan-sharma11 --- cmd/discover.go | 6 ++---- cmd/recommend.go | 6 ++---- cmd/rotate-tls.go | 6 ++---- cmd/selfupdate.go | 6 ++---- cmd/uninstall.go | 6 ++---- cmd/version.go | 6 ++---- cmd/vmlabel.go | 18 ++++++------------ cmd/vmonboarding.go | 12 ++++-------- selfupdate/selfupdate.go | 3 +-- 9 files changed, 23 insertions(+), 46 deletions(-) diff --git a/cmd/discover.go b/cmd/discover.go index f7552d1d..831cb766 100644 --- a/cmd/discover.go +++ b/cmd/discover.go @@ -16,10 +16,8 @@ var discoverCmd = &cobra.Command{ Short: "Discover applicable policies", Long: `Discover applicable policies`, RunE: func(cmd *cobra.Command, args []string) error { - if err := discover.Policy(client, discoverOptions); err != nil { - return err - } - return nil + err := discover.Policy(client, discoverOptions) + return err }, } diff --git a/cmd/recommend.go b/cmd/recommend.go index 72d05551..f0c397b6 100644 --- a/cmd/recommend.go +++ b/cmd/recommend.go @@ -17,10 +17,8 @@ var recommendCmd = &cobra.Command{ Short: "Recommend Policies", Long: `Recommend policies based on container image, k8s manifest or the actual runtime env`, RunE: func(cmd *cobra.Command, args []string) error { - if err := recommend.Recommend(client, recommendOptions); err != nil { - return err - } - return nil + err := recommend.Recommend(client, recommendOptions) + return err }, } var updateCmd = &cobra.Command{ diff --git a/cmd/rotate-tls.go b/cmd/rotate-tls.go index ee770a66..af800c1e 100644 --- a/cmd/rotate-tls.go +++ b/cmd/rotate-tls.go @@ -11,10 +11,8 @@ var rotateCmd = &cobra.Command{ Short: "Rotate webhook controller tls certificates", Long: `Rotate webhook controller tls certificates`, RunE: func(cmd *cobra.Command, args []string) error { - if err := rotatetls.RotateTLS(client, namespace); err != nil { - return err - } - return nil + err := rotatetls.RotateTLS(client, namespace) + return err }, } diff --git a/cmd/selfupdate.go b/cmd/selfupdate.go index 7deda385..81cbfd48 100644 --- a/cmd/selfupdate.go +++ b/cmd/selfupdate.go @@ -14,10 +14,8 @@ var selfUpdateCmd = &cobra.Command{ Short: "selfupdate this cli tool", Long: `selfupdate this cli tool for checking the latest release on the github`, RunE: func(cmd *cobra.Command, args []string) error { - if err := selfupdate.SelfUpdate(client); err != nil { - return err - } - return nil + err := selfupdate.SelfUpdate() + return err }, } diff --git a/cmd/uninstall.go b/cmd/uninstall.go index a41da365..7965cd24 100644 --- a/cmd/uninstall.go +++ b/cmd/uninstall.go @@ -17,10 +17,8 @@ var uninstallCmd = &cobra.Command{ Long: `Uninstall KubeArmor from a Kubernetes Clusters`, RunE: func(cmd *cobra.Command, args []string) error { uninstallOptions.Animation = true - if err := install.K8sUninstaller(client, uninstallOptions); err != nil { - return err - } - return nil + err := install.K8sUninstaller(client, uninstallOptions) + return err }, } diff --git a/cmd/version.go b/cmd/version.go index dfa46a00..e86f57ab 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -14,10 +14,8 @@ var versionCmd = &cobra.Command{ Short: "Display version information", Long: `Display version information`, RunE: func(cmd *cobra.Command, args []string) error { - if err := version.PrintVersion(client); err != nil { - return err - } - return nil + err := version.PrintVersion(client) + return err }, } diff --git a/cmd/vmlabel.go b/cmd/vmlabel.go index 90a16096..8abf3196 100644 --- a/cmd/vmlabel.go +++ b/cmd/vmlabel.go @@ -30,10 +30,8 @@ var vmLabelAddCmd = &cobra.Command{ // Create http address httpAddress := "http://" + net.JoinHostPort(HTTPIP, HTTPPort) - if err := vm.LabelHandling("ADD", labelOptions, httpAddress, IsKvmsEnv); err != nil { - return err - } - return nil + err := vm.LabelHandling("ADD", labelOptions, httpAddress, IsKvmsEnv) + return err }, } @@ -46,10 +44,8 @@ var vmLabelDeleteCmd = &cobra.Command{ // Create http address httpAddress := "http://" + net.JoinHostPort(HTTPIP, HTTPPort) - if err := vm.LabelHandling("DELETE", labelOptions, httpAddress, IsKvmsEnv); err != nil { - return err - } - return nil + err := vm.LabelHandling("DELETE", labelOptions, httpAddress, IsKvmsEnv) + return err }, } @@ -62,10 +58,8 @@ var vmLabelListCmd = &cobra.Command{ // Create http address httpAddress := "http://" + net.JoinHostPort(HTTPIP, HTTPPort) - if err := vm.LabelHandling("LIST", labelOptions, httpAddress, IsKvmsEnv); err != nil { - return err - } - return nil + err := vm.LabelHandling("LIST", labelOptions, httpAddress, IsKvmsEnv) + return err }, } diff --git a/cmd/vmonboarding.go b/cmd/vmonboarding.go index 7155ea5e..6edb7c55 100644 --- a/cmd/vmonboarding.go +++ b/cmd/vmonboarding.go @@ -24,10 +24,8 @@ var vmOnboardAddCmd = &cobra.Command{ }, RunE: func(cmd *cobra.Command, args []string) error { httpAddress := "http://" + net.JoinHostPort(HTTPIP, HTTPPort) - if err := vm.Onboarding("ADDED", args[0], httpAddress); err != nil { - return err - } - return nil + err := vm.Onboarding("ADDED", args[0], httpAddress) + return err }, } @@ -44,10 +42,8 @@ var vmOnboardDeleteCmd = &cobra.Command{ }, RunE: func(cmd *cobra.Command, args []string) error { httpAddress := "http://" + net.JoinHostPort(HTTPIP, HTTPPort) - if err := vm.Onboarding("DELETED", args[0], httpAddress); err != nil { - return err - } - return nil + err := vm.Onboarding("DELETED", args[0], httpAddress) + return err }, } diff --git a/selfupdate/selfupdate.go b/selfupdate/selfupdate.go index 6c95671f..b0937031 100644 --- a/selfupdate/selfupdate.go +++ b/selfupdate/selfupdate.go @@ -13,7 +13,6 @@ import ( "github.com/blang/semver" "github.com/fatih/color" - "github.com/kubearmor/kubearmor-client/k8s" "github.com/rhysd/go-github-selfupdate/selfupdate" ) @@ -107,7 +106,7 @@ func doSelfUpdate(curver string) error { } // SelfUpdate handler for karmor cli tool -func SelfUpdate(c *k8s.Client) error { +func SelfUpdate() error { var ver = GitSummary fmt.Printf("current karmor version %s\n", ver) if !isValidVersion(ver) {