fix golangci-lint v2.0.2 warnings (#219)

dobsonj · web-flow · commit 08fe882b429a · 2025-04-10T21:56:41.000-07:00
Signed-off-by: Jonathan Dobson &lt;jdobson@redhat.com&gt;
diff --git a/pkg/ibmcsidriver/controller.go b/pkg/ibmcsidriver/controller.go
@@ -94,7 +94,7 @@ func (csiCS *CSIControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		// Create copy of the requestedVolume
 		tempReqVol := (*requestedVolume)
 		// Mask VolumeEncryptionKey
-		tempReqVol.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: "********"}
+		tempReqVol.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: "********"}
 		ctxLogger.Info("Volume request after masking encryption key", zap.Reflect("Volume", tempReqVol))
 	}
 
diff --git a/pkg/ibmcsidriver/controller_helper.go b/pkg/ibmcsidriver/controller_helper.go
@@ -108,7 +108,7 @@ func getVolumeParameters(logger *zap.Logger, req *csi.CreateVolumeRequest, confi
 		switch key {
 		case Profile:
 			if utils.ListContainsSubstr(SupportedProfile, value) {
-				volume.VPCVolume.Profile = &provider.Profile{Name: value}
+				volume.Profile = &provider.Profile{Name: value}
 			} else {
 				err = fmt.Errorf("%s:<%v> unsupported profile. Supported profiles are: %v", key, value, SupportedProfile)
 			}
@@ -127,14 +127,14 @@ func getVolumeParameters(logger *zap.Logger, req *csi.CreateVolumeRequest, confi
 		case Tag:
 			if len(value) != 0 {
 				tagstr := strings.TrimSpace(value)
-				volume.VPCVolume.Tags = strings.Split(tagstr, ",")
+				volume.Tags = strings.Split(tagstr, ",")
 			}
 
 		case ResourceGroup:
 			if len(value) > ResourceGroupIDMaxLen {
 				err = fmt.Errorf("%s:<%v> exceeds %d chars", key, value, ResourceGroupIDMaxLen)
 			}
-			volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: value}
+			volume.ResourceGroup = &provider.ResourceGroup{ID: value}
 
 		case BillingType:
 			// Its not supported by RIaaS, but this is just information for the user
@@ -150,7 +150,7 @@ func getVolumeParameters(logger *zap.Logger, req *csi.CreateVolumeRequest, confi
 				err = fmt.Errorf("%s: exceeds %d bytes", key, EncryptionKeyMaxLen)
 			} else {
 				if len(value) != 0 {
-					volume.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}
+					volume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}
 				}
 			}
 
@@ -179,18 +179,18 @@ func getVolumeParameters(logger *zap.Logger, req *csi.CreateVolumeRequest, confi
 	}
 	// If encripted is set to false
 	if encrypt == FalseStr {
-		volume.VPCVolume.VolumeEncryptionKey = nil
+		volume.VolumeEncryptionKey = nil
 	}
 
