From 19759413b97132e4749fa80db28429f06bf32193 Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Thu, 27 Jul 2023 12:27:51 +0400 Subject: [PATCH] Update vpphelper version (#582) * Update vpphelper version Signed-off-by: Ivan Osipov * Update CI settings Signed-off-by: Ivan Osipov * Add copyright to main.go Signed-off-by: Ivan Osipov * Update import sequence in imports_linux.go Signed-off-by: Ivan Osipov * Revert "Update import sequence in imports_linux.go" This reverts commit 39fd90402fa43f79363100a6ae719a4454999528. Signed-off-by: Ivan Osipov * Update imports Signed-off-by: Ivan Osipov * Update imports Signed-off-by: Ivan Osipov --------- Signed-off-by: Ivan Osipov --- .github/workflows/ci.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/imports/imports_linux.go | 2 +- main.go | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-) 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 diff --git a/go.mod b/go.mod index b75f776..41b09b8 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/debug v1.0.0 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.20230720103431-8dc141944a44 github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf + github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 google.golang.org/grpc v1.55.0 diff --git a/go.sum b/go.sum index d924e32..dc56184 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,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= @@ -208,6 +206,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230720103750-61d67ebc52f8 h1:M github.com/networkservicemesh/sdk-kernel v0.0.0-20230720103750-61d67ebc52f8/go.mod h1:6YxgX7lDB4r2YSo/w5hLoaXXvCoPjyCI9xccZu8YM7o= github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf h1:fMNNo0ksJnOx6pmZyTPAZnmff4KoarpaKKR1/S8Lt/k= github.com/networkservicemesh/sdk-vpp v0.0.0-20230720104235-e1184e20bfcf/go.mod h1:e6329ztR5EZm+bqRcMGdksUnaZszO1tt8c6XHxbWJg0= +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 55c7353..183e1df 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -8,7 +8,6 @@ import ( _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/debug" _ "github.com/edwarnicke/grpcfd" - _ "github.com/edwarnicke/vpphelper" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/api/pkg/api/networkservice" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext" @@ -31,6 +30,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/sirupsen/logrus" _ "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" _ "github.com/spiffe/go-spiffe/v2/workloadapi" diff --git a/main.go b/main.go index fc6071e..0272d95 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,7 @@ // Copyright (c) 2021-2022 Doc.ai its affiliates. // +// Copyright (c) 2023 Cisco and/or its affiliates. +// // SPDX-License-Identifier: Apache-2.0 // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +34,6 @@ import ( nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/debug" "github.com/edwarnicke/grpcfd" - "github.com/edwarnicke/vpphelper" "github.com/kelseyhightower/envconfig" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" @@ -40,6 +41,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/networkservicemesh/vpphelper" + "github.com/networkservicemesh/api/pkg/api/networkservice" "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext" "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/memif"