Fix bug where len is compared to less than 0 (#1682)

* Fix bug where len is less than 0 * unit tests for errors
kanisterio · Feb 16, 2023 · 0db8d22 · 0db8d22
1 parent cc44fa3
commit 0db8d22
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 3 deletions.
diff --git a/pkg/blockstorage/ibm/ibmcloud.go b/pkg/blockstorage/ibm/ibmcloud.go
@@ -124,9 +124,7 @@ func (s *ibmCloud) volumeParse(ctx context.Context, vol *ibmprov.Volume) (*block
 	}
 	attribs[LunIDAttName] = vol.LunID
 
-	// TODO: Fix issue where we don't catch the error uf vol.IscsiTargetIPAddresses is empty
-	// Related ticket - https://github.com/kanisterio/kanister/issues/1683
-	if len(vol.IscsiTargetIPAddresses) < 0 { //nolint:staticcheck
+	if len(vol.IscsiTargetIPAddresses) == 0 {
 		return nil, errors.New("IscsiTargetIPAddresses are missing from Volume info")
 	}
 	if len(vol.Attributes) > 0 {

diff --git a/pkg/blockstorage/ibm/ibmcloud_test.go b/pkg/blockstorage/ibm/ibmcloud_test.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/IBM/ibmcloud-storage-volume-lib/config"
 	ibmprov "github.com/IBM/ibmcloud-storage-volume-lib/lib/provider"
 	"github.com/luci/go-render/render"
 	. "gopkg.in/check.v1"
@@ -142,3 +143,61 @@ func (s TestIBMCloud) TestVolRestore(c *C) {
 	err = s.provider.VolumeDelete(context.Background(), resVol)
 	c.Assert(err, IsNil)
 }
+
+type TestIBMCloudLocal struct{}
+
+var _ = Suite(&TestIBMCloudLocal{})
+
+func (s TestIBMCloudLocal) TestVolParse(c *C) {
+	ctx := context.Background()
+	capInt := 1
+	for _, tc := range []struct {
+		vol *ibmprov.Volume
+		err Checker
+	}{
+		{
+			vol: &ibmprov.Volume{
+				LunID:                  "lun",
+				IscsiTargetIPAddresses: []string{"target"},
+				Attributes: map[string]string{
+					"key": "value",
+				},
+				Capacity: &capInt,
+			},
+			err: IsNil,
+		},
+		{
+			vol: &ibmprov.Volume{
+				LunID:                  "lun",
+				IscsiTargetIPAddresses: []string{},
+				Attributes: map[string]string{
+					"key": "value",
+				},
+				Capacity: &capInt,
+			},
+			err: NotNil,
+		},
+		{
+			vol: &ibmprov.Volume{
+				LunID:                  "",
+				Provider:               "slbpname",
+				IscsiTargetIPAddresses: []string{},
+				Attributes: map[string]string{
+					"key": "value",
+				},
+				Capacity: &capInt,
+			},
+			err: NotNil,
+		},
+	} {
+		ic := &ibmCloud{
+			cli: &client{
+				SLCfg: config.SoftlayerConfig{
+					SoftlayerBlockProviderName: "slbpname",
+				},
+			},
+		}
+		_, err := ic.volumeParse(ctx, tc.vol)
+		c.Assert(err, tc.err)
+	}
+}