Skip to content

Add unit tests for VPC resolver #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/networking/vpc_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type defaultVPCResolver struct {
}

func (r *defaultVPCResolver) ResolveCIDRs(ctx context.Context) ([]string, error) {
vpcs, err := r.ec2Client.DescribeVpcs(&ec2.DescribeVpcsInput{
vpcs, err := r.ec2Client.DescribeVpcsWithContext(ctx, &ec2.DescribeVpcsInput{
VpcIds: []*string{awssdk.String(r.vpcID)},
})
if err != nil {
Expand All @@ -51,5 +51,4 @@ func (r *defaultVPCResolver) ResolveCIDRs(ctx context.Context) ([]string, error)
}

return vpcCIDRs, nil

}
125 changes: 125 additions & 0 deletions pkg/networking/vpc_resolver_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
package networking

import (
"context"
awssdk "github.com/aws/aws-sdk-go/aws"
ec2sdk "github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/mock/gomock"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
"testing"
)

func Test_defaultVPCResolver_ResolveCIDRs(t *testing.T) {
type descriveVpcsCall struct {
input *ec2sdk.DescribeVpcsInput
output *ec2sdk.DescribeVpcsOutput
err error
}
tests := []struct {
name string
vpcID string
want []string
wantErr error
descriveVpcsCall descriveVpcsCall
}{
{
name: "vpc cidr discovery",
vpcID: "vpc-01xxx2",
want: []string{"192.160.0.0/16"},
wantErr: nil,
descriveVpcsCall: descriveVpcsCall{
input: &ec2sdk.DescribeVpcsInput{
VpcIds: []*string{awssdk.String("vpc-01xxx2")},
},
output: &ec2sdk.DescribeVpcsOutput{
Vpcs: []*ec2sdk.Vpc{
{
CidrBlockAssociationSet: []*ec2sdk.VpcCidrBlockAssociation{
{
CidrBlock: awssdk.String("192.160.0.0/16"),
},
},
},
},
},
},
},
{
name: "unable to describe VPC",
vpcID: "vpc-01xxx3",
wantErr: errors.Wrapf(errors.New("aws error"), "unable to describe VPC"),
descriveVpcsCall: descriveVpcsCall{
input: &ec2sdk.DescribeVpcsInput{
VpcIds: []*string{awssdk.String("vpc-01xxx3")},
},
err: errors.New("aws error"),
},
},
{
name: "unable to find matching VPC",
vpcID: "vpc-01xxx4",
wantErr: errors.New("unable to find matching VPC \"vpc-01xxx4\""),
descriveVpcsCall: descriveVpcsCall{
input: &ec2sdk.DescribeVpcsInput{
VpcIds: []*string{awssdk.String("vpc-01xxx4")},
},
output: &ec2sdk.DescribeVpcsOutput{},
},
},
{
name: "multiple CIDRs",
vpcID: "vpc-01xxx2",
want: []string{"192.160.0.0/16", "100.64.0.0/16", "100.65.0.0/16", "100.66.0.0/24"},
wantErr: nil,
descriveVpcsCall: descriveVpcsCall{
input: &ec2sdk.DescribeVpcsInput{
VpcIds: []*string{awssdk.String("vpc-01xxx2")},
},
output: &ec2sdk.DescribeVpcsOutput{
Vpcs: []*ec2sdk.Vpc{
{
CidrBlockAssociationSet: []*ec2sdk.VpcCidrBlockAssociation{
{
CidrBlock: awssdk.String("192.160.0.0/16"),
},
{
CidrBlock: awssdk.String("100.64.0.0/16"),
},
{
CidrBlock: awssdk.String("100.65.0.0/16"),
},
{
CidrBlock: awssdk.String("100.66.0.0/24"),
},
},
},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

ec2Client := services.NewMockEC2(ctrl)
ec2Client.EXPECT().DescribeVpcsWithContext(gomock.Any(), tt.descriveVpcsCall.input).Return(
tt.descriveVpcsCall.output, tt.descriveVpcsCall.err)
vpcResolver := &defaultVPCResolver{
ec2Client: ec2Client,
vpcID: tt.vpcID,
}
got, err := vpcResolver.ResolveCIDRs(context.Background())
if tt.wantErr != nil {
assert.EqualError(t, err, tt.wantErr.Error())
} else {
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
}

})
}
}