Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the go-deps group across 1 directory with 3 updates #235

Merged
merged 2 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binapigen/generate_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func genHelperMethods(g *GenFile, typName, goName string) {
genIPXPrefixHelpers(g, goName, 4)
case "ip6_prefix":
genIPXPrefixHelpers(g, goName, 6)

}
}

Expand Down
8 changes: 4 additions & 4 deletions binapigen/generate_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ func init() {

// library dependencies
const (
httpPkg = GoImportPath("net/http")
ioutilPkg = GoImportPath("io/ioutil")
jsonPkg = GoImportPath("encoding/json")
httpPkg = GoImportPath("net/http")
OsPkg = GoImportPath("os")
jsonPkg = GoImportPath("encoding/json")
)

func GenerateHTTP(gen *Generator, file *File) *GenFile {
Expand Down Expand Up @@ -72,7 +72,7 @@ func genHTTPHandler(g *GenFile, svc *Service) {
g.P("mux.HandleFunc(", strconv.Quote("/"+rpc.VPP.Request), ", func(w ", httpPkg.Ident("ResponseWriter"), ", req *", httpPkg.Ident("Request"), ") {")
g.P("var request = new(", rpc.MsgRequest.GoName, ")")
if len(rpc.MsgRequest.Fields) > 0 {
g.P("b, err := ", ioutilPkg.Ident("ReadAll"), "(req.Body)")
g.P("b, err := ", OsPkg.Ident("ReadAll"), "(req.Body)")
g.P("if err != nil {")
g.P(" ", httpPkg.Ident("Error"), "(w, \"read body failed\", ", httpPkg.Ident("StatusBadRequest"), ")")
g.P(" return")
Expand Down
3 changes: 2 additions & 1 deletion core/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
package core

import (
"go.fd.io/govpp/api"
"sort"
"sync"
"time"

"go.fd.io/govpp/api"
)

// default buffer size
Expand Down
5 changes: 3 additions & 2 deletions core/trace_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package core_test

import (
"strings"
"testing"

. "github.com/onsi/gomega"
"go.fd.io/govpp/api"
interfaces "go.fd.io/govpp/binapi/interface"
Expand All @@ -9,8 +12,6 @@ import (
"go.fd.io/govpp/binapi/memclnt"
"go.fd.io/govpp/binapi/memif"
"go.fd.io/govpp/core"
"strings"
"testing"
)

const traceSize = 10
Expand Down
3 changes: 2 additions & 1 deletion extras/libmemif/packethandle.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
package libmemif

import (
"github.com/google/gopacket"
"io"
"sync"
"time"

"github.com/google/gopacket"
)

type memoizedPacket struct {
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.fd.io/govpp
go 1.18

require (
github.com/bennyscetbun/jsongo v1.1.1
github.com/docker/cli v27.0.3+incompatible
github.com/bennyscetbun/jsongo v1.1.2
github.com/docker/cli v27.2.0+incompatible
github.com/fsnotify/fsnotify v1.7.0
github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff
github.com/gookit/color v1.5.4
Expand All @@ -17,7 +17,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
golang.org/x/text v0.16.0
golang.org/x/text v0.17.0
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/bennyscetbun/jsongo v1.1.1 h1:ZlYkrwGtF5lKUOQh8t2Bn8XjCvwFI5Qdl6eBqZOtddE=
github.com/bennyscetbun/jsongo v1.1.1/go.mod h1:j5mIRkqjZ4eEoIKQyfVPQpv56ZX0rn+jPETkD/2dRqA=
github.com/bennyscetbun/jsongo v1.1.2 h1:SFH8uSb75O4iJD3+iJq2GKUdhfNsAJzAzPWhrfxneuc=
github.com/bennyscetbun/jsongo v1.1.2/go.mod h1:j5mIRkqjZ4eEoIKQyfVPQpv56ZX0rn+jPETkD/2dRqA=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
Expand All @@ -10,8 +10,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ=
github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM=
github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
Expand Down Expand Up @@ -74,8 +74,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
Expand Down
11 changes: 6 additions & 5 deletions test/memory/memory_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ import (
"context"
"flag"
"fmt"
interfaces "go.fd.io/govpp/binapi/interface"
"go.fd.io/govpp/binapi/vpe"
"go.fd.io/govpp/test/vpptesting"
"golang.org/x/text/language"
"golang.org/x/text/message"
"runtime"
runtimeMetrics "runtime/metrics"
"strings"
"testing"
"time"

interfaces "go.fd.io/govpp/binapi/interface"
"go.fd.io/govpp/binapi/vpe"
"go.fd.io/govpp/test/vpptesting"
"golang.org/x/text/language"
"golang.org/x/text/message"
)

var apiNum = flag.Uint("api-num", 0, "Custom number API to test")
Expand Down
3 changes: 1 addition & 2 deletions test/vpptesting/vpplauncher/vpplauncher.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"bytes"
"errors"
"fmt"
"io/ioutil"
"os"
"os/exec"
"strconv"
Expand Down Expand Up @@ -133,7 +132,7 @@ func (p *VPP) CheckRunning() bool {
if _, err := os.Stat(p.opts.Pidfile); err != nil {
return false
}
b, err := ioutil.ReadFile(p.opts.Pidfile)
b, err := os.ReadFile(p.opts.Pidfile)
if err != nil {
return false
}
Expand Down
Loading