diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f5b8f04..5e37452 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: restrictNSMDeps: uses: networkservicemesh/.github/.github/workflows/restrict-nsm-deps.yaml@main with: - allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp" + allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp, govpp" checkgomod: uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main diff --git a/Dockerfile b/Dockerfile index 03d09e2..4d09b28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG VPP_VERSION=v23.02-rc0-189-g0359d19f2 -FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as go +ARG VPP_VERSION=v23.02-rc0-189-g766031bdb +FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go COPY --from=golang:1.18.2-buster /usr/local/go/ /go ENV PATH ${PATH}:/go/bin ENV GO111MODULE=on @@ -25,6 +25,6 @@ CMD go test -test.v ./... FROM test as debug CMD dlv -l :40000 --headless=true --api-version=2 test -test.v ./... -FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as runtime +FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as runtime COPY --from=build /bin/cmd-nse-vl3-vpp /bin/cmd-nse-vl3-vpp ENTRYPOINT [ "/bin/cmd-nse-vl3-vpp" ] diff --git a/go.mod b/go.mod index 172f34e..0777bb9 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e - github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295 + github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 @@ -24,7 +24,6 @@ require ( github.com/agnivade/levenshtein v1.1.1 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/edwarnicke/exechelper v1.0.2 // indirect - github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0 // indirect github.com/edwarnicke/log v1.0.0 // indirect github.com/edwarnicke/serialize v1.0.7 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect @@ -42,6 +41,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect github.com/miekg/dns v1.1.50 // indirect + github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b // indirect github.com/networkservicemesh/sdk-kernel v0.0.0-20230626100905-a23442dae686 // indirect github.com/open-policy-agent/opa v0.44.0 // indirect github.com/r3labs/diff v1.1.0 // indirect diff --git a/go.sum b/go.sum index 9810bed..41a5024 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,6 @@ github.com/edwarnicke/exechelper v1.0.2 h1:dD49Ui2U0FBFxxhalnKw6vLS0P0TkgnXBRvKL github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs= github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 h1:4/2wgileNvQB4HfJbq7u4FFLKIfc38a6P0S/51ZGgX8= github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29/go.mod h1:3m+ZfVq+z0pTLW798jmqnifMsalrVLIKmfXaMFvqSuc= -github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0 h1:3qXBk0lN7PhPrS/2TVJE30TZA/Ecd6LwkFW4rBxxb2w= -github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0/go.mod h1:kHDnxA+SSNFeMEHz7xvhub1zvx4mOTRlWWRCay2n5NM= github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k= github.com/edwarnicke/grpcfd v1.1.2/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA= github.com/edwarnicke/log v1.0.0 h1:T6uRNCmR99GTt/CpRr2Gz8eGW8fm0HMThDNGdNxPaGk= @@ -226,12 +224,14 @@ github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7Xn github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKksXsXsnDsEo+Cfn43pdPfML024ad//QcdKfgXK4= github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b h1:5no/Hfw/UaLGDWN8deavInPomlzkWwxbGXoXNdeY0sc= +github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b/go.mod h1:akUChTiTQ93H2iVixGfUS3x0UMKuu1pzmcECwdwj6Rk= github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e h1:Gd9eqXL8E7Pb+wHjdy96/b7goBH52g5uVLQy8kgdxmI= github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e/go.mod h1:hmu0t7IxKa1v7Mj7Y3dQrcpRD0YtEyFE5vJorXRQT2A= github.com/networkservicemesh/sdk-kernel v0.0.0-20230626100905-a23442dae686 h1:2Q79AB2NUQmf62RfuofSSY/uutUdNbejrL8jpeM2yCg= github.com/networkservicemesh/sdk-kernel v0.0.0-20230626100905-a23442dae686/go.mod h1:64qsHWOfmq3CcyTrAi8TTOQctr4RLhZjcOtGSIjErYE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295 h1:QSDPB+9RgcfXk4vb4Y8gqhXeH6eXfrbyiUqFMaSGlsg= -github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295/go.mod h1:5P4pS7qAR0r4KiIX/zusAI7iMyAZqGiKYUJ2in+wA24= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3 h1:sJ2KjvR/vyUM6CauecAtsLLEFBTVMFRUNtvq5h19mAU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3/go.mod h1:LATrRKLUwNCFV9qlXO72/bmsHj2fljJWgGlLK15VE+Y= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8= github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index 87433b4..4a6a2f0 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -58,7 +58,6 @@ import ( _ "google.golang.org/grpc" _ "google.golang.org/grpc/credentials" _ "google.golang.org/protobuf/proto" - _ "io/ioutil" _ "net" _ "net/url" _ "os" diff --git a/main.go b/main.go index 17c4f9a..160212c 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,6 @@ package main import ( "context" "crypto/tls" - "io/ioutil" "net" "net/url" "os" @@ -362,7 +361,7 @@ func main() { } } - tmpDir, err := ioutil.TempDir("", config.Name) + tmpDir, err := os.MkdirTemp("", config.Name) if err != nil { logrus.Fatalf("error creating tmpDir %+v", err) }