From f528bf5cc66da3c5acb5d0c98b68e1db57dab811 Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Fri, 20 Dec 2019 11:51:15 -0500 Subject: [PATCH 1/3] Replace %v with %w to wrap netlink error Signed-off-by: Serguei Bezverkhi --- conn.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conn.go b/conn.go index c1aa79c..e0153c2 100644 --- a/conn.go +++ b/conn.go @@ -57,11 +57,11 @@ func (cc *Conn) Flush() error { defer conn.Close() if _, err := conn.SendMessages(batch(cc.messages)); err != nil { - return fmt.Errorf("SendMessages: %v", err) + return fmt.Errorf("SendMessages: %w", err) } if _, err := conn.Receive(); err != nil { - return fmt.Errorf("Receive: %v", err) + return fmt.Errorf("Receive: %w", err) } cc.messages = nil From c243f4945b9143d02aab59ee1ac6a4c8a8ca802d Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Fri, 20 Dec 2019 11:57:27 -0500 Subject: [PATCH 2/3] Switching to recent golang version Signed-off-by: Serguei Bezverkhi --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62afe6e..27fcaa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty language: go go: - - "1.10" + - "1.13" script: # Check whether files are syntactically correct. From a63c55f46a32a5452c774158f3d33e580678885e Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Fri, 20 Dec 2019 12:00:14 -0500 Subject: [PATCH 3/3] Update go vet command line Signed-off-by: Serguei Bezverkhi --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27fcaa0..4103b0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ script: - "gofmt -l $(find . -name '*.go' | tr '\\n' ' ') >/dev/null" # Check whether files were not gofmt'ed. - "gosrc=$(find . -name '*.go' | tr '\\n' ' '); [ $(gofmt -l $gosrc 2>&- | wc -l) -eq 0 ] || (echo 'gofmt was not run on these files:'; gofmt -l $gosrc 2>&-; false)" - - go tool vet . + - go vet . - go test ./... - go test -c github.com/google/nftables - sudo ./nftables.test -test.v -run_system_tests