Merge pull request #759 from irapandey/error_msg_fix

Replaced fmt.Errorf to errors.New for static messages

Author: k8s-ci-robot

pkg/cloud/metadata_k8s.go

@@ -18,6 +18,7 @@ package cloud
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 
@@ -43,7 +44,7 @@ var DefaultKubernetesAPIClient = func(kubeconfig string) (kubernetes.Interface,
 func KubernetesAPIInstanceInfo(clientset kubernetes.Interface) (*Metadata, error) {
 	nodeName := os.Getenv("CSI_NODE_NAME")
 	if nodeName == "" {
-		return nil, fmt.Errorf("CSI_NODE_NAME env var not set")
+		return nil, errors.New("CSI_NODE_NAME env var not set")
 	}
 	return GetInstanceInfoFromProviderID(clientset, nodeName)
 }

pkg/cloud/powervs.go

@@ -18,6 +18,7 @@ package cloud
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -269,7 +270,7 @@ func readCredentials() (string, error) {
 	klog.Info("Falling back to read IBMCLOUD_API_KEY environment variable for the key")
 	apiKey = os.Getenv("IBMCLOUD_API_KEY")
 	if apiKey == "" {
-		return "", fmt.Errorf("IBMCLOUD_API_KEY is not provided")
+		return "", errors.New("IBMCLOUD_API_KEY is not provided")
 	}
 
 	return apiKey, nil

pkg/driver/controller_test.go

@@ -15,7 +15,7 @@ package driver
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"reflect"
 	"testing"
 
@@ -811,7 +811,7 @@ func TestDeleteVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
-				mockCloud.EXPECT().DeleteDisk(gomock.Eq(req.VolumeId)).Return(fmt.Errorf("DeleteDisk could not delete volume"))
+				mockCloud.EXPECT().DeleteDisk(gomock.Eq(req.VolumeId)).Return(errors.New("DeleteDisk could not delete volume"))
 				mockCloud.EXPECT().GetDiskByID(gomock.Eq(req.VolumeId)).Return(nil, nil)
 				powervsDriver := controllerService{
 					cloud:         mockCloud,
@@ -906,7 +906,7 @@ func TestControllerPublishVolume(t *testing.T) {
 				mockCloud := mocks.NewMockCloud(mockCtl)
 				mockCloud.EXPECT().GetPVMInstanceByID(gomock.Eq(expInstanceID)).Return(nil, nil)
 				mockCloud.EXPECT().GetDiskByID(gomock.Eq(volumeName)).Return(&cloud.Disk{WWN: expDevicePath}, nil)
-				mockCloud.EXPECT().IsAttached(gomock.Eq(volumeName), gomock.Eq(expInstanceID)).Return(fmt.Errorf("the disk is unattached"))
+				mockCloud.EXPECT().IsAttached(gomock.Eq(volumeName), gomock.Eq(expInstanceID)).Return(errors.New("the disk is unattached"))
 				mockCloud.EXPECT().AttachDisk(gomock.Eq(volumeName), gomock.Eq(expInstanceID)).Return(nil)
 
 				powervsDriver := controllerService{

pkg/util/util_test.go

@@ -14,7 +14,7 @@
 package util
 
 import (
-	"fmt"
+	"errors"
 	"reflect"
 	"testing"
 
@@ -102,7 +102,7 @@ func TestParseEndpoint(t *testing.T) {
 		{
 			name:     "invalid endpoint",
 			endpoint: "http://127.0.0.1",
-			expErr:   fmt.Errorf("unsupported protocol: http"),
+			expErr:   errors.New("unsupported protocol: http"),
 		},
 	}
 

tests/remote/pi_resources.go

@@ -18,6 +18,7 @@ package remote
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -205,7 +206,7 @@ func (r *Remote) createInstance(image, network string) (string, string, error) {
 	}
 
 	if publicIP == "" {
-		return "", "", fmt.Errorf("error while getting pvm instance public IP")
+		return "", "", errors.New("error while getting pvm instance public IP")
 	}
 
 	err = waitForInstanceSSH(publicIP)
@@ -250,7 +251,7 @@ func waitForInstanceHealth(insID string, ic *instance.IBMPIInstanceClient) (*mod
 			if pvm.Fault != nil {
 				return false, fmt.Errorf("failed to create a PowerVS instance: %s", pvm.Fault.Message)
 			}
-			return false, fmt.Errorf("failed to create a PowerVS instance")
+			return false, errors.New("failed to create a PowerVS instance")
 		}
 		// Check for `instanceReadyStatus` health status and also the final health status "OK"
 		if *pvm.Status == cloud.PowerVSInstanceStateACTIVE && (pvm.Health.Status == cloud.PowerVSInstanceHealthWARNING || pvm.Health.Status == cloud.PowerVSInstanceHealthOK) {