-	if volume.VPCVolume.Profile == nil {
+	if volume.Profile == nil {
 		err = fmt.Errorf("volume profile is empty, you need to pass valid profile name")
 		logger.Error("getVolumeParameters", zap.NamedError("InvalidRequest", err))
 		return volume, err
 	}
 
 	// Get the requested capacity from the request
 	capacityRange := req.GetCapacityRange()
-	capBytes, err := getRequestedCapacity(capacityRange, volume.VPCVolume.Profile.Name)
+	capBytes, err := getRequestedCapacity(capacityRange, volume.Profile.Name)
 	if err != nil {
 		err = fmt.Errorf("invalid PVC capacity size: '%v'", err)
 		logger.Error("getVolumeParameters", zap.NamedError("invalid parameter", err))
@@ -239,7 +239,7 @@ func getVolumeParameters(logger *zap.Logger, req *csi.CreateVolumeRequest, confi
 		return volume, err
 	}
 
-	if volume.VPCVolume.Profile != nil && (volume.VPCVolume.Profile.Name != CustomProfile && volume.VPCVolume.Profile.Name != SDPProfile) {
+	if volume.Profile != nil && (volume.Profile.Name != CustomProfile && volume.Profile.Name != SDPProfile) {
 		// Specify IOPS only for custom or SDP class
 		volume.Iops = nil
 	}
@@ -273,7 +273,7 @@ func overrideParams(logger *zap.Logger, req *csi.CreateVolumeRequest, config *co
 				err = fmt.Errorf("%s:<%v> exceeds %d bytes ", key, value, ResourceGroupIDMaxLen)
 			} else {
 				logger.Info("override", zap.Any(ResourceGroup, value))
-				volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: value}
+				volume.ResourceGroup = &provider.ResourceGroup{ID: value}
 			}
 		case Encrypted:
 			if value != TrueStr && value != FalseStr {
@@ -288,15 +288,15 @@ func overrideParams(logger *zap.Logger, req *csi.CreateVolumeRequest, config *co
 			} else {
 				if len(value) != 0 {
 					logger.Info("override", zap.String("parameter", EncryptionKey))
-					volume.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}
+					volume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}
 				}
 			}
 		case Tag:
 			if len(value) != 0 {
 				logger.Info("append", zap.Any(Tag, value))
 				tagstr := strings.TrimSpace(value)
 				secretTags := strings.Split(tagstr, ",")
-				volume.VPCVolume.Tags = append(volume.VPCVolume.Tags, secretTags...)
+				volume.Tags = append(volume.Tags, secretTags...)
 			}
 
 		case Zone:
@@ -327,11 +327,11 @@ func overrideParams(logger *zap.Logger, req *csi.CreateVolumeRequest, config *co
 		}
 	}
 	// Assign ResourceGroupID from config
-	if volume.VPCVolume.ResourceGroup == nil || len(volume.VPCVolume.ResourceGroup.ID) < 1 {
-		volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: config.VPC.G2ResourceGroupID}
+	if volume.ResourceGroup == nil || len(volume.ResourceGroup.ID) < 1 {
+		volume.ResourceGroup = &provider.ResourceGroup{ID: config.VPC.G2ResourceGroupID}
 	}
 	if encrypt == FalseStr {
-		volume.VPCVolume.VolumeEncryptionKey = nil
+		volume.VolumeEncryptionKey = nil
 	}
 	return nil
 }
