Skip to content

Commit 14ff992

Browse files
Danielius1922Daniel Adam
authored andcommitted
Fix tautological compare warning
1 parent ee31167 commit 14ff992

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.codecov.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
ignore:
2+
- "bridge/test/**/*.go"
23
- "client/app/app.go"
34
- "cmd/bridge-device/*.go"
45
- "cmd/ocfclient/*.go"
6+
- "test/**/*.go"
57
- "**/main.go"
6-
- "**/test/**/*.go"
78
- "**/*.pb.go"
89
- "**/*.pb.gw.go"
910
- "**/*_test.go"

bridge/net/config.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
gonet "net"
2424
"strconv"
2525
"time"
26+
27+
"github.com/hashicorp/go-multierror"
2628
)
2729

2830
const (
@@ -89,11 +91,10 @@ func validateExternalAddress(addr string) (externalAddressPort, error) {
8991
_, errIpv4 := gonet.ResolveUDPAddr(UDP4, addr)
9092
_, errIpv6 := gonet.ResolveUDPAddr(UDP6, addr)
9193
if errIpv4 != nil && errIpv6 != nil {
92-
err = errIpv4
93-
if errIpv6 != nil {
94-
err = errIpv6
95-
}
96-
return externalAddressPort{}, fmt.Errorf("%w: %w", ErrInvalidExternalAddress, err)
94+
var errs *multierror.Error
95+
errs = multierror.Append(errs, errIpv4)
96+
errs = multierror.Append(errs, errIpv6)
97+
return externalAddressPort{}, fmt.Errorf("%w: %w", ErrInvalidExternalAddress, errs)
9798
}
9899
network := UDP6
99100
if errIpv4 == nil {

0 commit comments

Comments
 (0)