Skip to content

Commit d56e08b

Browse files
cPu1cPu1
committed
Remove redundant func
1 parent 253a7e7 commit d56e08b

File tree

2 files changed

+15
-26
lines changed

2 files changed

+15
-26
lines changed

‎pkg/ami/auto_resolver_test.go‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/stretchr/testify/mock"
99
. "github.com/weaveworks/eksctl/pkg/ami"
1010
api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
11-
"github.com/weaveworks/eksctl/pkg/eks"
1211
"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
1312
)
1413

@@ -77,7 +76,7 @@ var _ = Describe("AMI Auto Resolution", func() {
7776
BeforeEach(func() {
7877
imageState = "available"
7978

80-
_, p = createProviders()
79+
p = mockprovider.NewMockProvider()
8180
addMockDescribeImages(p, "amazon-eks-node-1.15-v*", expectedAmi, imageState, "2018-08-20T23:25:53.000Z", api.NodeImageFamilyAmazonLinux2)
8281
resolver := NewAutoResolver(p.MockEC2())
8382
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -101,7 +100,7 @@ var _ = Describe("AMI Auto Resolution", func() {
101100
imageState = "available"
102101
imageFamily = "Ubuntu1804"
103102

104-
_, p = createProviders()
103+
p = mockprovider.NewMockProvider()
105104
addMockDescribeImages(p, "ubuntu-eks/k8s_1.15/images/*18.04*", expectedAmi, imageState, "2018-08-20T23:25:53.000Z", api.NodeImageFamilyUbuntu1804)
106105

107106
resolver := NewAutoResolver(p.MockEC2())
@@ -125,7 +124,7 @@ var _ = Describe("AMI Auto Resolution", func() {
125124
BeforeEach(func() {
126125
imageState = "pending"
127126

128-
_, p = createProviders()
127+
p = mockprovider.NewMockProvider()
129128
addMockDescribeImagesMultiple(p, "amazon-eks-node-1.15-v*", []returnAmi{})
130129

131130
resolver := NewAutoResolver(p.MockEC2())
@@ -150,7 +149,7 @@ var _ = Describe("AMI Auto Resolution", func() {
150149
imageState = "available"
151150
expectedAmi = "ami-5678"
152151

153-
_, p = createProviders()
152+
p = mockprovider.NewMockProvider()
154153
images := []returnAmi{
155154
{
156155
createdDate: "2018-08-20T23:25:53.000Z",
@@ -193,7 +192,7 @@ var _ = Describe("AMI Auto Resolution", func() {
193192
BeforeEach(func() {
194193
imageState = "available"
195194

196-
_, p = createProviders()
195+
p = mockprovider.NewMockProvider()
197196
addMockDescribeImages(p, "amazon-eks-gpu-node-1.15-*", expectedAmi, imageState, "2018-08-20T23:25:53.000Z", api.NodeImageFamilyAmazonLinux2)
198197
resolver := NewAutoResolver(p.MockEC2())
199198
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -216,16 +215,6 @@ var _ = Describe("AMI Auto Resolution", func() {
216215
})
217216
})
218217

219-
func createProviders() (*eks.ClusterProvider, *mockprovider.MockProvider) {
220-
p := mockprovider.NewMockProvider()
221-
222-
c := &eks.ClusterProvider{
223-
Provider: p,
224-
}
225-
226-
return c, p
227-
}
228-
229218
func addMockDescribeImages(p *mockprovider.MockProvider, expectedNamePattern string, amiID string, amiState string, createdDate string, instanceFamily string) {
230219
p.MockEC2().On("DescribeImages",
231220
mock.MatchedBy(func(input *ec2.DescribeImagesInput) bool {

‎pkg/ami/ssm_resolver_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var _ = Describe("AMI Auto Resolution", func() {
4646
Context("and AL2 ami is available", func() {
4747
BeforeEach(func() {
4848

49-
_, p = createProviders()
49+
p = mockprovider.NewMockProvider()
5050
addMockGetParameter(p, "/aws/service/eks/optimized-ami/1.12/amazon-linux-2/recommended/image_id", expectedAmi)
5151
resolver := NewSSMResolver(p.MockSSM())
5252
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -68,7 +68,7 @@ var _ = Describe("AMI Auto Resolution", func() {
6868
Context("and ami is NOT available", func() {
6969
BeforeEach(func() {
7070

71-
_, p = createProviders()
71+
p = mockprovider.NewMockProvider()
7272
addMockFailedGetParameter(p, "/aws/service/eks/optimized-ami/1.12/amazon-linux-2/recommended/image_id")
7373

7474
resolver := NewSSMResolver(p.MockSSM())
@@ -98,7 +98,7 @@ var _ = Describe("AMI Auto Resolution", func() {
9898
Context("and ami is available", func() {
9999
BeforeEach(func() {
100100

101-
_, p = createProviders()
101+
p = mockprovider.NewMockProvider()
102102
addMockGetParameter(p, "/aws/service/eks/optimized-ami/1.12/amazon-linux-2-gpu/recommended/image_id", expectedAmi)
103103
resolver := NewSSMResolver(p.MockSSM())
104104
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -126,7 +126,7 @@ var _ = Describe("AMI Auto Resolution", func() {
126126
Context("and ami is available", func() {
127127
BeforeEach(func() {
128128
version = "1.14"
129-
_, p = createProviders()
129+
p = mockprovider.NewMockProvider()
130130
})
131131

132132
It("should return a valid Full image for 1.14", func() {
@@ -164,7 +164,7 @@ var _ = Describe("AMI Auto Resolution", func() {
164164

165165
Context("and Ubuntu family", func() {
166166
BeforeEach(func() {
167-
_, p = createProviders()
167+
p = mockprovider.NewMockProvider()
168168
})
169169

170170
It("should return an error", func() {
@@ -184,7 +184,7 @@ var _ = Describe("AMI Auto Resolution", func() {
184184

185185
Context("and ami is available", func() {
186186
BeforeEach(func() {
187-
_, p = createProviders()
187+
p = mockprovider.NewMockProvider()
188188
addMockGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.15/x86_64/latest/image_id", expectedAmi)
189189
resolver := NewSSMResolver(p.MockSSM())
190190
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -205,7 +205,7 @@ var _ = Describe("AMI Auto Resolution", func() {
205205

206206
Context("and ami is NOT available", func() {
207207
BeforeEach(func() {
208-
_, p = createProviders()
208+
p = mockprovider.NewMockProvider()
209209
addMockFailedGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.15/x86_64/latest/image_id")
210210

211211
resolver := NewSSMResolver(p.MockSSM())
@@ -233,7 +233,7 @@ var _ = Describe("AMI Auto Resolution", func() {
233233

234234
Context("and ami is available", func() {
235235
BeforeEach(func() {
236-
_, p = createProviders()
236+
p = mockprovider.NewMockProvider()
237237
addMockGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.15/arm64/latest/image_id", expectedAmi)
238238
resolver := NewSSMResolver(p.MockSSM())
239239
resolvedAmi, err = resolver.Resolve(region, version, instanceType, imageFamily)
@@ -254,7 +254,7 @@ var _ = Describe("AMI Auto Resolution", func() {
254254

255255
Context("and ami is NOT available", func() {
256256
BeforeEach(func() {
257-
_, p = createProviders()
257+
p = mockprovider.NewMockProvider()
258258
addMockFailedGetParameter(p, "/aws/service/bottlerocket/aws-k8s-1.15/arm64/latest/image_id")
259259

260260
resolver := NewSSMResolver(p.MockSSM())
@@ -289,7 +289,7 @@ var _ = Describe("AMI Auto Resolution", func() {
289289
}
290290

291291
DescribeTable("GPU AMI support", func(e gpuAMIEntry) {
292-
_, mockProvider := createProviders()
292+
mockProvider := mockprovider.NewMockProvider()
293293
mockProvider.MockSSM().On("GetParameter", mock.Anything).
294294
Return(&ssm.GetParameterOutput{
295295
Parameter: &ssm.Parameter{

0 commit comments

Comments
 (0)