From 1995ccc8e06bdb768fcdeb0d96c59379a3079110 Mon Sep 17 00:00:00 2001 From: adarsh-dell Date: Fri, 13 Oct 2023 03:31:57 -0400 Subject: [PATCH 1/3] Improving file stat code --- core/semver/semver.go | 12 +++++++++--- pkg/node/node.go | 13 ++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/core/semver/semver.go b/core/semver/semver.go index cc087672..b4dde1ce 100644 --- a/core/semver/semver.go +++ b/core/semver/semver.go @@ -307,8 +307,14 @@ var goarchToUname = map[string]string{ } func fileExists(filePath string) bool { - if _, err := os.Stat(filePath); !os.IsNotExist(err) { - return true + _, err := os.Stat(filePath) + if err != nil { + if os.IsNotExist(err) { + fmt.Printf("File %s doesn't exist", filePath) + } else { + fmt.Printf("Found error %v while checking stat of file %s ", err, filePath) + } + return false } - return false + return true } diff --git a/pkg/node/node.go b/pkg/node/node.go index e80100ab..ac604f86 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -1650,7 +1650,18 @@ func (s *Service) buildInitiatorsArrayModify(initiators []string) []gopowerstore func (s *Service) fileExists(filename string) bool { _, err := s.Fs.Stat(filename) - if os.IsNotExist(err) { + if err != nil { + if os.IsNotExist(err) { + log.WithFields(log.Fields{ + "filename": filename, + "error": err, + }).Error("File doesn't exist") + } else { + log.WithFields(log.Fields{ + "filename": filename, + "error": err, + }).Error("Error while checking stat of file") + } return false } return true From a5513d544c4135e5af8fe610972f3b142bf95a5a Mon Sep 17 00:00:00 2001 From: adarsh-dell Date: Fri, 13 Oct 2023 04:27:55 -0400 Subject: [PATCH 2/3] enhancing the code --- core/semver/semver.go | 17 +++++++++-------- pkg/node/node.go | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/core/semver/semver.go b/core/semver/semver.go index b4dde1ce..7d696f21 100644 --- a/core/semver/semver.go +++ b/core/semver/semver.go @@ -308,13 +308,14 @@ var goarchToUname = map[string]string{ func fileExists(filePath string) bool { _, err := os.Stat(filePath) - if err != nil { - if os.IsNotExist(err) { - fmt.Printf("File %s doesn't exist", filePath) - } else { - fmt.Printf("Found error %v while checking stat of file %s ", err, filePath) - } - return false + if err == nil { + return true } - return true + if os.IsNotExist(err) { + fmt.Printf("File %s doesn't exist", filePath) + } else { + fmt.Printf("Found error %v while checking stat of file %s ", err, filePath) + } + return false + } diff --git a/pkg/node/node.go b/pkg/node/node.go index ac604f86..a01594bc 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -1650,19 +1650,19 @@ func (s *Service) buildInitiatorsArrayModify(initiators []string) []gopowerstore func (s *Service) fileExists(filename string) bool { _, err := s.Fs.Stat(filename) - if err != nil { - if os.IsNotExist(err) { - log.WithFields(log.Fields{ - "filename": filename, - "error": err, - }).Error("File doesn't exist") - } else { - log.WithFields(log.Fields{ - "filename": filename, - "error": err, - }).Error("Error while checking stat of file") - } - return false + if err == nil { + return true + } + if os.IsNotExist(err) { + log.WithFields(log.Fields{ + "filename": filename, + "error": err, + }).Error("File doesn't exist") + } else { + log.WithFields(log.Fields{ + "filename": filename, + "error": err, + }).Error("Error while checking stat of file") } - return true + return false } From 37aa4d0f2519578aac4509133c93d8fd4e7acb3c Mon Sep 17 00:00:00 2001 From: Vamsikrishna_Siddu Date: Fri, 13 Oct 2023 06:32:01 -0400 Subject: [PATCH 3/3] fixing gofumpt. --- core/semver/semver.go | 1 - 1 file changed, 1 deletion(-) diff --git a/core/semver/semver.go b/core/semver/semver.go index 7d696f21..472f7c3a 100644 --- a/core/semver/semver.go +++ b/core/semver/semver.go @@ -317,5 +317,4 @@ func fileExists(filePath string) bool { fmt.Printf("Found error %v while checking stat of file %s ", err, filePath) } return false - }