Skip to content

Commit f2fbd64

Browse files
committed
aws: Fix lint failures in validation tests
Simplify nested if-else statements to use else-if and remove unnecessary blank lines in validation_test.go. Signed-off-by: Fangge Jin <[email protected]>
1 parent 5bcd3ac commit f2fbd64

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

pkg/asset/installconfig/aws/validation_test.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,10 +1454,8 @@ func TestValidate(t *testing.T) {
14541454
err := Validate(context.TODO(), meta, test.installConfig)
14551455
if test.expectErr == "" {
14561456
assert.NoError(t, err)
1457-
} else {
1458-
if assert.Error(t, err) {
1459-
assert.Regexp(t, test.expectErr, err.Error())
1460-
}
1457+
} else if assert.Error(t, err) {
1458+
assert.Regexp(t, test.expectErr, err.Error())
14611459
}
14621460
})
14631461
}
@@ -1585,10 +1583,8 @@ func TestValidateForProvisioning(t *testing.T) {
15851583
err := ValidateForProvisioning(route53Client, ic, meta)
15861584
if test.expectedErr == "" {
15871585
assert.NoError(t, err)
1588-
} else {
1589-
if assert.Error(t, err) {
1590-
assert.Regexp(t, test.expectedErr, err.Error())
1591-
}
1586+
} else if assert.Error(t, err) {
1587+
assert.Regexp(t, test.expectedErr, err.Error())
15921588
}
15931589
})
15941590
}
@@ -1628,7 +1624,6 @@ func TestGetSubDomainDNSRecords(t *testing.T) {
16281624
route53Client := mock.NewMockAPI(mockCtrl)
16291625

16301626
for _, test := range cases {
1631-
16321627
t.Run(test.name, func(t *testing.T) {
16331628
ic := icBuild.build(icBuild.withBaseDomain(test.baseDomain))
16341629
if test.expectedErr != "" {
@@ -1653,10 +1648,8 @@ func TestGetSubDomainDNSRecords(t *testing.T) {
16531648
_, err := route53Client.GetSubDomainDNSRecords(&validDomainOutput, ic, nil)
16541649
if test.expectedErr == "" {
16551650
assert.NoError(t, err)
1656-
} else {
1657-
if assert.Error(t, err) {
1658-
assert.Regexp(t, test.expectedErr, err.Error())
1659-
}
1651+
} else if assert.Error(t, err) {
1652+
assert.Regexp(t, test.expectedErr, err.Error())
16601653
}
16611654
})
16621655
}

0 commit comments

Comments
 (0)