diff --git a/pkg/ibmcsidriver/fileOps_test.go b/pkg/ibmcsidriver/fileOps_test.go
@@ -83,11 +83,13 @@ func TestSetupSidecar(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			// Set SIDECAR_GROUP_ID environment variable
 			if tc.groupID != "" {
-				os.Setenv("SIDECAR_GROUP_ID", tc.groupID)
+				err := os.Setenv("SIDECAR_GROUP_ID", tc.groupID)
+				assert.NoError(t, err)
 			} else {
-				os.Unsetenv("SIDECAR_GROUP_ID")
+				err := os.Unsetenv("SIDECAR_GROUP_ID")
+				assert.NoError(t, err)
 			}
-			defer os.Unsetenv("SIDECAR_GROUP_ID")
+			defer os.Unsetenv("SIDECAR_GROUP_ID") // nolint:errcheck
 
 			// Create the fake object generated by counterfeiter
 			fakeSocketPermission := new(ibmcsidriverfakes.FakeSocketPermission)
diff --git a/pkg/ibmcsidriver/server.go b/pkg/ibmcsidriver/server.go
@@ -19,17 +19,18 @@ package ibmcsidriver
 
 import (
 	"errors"
-	csi "github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/golang/glog"
-	"go.uber.org/zap"
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
 	"net"
 	"net/url"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/golang/glog"
+	"go.uber.org/zap"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
 )
 
 // NonBlockingGRPCServer Defines Non blocking GRPC server interfaces
@@ -89,22 +90,23 @@ func (s *nonBlockingGRPCServer) Setup(endpoint string, ids csi.IdentityServer, c
 	u, err := url.Parse(endpoint)
 
 	if err != nil {
-		msg := "Failed to parse endpoint"
+		msg := "failed to parse endpoint"
 		s.logger.Error(msg, zap.Error(err))
 		return nil, err
 	}
 
 	var addr string
-	if u.Scheme == "unix" {
+	switch u.Scheme {
+	case "unix":
 		addr = u.Path
 		if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
-			s.logger.Error("Failed to remove", zap.Reflect("addr", addr), zap.Error(err))
+			s.logger.Error("failed to remove", zap.Reflect("addr", addr), zap.Error(err))
 			return nil, err
 		}
-	} else if u.Scheme == "tcp" {
+	case "tcp":
 		addr = u.Host
-	} else {
-		msg := "Endpoint scheme not supported"
+	case "default":
+		msg := "endpoint scheme not supported"
 		s.logger.Error(msg, zap.Reflect("Scheme", u.Scheme))
 		return nil, errors.New(msg)
 	}
@@ -113,7 +115,7 @@ func (s *nonBlockingGRPCServer) Setup(endpoint string, ids csi.IdentityServer, c
 
 	listener, err := net.Listen(u.Scheme, addr)
 	if err != nil {
-		msg := "Failed to listen GRPC Server"
+		msg := "failed to listen GRPC Server"
 		s.logger.Error(msg, zap.Reflect("Error", err))
 		return nil, errors.New(msg)
 	}
diff --git a/tests/sanity/sanity_test.go b/tests/sanity/sanity_test.go
@@ -336,7 +336,7 @@ func (c *fakeProviderSession) CreateVolumeFromSnapshot(snapshot provider.Snapsho
 // Delete the volume
 func (c *fakeProviderSession) DeleteVolume(vol *provider.Volume) error {
 	for volName, f := range c.volumes {
-		if f.Volume.VolumeID == vol.VolumeID {
+		if f.VolumeID == vol.VolumeID {
 			delete(c.volumes, volName)
 			return nil
 		}
@@ -363,7 +363,7 @@ func (c *fakeProviderSession) ExpandVolume(expandVolumeRequest provider.ExpandVo
 	}
 
 	for _, f := range c.volumes {
-		if f.Volume.VolumeID == volumeID {
+		if f.VolumeID == volumeID {
 			return capacity, nil
 		}
 	}
@@ -373,7 +373,7 @@ func (c *fakeProviderSession) ExpandVolume(expandVolumeRequest provider.ExpandVo
 // Get the volume by using ID  //
 func (c *fakeProviderSession) GetVolume(id string) (*provider.Volume, error) {
 	for _, f := range c.volumes {
-		if f.Volume.VolumeID == id {
+		if f.VolumeID == id {
 			return f.Volume, nil
 		}
 	}
@@ -388,7 +388,7 @@ func (c *fakeProviderSession) GetVolume(id string) (*provider.Volume, error) {
 // Get the volume by using Name
 func (c *fakeProviderSession) GetVolumeByName(name string) (*provider.Volume, error) {
 	for _, f := range c.volumes {
-		if *f.Volume.Name == name {
+		if *f.Name == name {
 			return f.Volume, nil
 		}
 	}
@@ -505,7 +505,7 @@ func (c *fakeProviderSession) GetVolumeAttachment(attachRequest provider.VolumeA
 func (c *fakeProviderSession) CreateSnapshot(sourceVolumeID string, snapshotParameters provider.SnapshotParameters) (*provider.Snapshot, error) {
 	snapshotID := fmt.Sprintf("vol-uuid-test-vol-%s", uuid.New().String()[:10])
 	for _, existingSnapshot := range c.snapshots {
-		if existingSnapshot.Snapshot.SnapshotID == snapshotID && existingSnapshot.Snapshot.VolumeID == sourceVolumeID {
+		if existingSnapshot.SnapshotID == snapshotID && existingSnapshot.VolumeID == sourceVolumeID {
 			return nil, errors.New("snapshot already present for same volume")
 		}
 	}
@@ -550,7 +550,7 @@ func (c *fakeProviderSession) ListSnapshots(maxResults int, nextToken string, ta
 	var snapshots []*provider.Snapshot
 	var retToken string
 	for _, fakeSnapshot := range c.snapshots {
-		if fakeSnapshot.Snapshot.VolumeID == tags["source_volume.id"] || len(tags["source_volume.id"]) == 0 {
+		if fakeSnapshot.VolumeID == tags["source_volume.id"] || len(tags["source_volume.id"]) == 0 {
 			snapshots = append(snapshots, fakeSnapshot.Snapshot)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (csiCS CSIControllerServer) CreateVolume(ctx context.Context, req csi.Cre`
`94`	`94`	`// Create copy of the requestedVolume`
`95`	`95`	`tempReqVol := (*requestedVolume)`
`96`	`96`	`// Mask VolumeEncryptionKey`
`97`		`- tempReqVol.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: "********"}`
	`97`	`+ tempReqVol.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: "********"}`
`98`	`98`	`ctxLogger.Info("Volume request after masking encryption key", zap.Reflect("Volume", tempReqVol))`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func getVolumeParameters(logger zap.Logger, req csi.CreateVolumeRequest, confi`
`108`	`108`	`switch key {`
`109`	`109`	`case Profile:`
`110`	`110`	`if utils.ListContainsSubstr(SupportedProfile, value) {`
`111`		`- volume.VPCVolume.Profile = &provider.Profile{Name: value}`
	`111`	`+ volume.Profile = &provider.Profile{Name: value}`
`112`	`112`	`} else {`
`113`	`113`	`err = fmt.Errorf("%s:<%v> unsupported profile. Supported profiles are: %v", key, value, SupportedProfile)`
`114`	`114`	`}`
`@@ -127,14 +127,14 @@ func getVolumeParameters(logger zap.Logger, req csi.CreateVolumeRequest, confi`
`127`	`127`	`case Tag:`
`128`	`128`	`if len(value) != 0 {`
`129`	`129`	`tagstr := strings.TrimSpace(value)`
`130`		`- volume.VPCVolume.Tags = strings.Split(tagstr, ",")`
	`130`	`+ volume.Tags = strings.Split(tagstr, ",")`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`case ResourceGroup:`
`134`	`134`	`if len(value) > ResourceGroupIDMaxLen {`
`135`	`135`	`err = fmt.Errorf("%s:<%v> exceeds %d chars", key, value, ResourceGroupIDMaxLen)`
`136`	`136`	`}`
`137`		`- volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: value}`
	`137`	`+ volume.ResourceGroup = &provider.ResourceGroup{ID: value}`
`138`	`138`
`139`	`139`	`case BillingType:`
`140`	`140`	`// Its not supported by RIaaS, but this is just information for the user`
`@@ -150,7 +150,7 @@ func getVolumeParameters(logger zap.Logger, req csi.CreateVolumeRequest, confi`
`150`	`150`	`err = fmt.Errorf("%s: exceeds %d bytes", key, EncryptionKeyMaxLen)`
`151`	`151`	`} else {`
`152`	`152`	`if len(value) != 0 {`
`153`		`- volume.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}`
	`153`	`+ volume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`@@ -179,18 +179,18 @@ func getVolumeParameters(logger zap.Logger, req csi.CreateVolumeRequest, confi`
`179`	`179`	`}`
`180`	`180`	`// If encripted is set to false`
`181`	`181`	`if encrypt == FalseStr {`
`182`		`- volume.VPCVolume.VolumeEncryptionKey = nil`
	`182`	`+ volume.VolumeEncryptionKey = nil`
`183`	`183`	`}`
`184`	`184`
`185`		`- if volume.VPCVolume.Profile == nil {`
	`185`	`+ if volume.Profile == nil {`
`186`	`186`	`err = fmt.Errorf("volume profile is empty, you need to pass valid profile name")`
`187`	`187`	`logger.Error("getVolumeParameters", zap.NamedError("InvalidRequest", err))`
`188`	`188`	`return volume, err`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// Get the requested capacity from the request`
`192`	`192`	`capacityRange := req.GetCapacityRange()`
`193`		`- capBytes, err := getRequestedCapacity(capacityRange, volume.VPCVolume.Profile.Name)`
	`193`	`+ capBytes, err := getRequestedCapacity(capacityRange, volume.Profile.Name)`
`194`	`194`	`if err != nil {`
`195`	`195`	`err = fmt.Errorf("invalid PVC capacity size: '%v'", err)`
`196`	`196`	`logger.Error("getVolumeParameters", zap.NamedError("invalid parameter", err))`
`@@ -239,7 +239,7 @@ func getVolumeParameters(logger zap.Logger, req csi.CreateVolumeRequest, confi`
`239`	`239`	`return volume, err`
`240`	`240`	`}`
`241`	`241`
`242`		`- if volume.VPCVolume.Profile != nil && (volume.VPCVolume.Profile.Name != CustomProfile && volume.VPCVolume.Profile.Name != SDPProfile) {`
	`242`	`+ if volume.Profile != nil && (volume.Profile.Name != CustomProfile && volume.Profile.Name != SDPProfile) {`
`243`	`243`	`// Specify IOPS only for custom or SDP class`
`244`	`244`	`volume.Iops = nil`
`245`	`245`	`}`
`@@ -273,7 +273,7 @@ func overrideParams(logger zap.Logger, req csi.CreateVolumeRequest, config *co`
`273`	`273`	`err = fmt.Errorf("%s:<%v> exceeds %d bytes ", key, value, ResourceGroupIDMaxLen)`
`274`	`274`	`} else {`
`275`	`275`	`logger.Info("override", zap.Any(ResourceGroup, value))`
`276`		`- volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: value}`
	`276`	`+ volume.ResourceGroup = &provider.ResourceGroup{ID: value}`
`277`	`277`	`}`
`278`	`278`	`case Encrypted:`
`279`	`279`	`if value != TrueStr && value != FalseStr {`
`@@ -288,15 +288,15 @@ func overrideParams(logger zap.Logger, req csi.CreateVolumeRequest, config *co`
`288`	`288`	`} else {`
`289`	`289`	`if len(value) != 0 {`
`290`	`290`	`logger.Info("override", zap.String("parameter", EncryptionKey))`
`291`		`- volume.VPCVolume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}`
	`291`	`+ volume.VolumeEncryptionKey = &provider.VolumeEncryptionKey{CRN: value}`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`case Tag:`
`295`	`295`	`if len(value) != 0 {`
`296`	`296`	`logger.Info("append", zap.Any(Tag, value))`
`297`	`297`	`tagstr := strings.TrimSpace(value)`
`298`	`298`	`secretTags := strings.Split(tagstr, ",")`
`299`		`- volume.VPCVolume.Tags = append(volume.VPCVolume.Tags, secretTags...)`
	`299`	`+ volume.Tags = append(volume.Tags, secretTags...)`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`case Zone:`
`@@ -327,11 +327,11 @@ func overrideParams(logger zap.Logger, req csi.CreateVolumeRequest, config *co`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`	`// Assign ResourceGroupID from config`
`330`		`- if volume.VPCVolume.ResourceGroup == nil \|\| len(volume.VPCVolume.ResourceGroup.ID) < 1 {`
`331`		`- volume.VPCVolume.ResourceGroup = &provider.ResourceGroup{ID: config.VPC.G2ResourceGroupID}`
	`330`	`+ if volume.ResourceGroup == nil \|\| len(volume.ResourceGroup.ID) < 1 {`
	`331`	`+ volume.ResourceGroup = &provider.ResourceGroup{ID: config.VPC.G2ResourceGroupID}`
`332`	`332`	`}`
`333`	`333`	`if encrypt == FalseStr {`
`334`		`- volume.VPCVolume.VolumeEncryptionKey = nil`
	`334`	`+ volume.VolumeEncryptionKey = nil`
`335`	`335`	`}`
`336`	`336`	`return nil`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ func (c *fakeProviderSession) CreateVolumeFromSnapshot(snapshot provider.Snapsho`
`336`	`336`	`// Delete the volume`
`337`	`337`	`func (c fakeProviderSession) DeleteVolume(vol provider.Volume) error {`
`338`	`338`	`for volName, f := range c.volumes {`
`339`		`- if f.Volume.VolumeID == vol.VolumeID {`
	`339`	`+ if f.VolumeID == vol.VolumeID {`
`340`	`340`	`delete(c.volumes, volName)`
`341`	`341`	`return nil`
`342`	`342`	`}`
`@@ -363,7 +363,7 @@ func (c *fakeProviderSession) ExpandVolume(expandVolumeRequest provider.ExpandVo`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`for _, f := range c.volumes {`
`366`		`- if f.Volume.VolumeID == volumeID {`
	`366`	`+ if f.VolumeID == volumeID {`
`367`	`367`	`return capacity, nil`
`368`	`368`	`}`
`369`	`369`	`}`
`@@ -373,7 +373,7 @@ func (c *fakeProviderSession) ExpandVolume(expandVolumeRequest provider.ExpandVo`
`373`	`373`	`// Get the volume by using ID //`
`374`	`374`	`func (c fakeProviderSession) GetVolume(id string) (provider.Volume, error) {`
`375`	`375`	`for _, f := range c.volumes {`
`376`		`- if f.Volume.VolumeID == id {`
	`376`	`+ if f.VolumeID == id {`
`377`	`377`	`return f.Volume, nil`
`378`	`378`	`}`
`379`	`379`	`}`
`@@ -388,7 +388,7 @@ func (c fakeProviderSession) GetVolume(id string) (provider.Volume, error) {`
`388`	`388`	`// Get the volume by using Name`
`389`	`389`	`func (c fakeProviderSession) GetVolumeByName(name string) (provider.Volume, error) {`
`390`	`390`	`for _, f := range c.volumes {`
`391`		`- if *f.Volume.Name == name {`
	`391`	`+ if *f.Name == name {`
`392`	`392`	`return f.Volume, nil`
`393`	`393`	`}`
`394`	`394`	`}`
`@@ -505,7 +505,7 @@ func (c *fakeProviderSession) GetVolumeAttachment(attachRequest provider.VolumeA`
`505`	`505`	`func (c fakeProviderSession) CreateSnapshot(sourceVolumeID string, snapshotParameters provider.SnapshotParameters) (provider.Snapshot, error) {`
`506`	`506`	`snapshotID := fmt.Sprintf("vol-uuid-test-vol-%s", uuid.New().String()[:10])`
`507`	`507`	`for _, existingSnapshot := range c.snapshots {`
`508`		`- if existingSnapshot.Snapshot.SnapshotID == snapshotID && existingSnapshot.Snapshot.VolumeID == sourceVolumeID {`
	`508`	`+ if existingSnapshot.SnapshotID == snapshotID && existingSnapshot.VolumeID == sourceVolumeID {`
`509`	`509`	`return nil, errors.New("snapshot already present for same volume")`
`510`	`510`	`}`
`511`	`511`	`}`
`@@ -550,7 +550,7 @@ func (c *fakeProviderSession) ListSnapshots(maxResults int, nextToken string, ta`
`550`	`550`	`var snapshots []*provider.Snapshot`
`551`	`551`	`var retToken string`
`552`	`552`	`for _, fakeSnapshot := range c.snapshots {`
`553`		`- if fakeSnapshot.Snapshot.VolumeID == tags["source_volume.id"] \|\| len(tags["source_volume.id"]) == 0 {`
	`553`	`+ if fakeSnapshot.VolumeID == tags["source_volume.id"] \|\| len(tags["source_volume.id"]) == 0 {`
`554`	`554`	`snapshots = append(snapshots, fakeSnapshot.Snapshot)`
`555`	`555`	`}`
`556`	`556`	`}`