diff --git a/go.mod b/go.mod index a05f873131..315b482f09 100644 --- a/go.mod +++ b/go.mod @@ -11,16 +11,16 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20230601180523-74e721cb8c1e github.com/aws/aws-sdk-go v1.51.16 - github.com/aws/aws-sdk-go-v2 v1.27.1 + github.com/aws/aws-sdk-go-v2 v1.30.0 github.com/aws/aws-sdk-go-v2/config v1.27.11 github.com/aws/aws-sdk-go-v2/credentials v1.17.11 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.50.0 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.39.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.35.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.36.3 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.43.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.24.4 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5 github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 @@ -127,11 +127,11 @@ require ( github.com/atotto/clipboard v0.1.4 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.8 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.8 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect diff --git a/go.sum b/go.sum index 21aaa45831..eec6887cb6 100644 --- a/go.sum +++ b/go.sum @@ -716,8 +716,8 @@ github.com/aws/amazon-ec2-instance-selector/v2 v2.4.2-0.20230601180523-74e721cb8 github.com/aws/aws-sdk-go v1.51.16 h1:vnWKK8KjbftEkuPX8bRj3WHsLy1uhotn0eXptpvrxJI= github.com/aws/aws-sdk-go v1.51.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.16.15/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k= -github.com/aws/aws-sdk-go-v2 v1.27.1 h1:xypCL2owhog46iFxBKKpBcw+bPTX/RJzwNj8uSilENw= -github.com/aws/aws-sdk-go-v2 v1.27.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= +github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA= @@ -727,27 +727,27 @@ github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.22/go.mod h1:/vNv5Al0bpiF8YdX2Ov6Xy05VTiXsql94yUqJMYaj0w= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.8 h1:RnLB7p6aaFMRfyQkD6ckxR7myCC9SABIqSz4czYUUbU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.8/go.mod h1:XH7dQJd+56wEbP1I4e4Duo+QhSMxNArE8VP7NuUOTeM= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 h1:SJ04WXGTwnHlWIODtC5kJzKbeuHt+OUNOgKg7nfnUGw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12/go.mod h1:FkpvXhA92gb3GE9LD6Og0pHHycTxW7xGpnEh5E7Opwo= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.16/go.mod h1:62dsXI0BqTIGomDl8Hpm33dv0OntGaVblri3ZRParVQ= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.8 h1:jzApk2f58L9yW9q1GEab3BMMFWUkkiZhyrRUtbwUbKU= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.8/go.mod h1:WqO+FftfO3tGePUtQxPXM6iODVfqMwsVMgTbG/ZXIdQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 h1:hb5KgeYfObi5MHkSSZMEudnIvX30iB+E21evI4r6BnQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12/go.mod h1:CroKe/eWJdyfy9Vx4rljP5wTUjNJfb+fPz1uMYUhEGM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5 h1:vhdJymxlWS2qftzLiuCjSswjXBRLGfzo/BEE9LDveBA= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5/go.mod h1:ZErgk/bPaaZIpj+lUWGlwI1A0UFhSIscgnCPzTLnb2s= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.50.0 h1:Ap5tOJfeAH1hO2UQc3X3uMlwP7uryFeZXMvZCXIlLSE= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.50.0/go.mod h1:/v2KYdCW4BaHKayenaWEXOOdxItIwEA3oU0XzuQY3F0= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1 h1:Ts+mCjOtt8o2k2vnWnX/0sE0eSmEVWBvfJkNrNMQlAo= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.52.1/go.mod h1:IrWhabzdTEc651GAq7rgst/SYcEqqcD7Avr82m28AAU= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.39.2 h1:svl3DNKWpcLOlz+bFzmOxGp8gcbvSZ6m2t44Zzaet9U= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.39.2/go.mod h1:gAJs+mKIoK4JTQD1KMZtHgyBRZ8S6Oy5+qjJzoDAvbE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.35.1 h1:suWu59CRsDNhw2YXPpa6drYEetIUUIMUhkzHmucbCf8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.35.1/go.mod h1:tZiRxrv5yBRgZ9Z4OOOxwscAZRFk5DgYhEcjX1QpvgI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.36.3 h1:JNWpkjImTP2e308bv7ihfwgOawf640BY/pyZWrBb9rw= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.36.3/go.mod h1:TiLZ2/+WAEyG2PnuAYj/un46UJ7qBf5BWWTAKgaHP8I= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0 h1:TFK9GeUINErClL2+A+GLYhjiChVdaXCgIUiCsS/UQrE= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0/go.mod h1:xejKuuRDjz6z5OqyeLsz01MlOqqW7CqpAB4PabNvpu8= -github.com/aws/aws-sdk-go-v2/service/eks v1.43.0 h1:TRgA51vdnrXiZpCab7pQT0bF52rX5idH0/fzrIVnQS0= -github.com/aws/aws-sdk-go-v2/service/eks v1.43.0/go.mod h1:875ZmajQCZ9N7HeR1DE25nTSaalkqGYzQa+BxLattlQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0 h1:FDZVMxzXB13cRmHs3t3tH9gme8GhvmjsQXeXFI37OHU= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1 h1:onUAzZXDsyXzyrmOGw/9p8Csl1NZkTDEs4URZ8covUY= +github.com/aws/aws-sdk-go-v2/service/eks v1.44.1/go.mod h1:dg9l/W4hXygeRNydRB4LWKY/MwHJhfUomGJUBwI29Dw= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.24.4 h1:V5YvSMQwZklktzYeOOhYdptx7rP650XP3RnxwNu1UEQ= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.24.4/go.mod h1:aYygRYqRxmLGrxRxAisgNarwo4x8bcJG14rh4r57VqE= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5 h1:/x2u/TOx+n17U+gz98TOw1HKJom0EOqrhL4SjrHr0cQ= @@ -756,8 +756,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 h1:ZNlfPdw849gBo/lvLFbEEvpTJMij github.com/aws/aws-sdk-go-v2/service/iam v1.32.0/go.mod h1:aXWImQV0uTW35LM0A/T4wEg6R1/ReXUu4SM6/lUHYK0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= github.com/aws/aws-sdk-go-v2/service/kms v1.27.5 h1:7lKTr8zJ2nVaVgyII+7hUayTi7xWedMuANiNVXiD2S8= github.com/aws/aws-sdk-go-v2/service/kms v1.27.5/go.mod h1:D9FVDkZjkZnnFHymJ3fPVz0zOUlNSd0xcIIVmmrAac8= github.com/aws/aws-sdk-go-v2/service/outposts v1.38.0 h1:e4uIyH2aMFUtUaHjO/NCNBkXdxBBJj3OnSM5pMo5i0s= diff --git a/pkg/actions/cluster/get_test.go b/pkg/actions/cluster/get_test.go index d015bb5c0e..fe8c908703 100644 --- a/pkg/actions/cluster/get_test.go +++ b/pkg/actions/cluster/get_test.go @@ -49,7 +49,7 @@ var _ = Describe("Get", func() { intialProvider.MockEKS().On("ListClusters", mock.Anything, &awseks.ListClustersInput{ MaxResults: aws.Int32(100), Include: []string{"all"}, - }).Return(&awseks.ListClustersOutput{ + }, mock.Anything).Return(&awseks.ListClustersOutput{ Clusters: []string{"cluster1", "cluster2", "cluster3"}, }, nil) @@ -110,7 +110,7 @@ var _ = Describe("Get", func() { intialProvider.MockEKS().On("ListClusters", mock.Anything, &awseks.ListClustersInput{ MaxResults: aws.Int32(100), Include: []string{"all"}, - }).Return(nil, fmt.Errorf("foo")) + }, mock.Anything).Return(nil, fmt.Errorf("foo")) }) It("errors", func() { @@ -158,14 +158,14 @@ var _ = Describe("Get", func() { providerRegion1.MockEKS().On("ListClusters", mock.Anything, &awseks.ListClustersInput{ MaxResults: aws.Int32(100), Include: []string{"all"}, - }).Return(&awseks.ListClustersOutput{ + }, mock.Anything).Return(&awseks.ListClustersOutput{ Clusters: []string{"cluster1"}, }, nil) providerRegion2.MockEKS().On("ListClusters", mock.Anything, &awseks.ListClustersInput{ MaxResults: aws.Int32(100), Include: []string{"all"}, - }).Return(&awseks.ListClustersOutput{ + }, mock.Anything).Return(&awseks.ListClustersOutput{ Clusters: []string{"cluster2"}, }, nil) @@ -242,7 +242,7 @@ var _ = Describe("Get", func() { providerRegion1.MockEKS().On("ListClusters", mock.Anything, &awseks.ListClustersInput{ MaxResults: aws.Int32(100), Include: []string{"all"}, - }).Return(&awseks.ListClustersOutput{ + }, mock.Anything).Return(&awseks.ListClustersOutput{ Clusters: []string{"cluster1"}, }, nil) diff --git a/pkg/actions/cluster/owned_test.go b/pkg/actions/cluster/owned_test.go index a84fcefb22..3c95a5649f 100644 --- a/pkg/actions/cluster/owned_test.go +++ b/pkg/actions/cluster/owned_test.go @@ -97,7 +97,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.NewTasksToDeleteClusterWithNodeGroupsReturns(&tasks.TaskTree{ Tasks: []tasks.Task{&tasks.GenericTask{Doer: func() error { @@ -174,7 +174,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.NewTasksToDeleteClusterWithNodeGroupsReturns(&tasks.TaskTree{ Tasks: []tasks.Task{}, @@ -239,7 +239,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.NewTasksToDeleteClusterWithNodeGroupsReturns(&tasks.TaskTree{ Tasks: []tasks.Task{}, @@ -306,7 +306,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.NewTasksToDeleteClusterWithNodeGroupsReturns(&tasks.TaskTree{ Tasks: []tasks.Task{&tasks.GenericTask{Doer: func() error { diff --git a/pkg/actions/cluster/unowned_test.go b/pkg/actions/cluster/unowned_test.go index 53a13ce409..f4bf5ee3ab 100644 --- a/pkg/actions/cluster/unowned_test.go +++ b/pkg/actions/cluster/unowned_test.go @@ -116,7 +116,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.GetFargateStackReturns(&types.Stack{StackName: aws.String("fargate-role")}, nil) fakeStackManager.DeleteStackBySpecReturns(nil, nil) @@ -205,7 +205,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.GetFargateStackReturns(nil, nil) fakeStackManager.DeleteStackBySpecReturns(nil, nil) @@ -308,7 +308,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) fakeStackManager.GetFargateStackReturns(nil, nil) fakeStackManager.DeleteStackBySpecReturns(nil, nil) @@ -391,7 +391,7 @@ var _ = Describe("Delete", func() { p.MockEC2().On("DescribeKeyPairs", mock.Anything, mock.Anything).Return(&ec2.DescribeKeyPairsOutput{}, nil) - p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) + p.MockEC2().On("DescribeSecurityGroups", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSecurityGroupsOutput{}, nil) p.MockEKS().On("ListNodegroups", mock.Anything, mock.Anything).Return(&awseks.ListNodegroupsOutput{ Nodegroups: []string{"ng-1", "ng-2"}, diff --git a/pkg/actions/nodegroup/create_test.go b/pkg/actions/nodegroup/create_test.go index 0d511089d7..482b59f00d 100644 --- a/pkg/actions/nodegroup/create_test.go +++ b/pkg/actions/nodegroup/create_test.go @@ -168,7 +168,7 @@ var _ = DescribeTable("Create", func(t ngEntry) { mockCalls: func(m mockCalls) { m.kubeProvider.NewRawClientReturns(&kubernetes.RawClient{}, nil) m.kubeProvider.ServerVersionReturns("1.17", nil) - m.mockProvider.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + m.mockProvider.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cftypes.StackSummary{ { StackName: aws.String("eksctl-my-cluster-cluster"), @@ -854,7 +854,7 @@ func mockProviderWithVPCSubnets(p *mockprovider.MockProvider, subnets *vpcSubnet } func mockProviderWithConfig(p *mockprovider.MockProvider, describeStacksOutput []cftypes.Output, subnets *vpcSubnets, vpcConfigRes *ekstypes.VpcConfigResponse, outpostConfig *ekstypes.OutpostConfigResponse, accessConfig *ekstypes.AccessConfigResponse) { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cftypes.StackSummary{ { StackName: aws.String("eksctl-my-cluster-cluster"), @@ -986,7 +986,7 @@ func mockProviderWithConfig(p *mockprovider.MockProvider, describeStacksOutput [ if vpcID == "" { mp.MockEC2().On("DescribeSubnets", mock.Anything, &ec2.DescribeSubnetsInput{ SubnetIds: subnetIDs, - }).Return(&ec2.DescribeSubnetsOutput{Subnets: subnets}, nil) + }, mock.Anything).Return(&ec2.DescribeSubnetsOutput{Subnets: subnets}, nil) return } mp.MockEC2().On("DescribeSubnets", mock.Anything, &ec2.DescribeSubnetsInput{ @@ -996,7 +996,7 @@ func mockProviderWithConfig(p *mockprovider.MockProvider, describeStacksOutput [ Values: []string{vpcID}, }, }, - }).Return(&ec2.DescribeSubnetsOutput{Subnets: subnets}, nil) + }, mock.Anything).Return(&ec2.DescribeSubnetsOutput{Subnets: subnets}, nil) } mockDescribeSubnets(p, "", subnets.publicIDs) @@ -1021,7 +1021,7 @@ func mockProviderWithConfig(p *mockprovider.MockProvider, describeStacksOutput [ func mockProviderForUnownedCluster(p *mockprovider.MockProvider, k *eksfakes.FakeKubeProvider, extraSGRules ...ec2types.SecurityGroupRule) { k.NewRawClientReturns(&kubernetes.RawClient{}, nil) k.ServerVersionReturns("1.27", nil) - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cftypes.StackSummary{ { StackName: aws.String("eksctl-my-cluster-cluster"), @@ -1052,7 +1052,7 @@ func mockProviderForUnownedCluster(p *mockprovider.MockProvider, k *eksfakes.Fak }, }, }, nil) - p.MockEC2().On("DescribeSubnets", mock.Anything, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ + p.MockEC2().On("DescribeSubnets", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ { SubnetId: aws.String("subnet-custom1"), @@ -1076,7 +1076,7 @@ func mockProviderForUnownedCluster(p *mockprovider.MockProvider, k *eksfakes.Fak } filter := input.Filters[0] return *filter.Name == "group-id" && len(filter.Values) == 1 && filter.Values[0] == *sgID - })).Return(&ec2.DescribeSecurityGroupRulesOutput{ + }), mock.Anything).Return(&ec2.DescribeSecurityGroupRulesOutput{ SecurityGroupRules: append([]ec2types.SecurityGroupRule{ { Description: aws.String("Allow control plane to communicate with worker nodes in group ng-1 (kubelet and workload TCP ports"), diff --git a/pkg/actions/podidentityassociation/addon_migrator_test.go b/pkg/actions/podidentityassociation/addon_migrator_test.go index 7bb1fbe7a3..d797fe2c7a 100644 --- a/pkg/actions/podidentityassociation/addon_migrator_test.go +++ b/pkg/actions/podidentityassociation/addon_migrator_test.go @@ -46,7 +46,7 @@ var _ = Describe("Addon Migration", func() { mockAddonCalls := func(eksAddonsAPI *mocksv2.EKS) { eksAddonsAPI.On("ListAddons", mock.Anything, &eks.ListAddonsInput{ ClusterName: aws.String(clusterName), - }).Return(&eks.ListAddonsOutput{ + }, mock.Anything).Return(&eks.ListAddonsOutput{ Addons: []string{"vpc-cni"}, }, nil) eksAddonsAPI.On("DescribeAddon", mock.Anything, &eks.DescribeAddonInput{ diff --git a/pkg/actions/podidentityassociation/migrator_test.go b/pkg/actions/podidentityassociation/migrator_test.go index bb54a7a095..b1adf80e7a 100644 --- a/pkg/actions/podidentityassociation/migrator_test.go +++ b/pkg/actions/podidentityassociation/migrator_test.go @@ -96,7 +96,7 @@ var _ = Describe("Create", func() { mockProvider = mockprovider.NewMockProvider() mockProvider.MockEKS().On("ListAddons", mock.Anything, &awseks.ListAddonsInput{ ClusterName: aws.String(clusterName), - }).Return(&awseks.ListAddonsOutput{}, nil) + }, mock.Anything).Return(&awseks.ListAddonsOutput{}, nil) if e.mockEKS != nil { e.mockEKS(mockProvider) } diff --git a/pkg/az/az_test.go b/pkg/az/az_test.go index 919be08598..f3b082336a 100644 --- a/pkg/az/az_test.go +++ b/pkg/az/az_test.go @@ -215,7 +215,7 @@ var _ = Describe("AZ", func() { }, LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), - }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ NextToken: aws.String("token"), InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { @@ -249,7 +249,7 @@ var _ = Describe("AZ", func() { LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), NextToken: aws.String("token"), - }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.medium", diff --git a/pkg/cfn/builder/nodegroup_subnets_test.go b/pkg/cfn/builder/nodegroup_subnets_test.go index 8eeb3c19a7..75b13a1a6a 100644 --- a/pkg/cfn/builder/nodegroup_subnets_test.go +++ b/pkg/cfn/builder/nodegroup_subnets_test.go @@ -267,7 +267,7 @@ var _ = Describe("AssignSubnets", func() { } }, updateEC2Mocks: func(e *mocksv2.EC2) { - e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything). + e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything, mock.Anything). Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { @@ -321,7 +321,7 @@ var _ = Describe("AssignSubnets", func() { } }, updateEC2Mocks: func(e *mocksv2.EC2) { - e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything). + e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything, mock.Anything). Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { @@ -375,7 +375,7 @@ var _ = Describe("AssignSubnets", func() { } }, updateEC2Mocks: func(e *mocksv2.EC2) { - e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything). + e.On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything, mock.Anything). Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { @@ -472,7 +472,7 @@ func mockDescribeSubnets(ec2Mock *mocksv2.EC2, zoneName, vpcID string) { } func mockDescribeSubnetsWithOutpost(ec2Mock *mocksv2.EC2, zoneName, vpcID string, outpostARN *string) { - ec2Mock.On("DescribeSubnets", mock.Anything, mock.Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { + ec2Mock.On("DescribeSubnets", mock.Anything, mock.Anything, mock.Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { return &ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ { @@ -559,7 +559,7 @@ func mockSubnetsAndAZInstanceSupport( AvailabilityZones: azs, }, nil) provider.MockEC2(). - On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything). + On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything, mock.Anything). Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: offerings, }, nil) diff --git a/pkg/cfn/builder/vpc_endpoint_test.go b/pkg/cfn/builder/vpc_endpoint_test.go index 24b1ee4e78..4d222b89f1 100644 --- a/pkg/cfn/builder/vpc_endpoint_test.go +++ b/pkg/cfn/builder/vpc_endpoint_test.go @@ -281,7 +281,7 @@ var _ = Describe("VPC Endpoint Builder", func() { } provider.MockEC2().On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(output, nil) + }), mock.Anything).Return(output, nil) return provider }, err: "subnets must be associated with a non-main route table", @@ -440,7 +440,7 @@ func mockDescribeRouteTables(provider *mockprovider.MockProvider, subnetIDs []st provider.MockEC2().On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(output, nil) + }), mock.Anything).Return(output, nil) } func mockDescribeRouteTablesSame(provider *mockprovider.MockProvider, subnetIDs []string) { @@ -466,7 +466,7 @@ func mockDescribeRouteTablesSame(provider *mockprovider.MockProvider, subnetIDs provider.MockEC2().On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(output, nil) + }), mock.Anything).Return(output, nil) } func makeZones(region string, count int) []string { diff --git a/pkg/cfn/builder/vpc_existing_test.go b/pkg/cfn/builder/vpc_existing_test.go index 39978f1b50..180bf4cbc8 100644 --- a/pkg/cfn/builder/vpc_existing_test.go +++ b/pkg/cfn/builder/vpc_existing_test.go @@ -222,7 +222,7 @@ var _ = Describe("Existing VPC", func() { mockEC2.On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(mockResultFn, nil) + }), mock.Anything).Return(mockResultFn, nil) }) It("the private subnet resource values are loaded into the VPCResource with route table association", func() { @@ -245,7 +245,7 @@ var _ = Describe("Existing VPC", func() { rtOutput.RouteTables[0].Associations[0].Main = aws.Bool(true) mockEC2.On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(rtOutput, nil) + }), mock.Anything).Return(rtOutput, nil) }) It("returns an error", func() { @@ -258,7 +258,7 @@ var _ = Describe("Existing VPC", func() { rtOutput.RouteTables[0].Associations[0].SubnetId = aws.String("fake") mockEC2.On("DescribeRouteTables", mock.Anything, mock.MatchedBy(func(input *ec2.DescribeRouteTablesInput) bool { return len(input.Filters) > 0 - })).Return(rtOutput, nil) + }), mock.Anything).Return(rtOutput, nil) }) It("returns an error", func() { diff --git a/pkg/cfn/manager/api_test.go b/pkg/cfn/manager/api_test.go index cf650271a3..d6e3b6d574 100644 --- a/pkg/cfn/manager/api_test.go +++ b/pkg/cfn/manager/api_test.go @@ -403,7 +403,7 @@ var _ = Describe("StackCollection", func() { }) It("can retrieve stacks", func() { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cfn.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cfn.ListStacksOutput{ StackSummaries: []types.StackSummary{ { StackName: &stackNameWithEksctl, @@ -418,7 +418,7 @@ var _ = Describe("StackCollection", func() { When("the config stack doesn't match", func() { It("returns no stack", func() { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cfn.ListStacksOutput{}, nil) + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cfn.ListStacksOutput{}, nil) cfg.Metadata.Name = "not-this" sm := NewStackCollection(p, cfg) stack, err := sm.GetClusterStackIfExists(context.Background()) @@ -429,7 +429,7 @@ var _ = Describe("StackCollection", func() { When("ListStacks errors", func() { It("errors", func() { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(nil, errors.New("nope")) + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("nope")) sm := NewStackCollection(p, cfg) _, err := sm.GetClusterStackIfExists(context.Background()) Expect(err).To(MatchError(ContainSubstring("nope"))) diff --git a/pkg/cfn/manager/tasks_test.go b/pkg/cfn/manager/tasks_test.go index ea81694ae8..9744c3b1ee 100644 --- a/pkg/cfn/manager/tasks_test.go +++ b/pkg/cfn/manager/tasks_test.go @@ -203,7 +203,7 @@ var _ = Describe("StackCollection Tasks", func() { stackManager = NewStackCollection(p, cfg) }) It("returns an error", func() { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{}, nil) + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{}, nil) ng := api.NewManagedNodeGroup() fakeVPCImporter := new(vpcfakes.FakeImporter) tasks := stackManager.NewManagedNodeGroupTask(context.Background(), []*api.ManagedNodeGroup{ng}, false, fakeVPCImporter) @@ -213,7 +213,7 @@ var _ = Describe("StackCollection Tasks", func() { }) When("finding the stack fails", func() { It("returns the stack error", func() { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(nil, errors.New("not found")) + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("not found")) ng := api.NewManagedNodeGroup() fakeVPCImporter := new(vpcfakes.FakeImporter) tasks := stackManager.NewManagedNodeGroupTask(context.Background(), []*api.ManagedNodeGroup{ng}, false, fakeVPCImporter) @@ -253,7 +253,7 @@ var _ = Describe("StackCollection Tasks", func() { }, Entry("an OIDC provider is associated with the cluster", oidcEntry{ mockProvider: func(p *mockprovider.MockProvider) { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cfntypes.StackSummary{}, }, nil) }, @@ -268,7 +268,7 @@ var _ = Describe("StackCollection Tasks", func() { Entry("cluster has IAM service accounts", oidcEntry{ mockProvider: func(p *mockprovider.MockProvider) { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cfntypes.StackSummary{ { StackName: aws.String("eksctl-test-cluster-addon-iamserviceaccount-test"), @@ -298,7 +298,7 @@ var _ = Describe("StackCollection Tasks", func() { Entry("OIDC provider and service accounts do not exist for the cluster", oidcEntry{ mockProvider: func(p *mockprovider.MockProvider) { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cfntypes.StackSummary{}, }, nil) }, @@ -309,7 +309,7 @@ var _ = Describe("StackCollection Tasks", func() { Entry("OIDC provider definitely does not exist for the cluster", oidcEntry{ mockProvider: func(p *mockprovider.MockProvider) { - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cfntypes.StackSummary{}, }, nil) }, diff --git a/pkg/ctl/create/cluster_test.go b/pkg/ctl/create/cluster_test.go index 4c2d388771..d383f6e625 100644 --- a/pkg/ctl/create/cluster_test.go +++ b/pkg/ctl/create/cluster_test.go @@ -877,7 +877,7 @@ var ( updateMocksForNodegroups = func(status cftypes.StackStatus, outputs []cftypes.Output) func(mp *mockprovider.MockProvider) { return func(mp *mockprovider.MockProvider) { - mp.MockEC2().On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + mp.MockEC2().On("DescribeInstanceTypeOfferings", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "g3.xlarge", @@ -951,7 +951,7 @@ func defaultProviderMocks(p *mockprovider.MockProvider, output []cftypes.Output, ZoneId: aws.String("id"), }}, }, nil) - p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ + p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(&cloudformation.ListStacksOutput{ StackSummaries: []cftypes.StackSummary{ { StackName: aws.String(clusterStackName), @@ -1039,7 +1039,7 @@ func defaultProviderMocks(p *mockprovider.MockProvider, output []cftypes.Output, }, }, }, nil) - p.MockEC2().On("DescribeSubnets", mock.Anything, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ + p.MockEC2().On("DescribeSubnets", mock.Anything, mock.Anything, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{}, }, nil) p.MockEC2().On("DescribeVpcs", mock.Anything, mock.Anything).Return(&ec2.DescribeVpcsOutput{ @@ -1075,7 +1075,7 @@ func mockOutposts(provider *mockprovider.MockProvider, outpostID string) { }, nil) provider.MockOutposts().On("GetOutpostInstanceTypes", mock.Anything, &outposts.GetOutpostInstanceTypesInput{ OutpostId: aws.String(outpostID), - }).Return(&outposts.GetOutpostInstanceTypesOutput{ + }, mock.Anything).Return(&outposts.GetOutpostInstanceTypesOutput{ InstanceTypes: []outpoststypes.InstanceTypeItem{ { InstanceType: aws.String("m5.xlarge"), @@ -1084,7 +1084,7 @@ func mockOutposts(provider *mockprovider.MockProvider, outpostID string) { }, nil) provider.MockEC2().On("DescribeInstanceTypes", mock.Anything, &ec2.DescribeInstanceTypesInput{ InstanceTypes: []ec2types.InstanceType{"m5.xlarge"}, - }).Return(&ec2.DescribeInstanceTypesOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypesOutput{ InstanceTypes: []ec2types.InstanceTypeInfo{ { InstanceType: "m5.xlarge", diff --git a/pkg/eks/api_test.go b/pkg/eks/api_test.go index ffae2269bb..5b9bbce31a 100644 --- a/pkg/eks/api_test.go +++ b/pkg/eks/api_test.go @@ -17,6 +17,7 @@ import ( . "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" "github.com/stretchr/testify/mock" + api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/credentials" "github.com/weaveworks/eksctl/pkg/eks" @@ -470,7 +471,7 @@ var _ = Describe("CheckInstanceAvailability", func() { }, LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), - }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.nano", @@ -610,7 +611,7 @@ var _ = Describe("CheckInstanceAvailability", func() { }, LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), - }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.nano", @@ -665,7 +666,7 @@ var _ = Describe("CheckInstanceAvailability", func() { }, LocationType: ec2types.LocationTypeAvailabilityZone, MaxResults: aws.Int32(100), - }).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypeOfferingsOutput{ InstanceTypeOfferings: []ec2types.InstanceTypeOffering{ { InstanceType: "t2.nano", diff --git a/pkg/eks/eks_test.go b/pkg/eks/eks_test.go index 02a4d4d6b1..173a740325 100644 --- a/pkg/eks/eks_test.go +++ b/pkg/eks/eks_test.go @@ -110,7 +110,7 @@ var _ = Describe("EKS API wrapper", func() { } } return matches == len(expectedStatusFilter) - })).Return(&cfn.ListStacksOutput{}, nil) + }), mock.Anything).Return(&cfn.ListStacksOutput{}, nil) }) JustBeforeEach(func() { diff --git a/pkg/eks/nodegroup_service_test.go b/pkg/eks/nodegroup_service_test.go index eaed9b0b2c..33d08e72d8 100644 --- a/pkg/eks/nodegroup_service_test.go +++ b/pkg/eks/nodegroup_service_test.go @@ -326,13 +326,13 @@ func mockOutpostInstanceTypes(provider *mockprovider.MockProvider) { instanceTypes[i] = it.InstanceType } - provider.MockOutposts().On("GetOutpostInstanceTypes", mock.Anything, mock.Anything).Return(&awsoutposts.GetOutpostInstanceTypesOutput{ + provider.MockOutposts().On("GetOutpostInstanceTypes", mock.Anything, mock.Anything, mock.Anything).Return(&awsoutposts.GetOutpostInstanceTypesOutput{ InstanceTypes: instanceTypeItems, }, nil) provider.MockEC2().On("DescribeInstanceTypes", mock.Anything, &ec2.DescribeInstanceTypesInput{ InstanceTypes: instanceTypes, - }).Return(&ec2.DescribeInstanceTypesOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypesOutput{ InstanceTypes: instanceTypeInfoList, }, nil) } diff --git a/pkg/outposts/cluster_extender_test.go b/pkg/outposts/cluster_extender_test.go index 33d416069f..045e64fef5 100644 --- a/pkg/outposts/cluster_extender_test.go +++ b/pkg/outposts/cluster_extender_test.go @@ -728,7 +728,7 @@ func mockDescribeSubnets(provider *mockprovider.MockProvider, clusterSubnets *ap Values: []string{"vpc-1234"}, }, }, - }).Return(&ec2.DescribeSubnetsOutput{ + }, mock.Anything).Return(&ec2.DescribeSubnetsOutput{ Subnets: allSubnets, }, nil) } diff --git a/pkg/outposts/outposts_test.go b/pkg/outposts/outposts_test.go index e72cc368d4..090bfc6231 100644 --- a/pkg/outposts/outposts_test.go +++ b/pkg/outposts/outposts_test.go @@ -229,13 +229,13 @@ func mockOutpostInstanceTypes(provider *mockprovider.MockProvider) { } instanceTypes[i] = it.InstanceType } - provider.MockOutposts().On("GetOutpostInstanceTypes", mock.Anything, mock.Anything).Return(&awsoutposts.GetOutpostInstanceTypesOutput{ + provider.MockOutposts().On("GetOutpostInstanceTypes", mock.Anything, mock.Anything, mock.Anything).Return(&awsoutposts.GetOutpostInstanceTypesOutput{ InstanceTypes: instanceTypeItems, }, nil) provider.MockEC2().On("DescribeInstanceTypes", mock.Anything, &ec2.DescribeInstanceTypesInput{ InstanceTypes: instanceTypes, - }).Return(&ec2.DescribeInstanceTypesOutput{ + }, mock.Anything).Return(&ec2.DescribeInstanceTypesOutput{ InstanceTypes: instanceTypeInfoList, }, nil) } diff --git a/pkg/vpc/vpc_test.go b/pkg/vpc/vpc_test.go index e4090852e4..c4c9ef8985 100644 --- a/pkg/vpc/vpc_test.go +++ b/pkg/vpc/vpc_test.go @@ -499,7 +499,7 @@ var _ = Describe("VPC", func() { }, mockEC2: func(ec2Mock *mocksv2.EC2) { - ec2Mock.On("DescribeSubnets", Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { + ec2Mock.On("DescribeSubnets", Anything, Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { if len(input.Filters) > 0 { return &ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ @@ -590,7 +590,7 @@ var _ = Describe("VPC", func() { }, mockEC2: func(ec2Mock *mocksv2.EC2) { - ec2Mock.On("DescribeSubnets", Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { + ec2Mock.On("DescribeSubnets", Anything, Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { if len(input.Filters) > 0 { return &ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ @@ -673,7 +673,7 @@ var _ = Describe("VPC", func() { }, }, mockEC2: func(ec2Mock *mocksv2.EC2) { - ec2Mock.On("DescribeSubnets", Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { + ec2Mock.On("DescribeSubnets", Anything, Anything, Anything).Return(func(_ context.Context, input *ec2.DescribeSubnetsInput, _ ...func(options *ec2.Options)) *ec2.DescribeSubnetsOutput { if len(input.Filters) > 0 { return &ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ @@ -1218,6 +1218,7 @@ var _ = Describe("VPC", func() { }, { Name: strings.Pointer("cidr-block"), Values: []string{"192.168.64.0/18"}, }}}, + Anything, ).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ { @@ -1235,6 +1236,7 @@ var _ = Describe("VPC", func() { }, { Name: strings.Pointer("availability-zone"), Values: []string{"az3"}, }}}, + Anything, ).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ { @@ -1248,6 +1250,7 @@ var _ = Describe("VPC", func() { p.MockEC2().On("DescribeSubnets", Anything, &ec2.DescribeSubnetsInput{SubnetIds: []string{"private1"}}, + Anything, ).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ { @@ -1262,6 +1265,7 @@ var _ = Describe("VPC", func() { p.MockEC2().On("DescribeSubnets", Anything, &ec2.DescribeSubnetsInput{SubnetIds: []string{"public1"}}, + Anything, ).Return(&ec2.DescribeSubnetsOutput{ Subnets: []ec2types.Subnet{ {