From d2ff9f16636259ac10726ee29c8edf15162cd982 Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 10:12:45 +0400 Subject: [PATCH 1/5] Update vpphelper version Signed-off-by: Ivan Osipov --- go.mod | 2 +- go.sum | 4 ++-- internal/imports/imports_linux.go | 2 +- main.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d160706..ca54013 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 github.com/edwarnicke/grpcfd v1.1.2 - github.com/edwarnicke/vpphelper v0.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.9.1-0.20230627143611-9785eacf9687 github.com/networkservicemesh/sdk v0.5.1-0.20230713084322-eaf1d25c7512 github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f + github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index 8b3ff44..eda0d68 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,6 @@ github.com/edwarnicke/log v1.0.0/go.mod h1:eWsQQlQ0IU5wHlJvyXFH3dS8s2g9GzN7JnXod github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw= github.com/edwarnicke/serialize v1.0.7 h1:geX8vmyu8Ij2S5fFIXjy9gBDkKxXnrMIzMoDvV0Ddac= github.com/edwarnicke/serialize v1.0.7/go.mod h1:y79KgU2P7ALH/4j37uTSIdNavHFNttqN7pzO6Y8B2aw= -github.com/edwarnicke/vpphelper v0.2.0 h1:Ra47QFtmR/Ji8czoRBwD/pboLfK1GiQEI1SSrsaYupE= -github.com/edwarnicke/vpphelper v0.2.0/go.mod h1:2KXgJqOUUCh9S4Zs2jAycQLqAcRGge3q+GXV2rN55ZQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -232,6 +230,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230714102159-f7a0057795d7 h1:s github.com/networkservicemesh/sdk-kernel v0.0.0-20230714102159-f7a0057795d7/go.mod h1:SyZzrqtFI3yyfXJPqhleQ7KeAbbetyUsi7Hye1VKMhk= github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f h1:cH63QoV++p/cUtj79O6vUhvM2yNMcUVxwcf5tQ3qzcc= github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f/go.mod h1:zagGyM1t5zT9qvx6cN6z4ldK/boXQxZDr4zUx3Y5OfM= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 h1:Qu4LsLjAM/qVkVvIw1pvNHLkOnN4/6n79LHM2FVl/xw= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972/go.mod h1:sRkqSd8psiUrUvKjCiDHvNcOXzOsxJkAxU5UkKmQy4M= 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 4a6a2f0..514c2e4 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -7,7 +7,6 @@ import ( _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/genericsync" _ "github.com/edwarnicke/grpcfd" - _ "github.com/edwarnicke/vpphelper" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/api/pkg/api/ipam" _ "github.com/networkservicemesh/api/pkg/api/networkservice" @@ -50,6 +49,7 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt" _ "github.com/networkservicemesh/sdk/pkg/tools/token" _ "github.com/networkservicemesh/sdk/pkg/tools/tracing" + _ "github.com/networkservicemesh/vpphelper" _ "github.com/pkg/errors" _ "github.com/sirupsen/logrus" _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" diff --git a/main.go b/main.go index 160212c..587dba4 100644 --- a/main.go +++ b/main.go @@ -62,7 +62,7 @@ import ( nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/genericsync" "github.com/edwarnicke/grpcfd" - "github.com/edwarnicke/vpphelper" + "github.com/networkservicemesh/vpphelper" "github.com/kelseyhightower/envconfig" "github.com/pkg/errors" "github.com/sirupsen/logrus" From 799a8039f19cb9ea924161fe51e1191a69a043e2 Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 12:35:11 +0400 Subject: [PATCH 2/5] Update CI settings Signed-off-by: Ivan Osipov --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e9010b..fb87d16 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,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, govpp" + allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp, govpp, vpphelper" checkgomod: uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main From 747e57bf129170e57d9217406db8b417cd7e0e9f Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 12:50:46 +0400 Subject: [PATCH 3/5] FOrmatting code in main.go Signed-off-by: Ivan Osipov --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 587dba4..3ce27cf 100644 --- a/main.go +++ b/main.go @@ -62,8 +62,8 @@ import ( nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/genericsync" "github.com/edwarnicke/grpcfd" - "github.com/networkservicemesh/vpphelper" "github.com/kelseyhightower/envconfig" + "github.com/networkservicemesh/vpphelper" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" From 275edde978dfeaca280a9114cc8f496f6976cd6a Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 13:56:02 +0400 Subject: [PATCH 4/5] Update imports Signed-off-by: Ivan Osipov --- internal/imports/imports_linux.go | 32 ++++++++++++++++--------------- main.go | 3 ++- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index 514c2e4..6e77205 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -4,10 +4,27 @@ package imports import ( _ "context" _ "crypto/tls" + _ "net" + _ "net/url" + _ "os" + _ "os/signal" + _ "path/filepath" + _ "syscall" + _ "time" + _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/genericsync" _ "github.com/edwarnicke/grpcfd" _ "github.com/kelseyhightower/envconfig" + _ "github.com/pkg/errors" + _ "github.com/sirupsen/logrus" + _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" + _ "github.com/spiffe/go-spiffe/v2/svid/x509svid" + _ "github.com/spiffe/go-spiffe/v2/workloadapi" + _ "google.golang.org/grpc" + _ "google.golang.org/grpc/credentials" + _ "google.golang.org/protobuf/proto" + _ "github.com/networkservicemesh/api/pkg/api/ipam" _ "github.com/networkservicemesh/api/pkg/api/networkservice" _ "github.com/networkservicemesh/api/pkg/api/networkservice/payload" @@ -50,19 +67,4 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/token" _ "github.com/networkservicemesh/sdk/pkg/tools/tracing" _ "github.com/networkservicemesh/vpphelper" - _ "github.com/pkg/errors" - _ "github.com/sirupsen/logrus" - _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" - _ "github.com/spiffe/go-spiffe/v2/svid/x509svid" - _ "github.com/spiffe/go-spiffe/v2/workloadapi" - _ "google.golang.org/grpc" - _ "google.golang.org/grpc/credentials" - _ "google.golang.org/protobuf/proto" - _ "net" - _ "net/url" - _ "os" - _ "os/signal" - _ "path/filepath" - _ "syscall" - _ "time" ) diff --git a/main.go b/main.go index 3ce27cf..fa5009f 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,6 @@ import ( "github.com/edwarnicke/genericsync" "github.com/edwarnicke/grpcfd" "github.com/kelseyhightower/envconfig" - "github.com/networkservicemesh/vpphelper" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" @@ -72,6 +71,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/networkservicemesh/vpphelper" + "github.com/networkservicemesh/api/pkg/api/ipam" "github.com/networkservicemesh/api/pkg/api/networkservice" "github.com/networkservicemesh/api/pkg/api/networkservice/payload" From a6e1743a7fe83332cf24979af6ed5cb4f9b31731 Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 14:01:53 +0400 Subject: [PATCH 5/5] Update imports Signed-off-by: Ivan Osipov --- internal/imports/imports_linux.go | 32 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index 6e77205..514c2e4 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -4,27 +4,10 @@ package imports import ( _ "context" _ "crypto/tls" - _ "net" - _ "net/url" - _ "os" - _ "os/signal" - _ "path/filepath" - _ "syscall" - _ "time" - _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/genericsync" _ "github.com/edwarnicke/grpcfd" _ "github.com/kelseyhightower/envconfig" - _ "github.com/pkg/errors" - _ "github.com/sirupsen/logrus" - _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" - _ "github.com/spiffe/go-spiffe/v2/svid/x509svid" - _ "github.com/spiffe/go-spiffe/v2/workloadapi" - _ "google.golang.org/grpc" - _ "google.golang.org/grpc/credentials" - _ "google.golang.org/protobuf/proto" - _ "github.com/networkservicemesh/api/pkg/api/ipam" _ "github.com/networkservicemesh/api/pkg/api/networkservice" _ "github.com/networkservicemesh/api/pkg/api/networkservice/payload" @@ -67,4 +50,19 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/token" _ "github.com/networkservicemesh/sdk/pkg/tools/tracing" _ "github.com/networkservicemesh/vpphelper" + _ "github.com/pkg/errors" + _ "github.com/sirupsen/logrus" + _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" + _ "github.com/spiffe/go-spiffe/v2/svid/x509svid" + _ "github.com/spiffe/go-spiffe/v2/workloadapi" + _ "google.golang.org/grpc" + _ "google.golang.org/grpc/credentials" + _ "google.golang.org/protobuf/proto" + _ "net" + _ "net/url" + _ "os" + _ "os/signal" + _ "path/filepath" + _ "syscall" + _ "time" )