From d785d904b1fca83eef12753833b601805f9757bf Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <mrajanna@redhat.com>
Date: Fri, 21 Dec 2018 09:28:40 +0530
Subject: [PATCH] Fix redundant error check

This PR fixes
* Removes redundant error check
* use `glog.Errorf` to log in case of an error.

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
---
 cmd/main.go                  | 15 +++++----------
 pkg/connection/connection.go |  5 +----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index 56c75002..a97a7317 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -51,20 +51,15 @@ func runProbe(ctx context.Context, csiConn connection.CSIConnection) error {
 	glog.Infof("CSI driver name: %q", csiDriverName)
 	// Sending Probe request
 	glog.Infof("Sending probe request to CSI driver.")
-	if err := csiConn.LivenessProbe(ctx); err != nil {
-		return err
-	}
-	return nil
+	err = csiConn.LivenessProbe(ctx)
+	return err
 }
 
 func getCSIConnection() (connection.CSIConnection, error) {
 	// Connect to CSI.
 	glog.Infof("Attempting to open a gRPC connection with: %s", *csiAddress)
 	csiConn, err := connection.NewConnection(*csiAddress, *connectionTimeout)
-	if err != nil {
-		return nil, err
-	}
-	return csiConn, nil
+	return csiConn, err
 }
 
 func checkHealth(w http.ResponseWriter, req *http.Request) {
@@ -73,7 +68,7 @@ func checkHealth(w http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
-		glog.Infof("Failed to get connection to CSI  with error: %v.", err)
+		glog.Errorf("Failed to get connection to CSI  with error: %v.", err)
 		return
 	}
 	defer csiConn.Close()
@@ -82,7 +77,7 @@ func checkHealth(w http.ResponseWriter, req *http.Request) {
 	if err := runProbe(ctx, csiConn); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
-		glog.Infof("Health check failed with: %v.", err)
+		glog.Errorf("Health check failed with: %v.", err)
 	} else {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte(`ok`))
diff --git a/pkg/connection/connection.go b/pkg/connection/connection.go
index 5abf4700..50e8a27e 100644
--- a/pkg/connection/connection.go
+++ b/pkg/connection/connection.go
@@ -118,10 +118,7 @@ func (c *csiConnection) LivenessProbe(ctx context.Context) error {
 	req := csi.ProbeRequest{}
 
 	_, err := client.Probe(ctx, &req)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (c *csiConnection) Close() error {