From f9424d43e75222582f7350b4a5e3ab4b08dfe12c Mon Sep 17 00:00:00 2001
From: Prashant <prary2@gmail.com>
Date: Thu, 3 Oct 2019 21:29:40 +0530
Subject: [PATCH] fixing lint and minor fix

---
 cmd/executor/cmd/root.go    | 34 +++++++++++++++++-----------------
 cmd/executor/cmd/version.go | 20 ++++++++++----------
 pkg/util/fs_util.go         |  3 ---
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
index 29ec4162d..07a3d880b 100644
--- a/cmd/executor/cmd/root.go
+++ b/cmd/executor/cmd/root.go
@@ -54,23 +54,23 @@ func init() {
 var RootCmd = &cobra.Command{
 	Use: "executor",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-	    if cmd.Use == "executor" {
-            if err := util.ConfigureLogging(logLevel); err != nil {
-                return err
-            }
-            if !opts.NoPush && len(opts.Destinations) == 0 {
-                return errors.New("You must provide --destination, or use --no-push")
-            }
-            if err := cacheFlagsValid(); err != nil {
-                return errors.Wrap(err, "cache flags invalid")
-            }
-            if err := resolveSourceContext(); err != nil {
-                return errors.Wrap(err, "error resolving source context")
-            }
-            if err := resolveDockerfilePath(); err != nil {
-                return errors.Wrap(err, "error resolving dockerfile path")
-            }
-        }
+		if cmd.Use == "executor" {
+			if err := util.ConfigureLogging(logLevel); err != nil {
+				return err
+			}
+			if !opts.NoPush && len(opts.Destinations) == 0 {
+				return errors.New("You must provide --destination, or use --no-push")
+			}
+			if err := cacheFlagsValid(); err != nil {
+				return errors.Wrap(err, "cache flags invalid")
+			}
+			if err := resolveSourceContext(); err != nil {
+				return errors.Wrap(err, "error resolving source context")
+			}
+			if err := resolveDockerfilePath(); err != nil {
+				return errors.Wrap(err, "error resolving dockerfile path")
+			}
+		}
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
diff --git a/cmd/executor/cmd/version.go b/cmd/executor/cmd/version.go
index df1880e1a..65e2bea72 100644
--- a/cmd/executor/cmd/version.go
+++ b/cmd/executor/cmd/version.go
@@ -1,20 +1,20 @@
 package cmd
 
 import (
-  "fmt"
+	"fmt"
 
-  "github.com/spf13/cobra"
-  "github.com/GoogleContainerTools/kaniko/pkg/version"
+	"github.com/GoogleContainerTools/kaniko/pkg/version"
+	"github.com/spf13/cobra"
 )
 
 func init() {
-  RootCmd.AddCommand(versionCmd)
+	RootCmd.AddCommand(versionCmd)
 }
 
 var versionCmd = &cobra.Command{
-  Use:   "version",
-  Short: "Print the version number of kaniko",
-  Run: func(cmd *cobra.Command, args []string) {
-    fmt.Print("Kaniko version : ", version.Version())
-  },
-}
\ No newline at end of file
+	Use:   "version",
+	Short: "Print the version number of kaniko",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("Kaniko version : ", version.Version())
+	},
+}
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index 338caa02a..f56f6bff5 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -359,9 +359,6 @@ func RelativeFiles(fp string, root string) ([]string, error) {
 		if CheckWhitelist(path) && !HasFilepathPrefix(path, root, false) {
 			return nil
 		}
-		if err != nil {
-			return err
-		}
 		relPath, err := filepath.Rel(root, path)
 		if err != nil {
 			return err