Skip to content

Commit 7ef297b

Browse files
committed
fix lint issues
1 parent 92f84c2 commit 7ef297b

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

cloud/linode/loadbalancers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,10 +870,10 @@ func (l *loadbalancers) getFrontendVPCCreateOptions(ctx context.Context, service
870870

871871
// Precedence 1: IPv4/IPv6 Range Annotations - Explicit CIDR ranges
872872
if hasIPv4Range || hasIPv6Range {
873-
if err := validateNodeBalancerFrontendIPv4Range(frontendIPv4Range); err != nil {
873+
if err = validateNodeBalancerFrontendIPv4Range(frontendIPv4Range); err != nil {
874874
return nil, err
875875
}
876-
if err := validateNodeBalancerFrontendIPv6Range(frontendIPv6Range); err != nil {
876+
if err = validateNodeBalancerFrontendIPv6Range(frontendIPv6Range); err != nil {
877877
return nil, err
878878
}
879879
if frontendSubnetID, ok := service.GetAnnotations()[annotations.NodeBalancerFrontendSubnetID]; ok {

cloud/linode/loadbalancers_test.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5592,25 +5592,19 @@ func Test_makeLoadBalancerStatus_FrontendVPC(t *testing.T) {
55925592
}
55935593

55945594
func Test_getFrontendVPCCreateOptions(t *testing.T) {
5595-
ctrl := gomock.NewController(t)
5596-
defer ctrl.Finish()
5597-
5598-
mockClient := mocks.NewMockClient(ctrl)
5599-
56005595
type args struct {
5601-
ctx context.Context
56025596
service *v1.Service
56035597
}
56045598
tests := []struct {
5605-
name string
5606-
args args
5607-
want []linodego.NodeBalancerVPCOptions
5608-
wantErr bool
5599+
name string
5600+
args args
5601+
want []linodego.NodeBalancerVPCOptions
5602+
wantErr bool
5603+
prepareMock func(*mocks.MockClient)
56095604
}{
56105605
{
56115606
name: "No frontend VPC annotations",
56125607
args: args{
5613-
ctx: context.Background(),
56145608
service: &v1.Service{
56155609
ObjectMeta: metav1.ObjectMeta{
56165610
Annotations: map[string]string{},
@@ -5623,7 +5617,6 @@ func Test_getFrontendVPCCreateOptions(t *testing.T) {
56235617
{
56245618
name: "Frontend IPv4 range annotation",
56255619
args: args{
5626-
ctx: context.Background(),
56275620
service: &v1.Service{
56285621
ObjectMeta: metav1.ObjectMeta{
56295622
Annotations: map[string]string{
@@ -5644,7 +5637,6 @@ func Test_getFrontendVPCCreateOptions(t *testing.T) {
56445637
{
56455638
name: "Frontend IPv6 range annotation",
56465639
args: args{
5647-
ctx: context.Background(),
56485640
service: &v1.Service{
56495641
ObjectMeta: metav1.ObjectMeta{
56505642
Annotations: map[string]string{
@@ -5665,7 +5657,6 @@ func Test_getFrontendVPCCreateOptions(t *testing.T) {
56655657
{
56665658
name: "Frontend VPC and subnet names",
56675659
args: args{
5668-
ctx: context.Background(),
56695660
service: &v1.Service{
56705661
ObjectMeta: metav1.ObjectMeta{
56715662
Annotations: map[string]string{
@@ -5677,15 +5668,25 @@ func Test_getFrontendVPCCreateOptions(t *testing.T) {
56775668
},
56785669
want: nil, // Will return error due to missing client setup
56795670
wantErr: true,
5671+
prepareMock: func(m *mocks.MockClient) {
5672+
m.EXPECT().ListVPCs(gomock.Any(), gomock.Any()).Return(nil, stderrors.New("mock error"))
5673+
},
56805674
},
56815675
}
56825676

56835677
for _, tt := range tests {
56845678
t.Run(tt.name, func(t *testing.T) {
5679+
ctrl := gomock.NewController(t)
5680+
defer ctrl.Finish()
5681+
mockClient := mocks.NewMockClient(ctrl)
5682+
if tt.prepareMock != nil {
5683+
tt.prepareMock(mockClient)
5684+
}
5685+
56855686
l := &loadbalancers{
56865687
client: mockClient,
56875688
}
5688-
got, err := l.getFrontendVPCCreateOptions(tt.args.ctx, tt.args.service)
5689+
got, err := l.getFrontendVPCCreateOptions(context.Background(), tt.args.service)
56895690
if (err != nil) != tt.wantErr {
56905691
t.Errorf("getFrontendVPCCreateOptions() error = %v, wantErr %v", err, tt.wantErr)
56915692
return

0 commit comments

Comments
 (0)