Skip to content

Commit

Permalink
Revert "fix: linter"
Browse files Browse the repository at this point in the history
This reverts commit 0e559fb.
  • Loading branch information
GoliathLabs committed Nov 30, 2024
1 parent 0e559fb commit d190874
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/coreos/go-iptables v0.8.0
github.com/coreos/go-oidc/v3 v3.11.0
github.com/docker/docker v27.3.1+incompatible
github.com/freifunkMUC/pg-events v0.4.5
github.com/freifunkMUC/wg-embed v0.10.4
github.com/freifunkMUC/pg-events v0.4.4
github.com/freifunkMUC/wg-embed v0.10.3
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/gorilla/sessions v1.4.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
github.com/freifunkMUC/pg-events v0.4.5 h1:W0S0jnMq6AR8DcYbSL96JtSABuUogVDPB7A0T/M/wVs=
github.com/freifunkMUC/pg-events v0.4.5/go.mod h1:LdjJx0nBFEO+gmnwtV6MB5CKKPLEyt4dlyvj/Ggjg/4=
github.com/freifunkMUC/wg-embed v0.10.4 h1:q30ZWVktoO/ED8WGMp1Nb9hRkMpewSOaMT96g1l7CPI=
github.com/freifunkMUC/wg-embed v0.10.4/go.mod h1:jgHHsIvYRheflxrwxYfBfGUFThdWCgxwjxe6vewHWLQ=
github.com/freifunkMUC/pg-events v0.4.4 h1:Zawv4MsAU1cH3Xd9ckH531fdCVoaiQ8vbM8z7C959yI=
github.com/freifunkMUC/pg-events v0.4.4/go.mod h1:vSXTUe05Ze9KanrBp+ohSMW8sdWVPK/M83plTW1d40k=
github.com/freifunkMUC/wg-embed v0.10.3 h1:MpeCjJiMiGqaWWVrTOka+BNZB8KGAxy1i2fRDbyBg/c=
github.com/freifunkMUC/wg-embed v0.10.3/go.mod h1:RtkfJVgBZAHVsw5U00iWwkfhDtRfpICpGm1q0JpoliA=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
Expand Down
4 changes: 2 additions & 2 deletions internal/dnsproxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ func (d *DNSProxy) Lookup(m *dns.Msg) (*dns.Msg, error) {
target := net.JoinHostPort(upstream, "53")
resp, _, err := d.udpClient.Exchange(m, target)
if err != nil && firstErr == nil {
logrus.Warnf("DNS lookup failed for upstream %s: %v", upstream, err)
logrus.Warnf(errors.Wrap(err, fmt.Sprintf("DNS lookup failed for upstream %s", upstream)).Error())

Check failure on line 83 in internal/dnsproxy/proxy.go

View workflow job for this annotation

GitHub Actions / Golang-CI (lint)

printf: non-constant format string in call to github.com/sirupsen/logrus.Warnf (govet)
firstErr = err
} else if err == nil {
// Retry truncated responses over TCP
if resp.Truncated {
resp, _, err = d.tcpClient.Exchange(m, target)
if err != nil && firstErr == nil {
logrus.Warnf("DNS lookup failed over TCP for upstream %s: %v", upstream, err)
logrus.Warnf(errors.Wrap(err, fmt.Sprintf("DNS lookup failed over TCP for upstream %s", upstream)).Error())

Check failure on line 90 in internal/dnsproxy/proxy.go

View workflow job for this annotation

GitHub Actions / Golang-CI (lint)

printf: non-constant format string in call to github.com/sirupsen/logrus.Warnf (govet)
firstErr = err
continue
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/device_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (d *DeviceService) AddDevice(ctx context.Context, req *proto.AddDeviceReq)
device, err := d.DeviceManager.AddDevice(user, req.GetName(), req.GetPublicKey(), req.GetPresharedKey())
if err != nil {
ctxlogrus.Extract(ctx).Error(err)
return nil, status.Errorf(codes.Internal, "failed to process device: %v", err)
return nil, status.Errorf(codes.Internal, err.Error())

Check failure on line 31 in internal/services/device_service.go

View workflow job for this annotation

GitHub Actions / Golang-CI (lint)

printf: non-constant format string in call to google.golang.org/grpc/status.Errorf (govet)
}

return mapDevice(device), nil
Expand Down

0 comments on commit d190874

Please sign in to comment.