chore: resolve golangci-lint issues

ekristen · Apr 23, 2024 · 53967b2 · 53967b2
1 parent 40ff152
commit 53967b2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/resources/elasticache-memcacheclusters.go b/resources/elasticache-memcacheclusters.go
@@ -2,15 +2,16 @@ package resources
 
 import (
 	"context"
-	"github.com/aws/aws-sdk-go/service/elasticache/elasticacheiface"
-	"github.com/ekristen/libnuke/pkg/types"
+
 	"github.com/sirupsen/logrus"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elasticache"
+	"github.com/aws/aws-sdk-go/service/elasticache/elasticacheiface"
 
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
+	"github.com/ekristen/libnuke/pkg/types"
 
 	"github.com/ekristen/aws-nuke/pkg/nuke"
 )

diff --git a/resources/elasticache-memcacheclusters_mock_test.go b/resources/elasticache-memcacheclusters_mock_test.go
@@ -1,13 +1,17 @@
 package resources
 
 import (
+	"context"
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elasticache"
+
 	"github.com/ekristen/aws-nuke/mocks/mock_elasticacheiface"
 	"github.com/ekristen/aws-nuke/pkg/nuke"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Mock_ElastiCache_CacheCluster_Remove(t *testing.T) {
@@ -26,7 +30,7 @@ func Test_Mock_ElastiCache_CacheCluster_Remove(t *testing.T) {
 		CacheClusterId: aws.String("foobar"),
 	}).Return(&elasticache.DeleteCacheClusterOutput{}, nil)
 
-	err := cacheCluster.Remove(nil)
+	err := cacheCluster.Remove(context.TODO())
 	a.Nil(err)
 }
 
@@ -54,7 +58,7 @@ func Test_Mock_ElastiCache_CacheCluster_List_NoTags(t *testing.T) {
 		ResourceName: aws.String("foobar"),
 	}).Return(&elasticache.TagListMessage{}, nil)
 
-	resources, err := cacheClusterLister.List(nil, &nuke.ListerOpts{})
+	resources, err := cacheClusterLister.List(context.TODO(), &nuke.ListerOpts{})
 	a.Nil(err)
 	a.Len(resources, 1)
 
@@ -96,7 +100,7 @@ func Test_Mock_ElastiCache_CacheCluster_List_WithTags(t *testing.T) {
 		},
 	}, nil)
 
-	resources, err := cacheClusterLister.List(nil, &nuke.ListerOpts{})
+	resources, err := cacheClusterLister.List(context.TODO(), &nuke.ListerOpts{})
 	a.Nil(err)
 	a.Len(resources, 1)
 
@@ -105,5 +109,4 @@ func Test_Mock_ElastiCache_CacheCluster_List_WithTags(t *testing.T) {
 	a.Equal("foobar", resource.String())
 	a.Equal("foobar", resource.Properties().Get("tag:Name"))
 	a.Equal("test", resource.Properties().Get("tag:aws-nuke"))
-
 }
diff --git a/resources/elasticache-subnetgroups.go b/resources/elasticache-subnetgroups.go
@@ -3,16 +3,17 @@ package resources
 import (
 	"context"
 	"fmt"
-	"github.com/aws/aws-sdk-go/service/elasticache/elasticacheiface"
-	"github.com/ekristen/libnuke/pkg/types"
-	"github.com/sirupsen/logrus"
 	"strings"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elasticache"
+	"github.com/aws/aws-sdk-go/service/elasticache/elasticacheiface"
 
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
+	"github.com/ekristen/libnuke/pkg/types"
 
 	"github.com/ekristen/aws-nuke/pkg/nuke"
 )

diff --git a/resources/elasticache-subnetgroups_mock_test.go b/resources/elasticache-subnetgroups_mock_test.go
@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"context"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -25,9 +26,11 @@ func Test_Mock_ElastiCache_SubnetGroup_Remove(t *testing.T) {
 		name: aws.String("foobar"),
 	}
 
-	mockElastiCache.EXPECT().DeleteCacheSubnetGroup(gomock.Any()).Return(&elasticache.DeleteCacheSubnetGroupOutput{}, nil)
+	mockElastiCache.EXPECT().DeleteCacheSubnetGroup(&elasticache.DeleteCacheSubnetGroupInput{
+		CacheSubnetGroupName: aws.String("foobar"),
+	}).Return(&elasticache.DeleteCacheSubnetGroupOutput{}, nil)
 
-	err := subnetGroup.Remove(nil)
+	err := subnetGroup.Remove(context.TODO())
 	a.Nil(err)
 	a.Equal("foobar", *subnetGroup.name)
 }
@@ -55,7 +58,7 @@ func Test_Mock_ElastiCache_SubnetGroup_List_NoTags(t *testing.T) {
 		ResourceName: aws.String("foobar"),
 	}).Return(&elasticache.TagListMessage{}, nil)
 
-	resources, err := subnetGroupsLister.List(nil, &nuke.ListerOpts{})
+	resources, err := subnetGroupsLister.List(context.TODO(), &nuke.ListerOpts{})
 	a.Nil(err)
 	a.Len(resources, 1)
 
@@ -99,7 +102,7 @@ func Test_Mock_ElastiCache_SubnetGroup_List_WithTags(t *testing.T) {
 		},
 	}, nil)
 
-	resources, err := subnetGroupsLister.List(nil, &nuke.ListerOpts{})
+	resources, err := subnetGroupsLister.List(context.TODO(), &nuke.ListerOpts{})
 	a.Nil(err)
 
 	a.Len(resources, 1)