From 3084ac4dedc353bae3ef38f0e8d8c8aedbb512f1 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 19 Dec 2024 16:33:12 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/875 Commit: 38fe6a8 Author: Network Service Mesh Bot Date: 2024-12-19 10:32:29 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#875) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/702 Commit: 0687235 Author: Network Service Mesh Bot Date: 2024-12-19 10:29:08 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#702) PR link: https://github.com/networkservicemesh/sdk/pull/1706 Commit: 55b1f2b Author: Denis Tingaikin Date: 2024-12-19 19:26:46 +0300 Message: - feat: Optimize trace chain elements (#1706) * optimize trace chain elements * fix ci issues * apply self code review * apply comments and fix https://github.com/networkservicemesh/sdk/issues/1707 * use the logrus logger by default to not miss useful logs. --------- Signed-off-by: NSMBot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c7ca7b4..6feaea7 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00 github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20241209114224-1e611de3145f + github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe github.com/networkservicemesh/sdk-sriov v0.0.0-20241209101032-32598e5eb17d - github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index a26de21..a7ef4f8 100644 --- a/go.sum +++ b/go.sum @@ -137,12 +137,12 @@ github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00 h1: github.com/networkservicemesh/api v1.14.2-rc.1.0.20241209080353-bbb4cd5f8f00/go.mod h1:GT0Yw1LYFSTxlDyJjBDhIxT82rJ2czZ0TiyzxSyKzvg= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= -github.com/networkservicemesh/sdk v0.5.1-0.20241209114224-1e611de3145f h1:vlD2bVrPbOV1ICkBtAUB6HAcPDH0I3SNDIYJdcaGYrM= -github.com/networkservicemesh/sdk v0.5.1-0.20241209114224-1e611de3145f/go.mod h1:T8IWsaj52yYieCipr0rOViAzWPo7Mc83jI7q61OUFvM= +github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe h1:l8SBNe49Xqom8yEKJsey3s24udlEqvcv+4QgIpE77YQ= +github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe/go.mod h1:4UxNmG1wYL5v93pZHIgIn0jTsvzn4x0QioQ/v48zuD8= github.com/networkservicemesh/sdk-sriov v0.0.0-20241209101032-32598e5eb17d h1:1gsQ9wGwTj+FMBE/bAEoGgI3FQ620wY+E5srje2zkrU= github.com/networkservicemesh/sdk-sriov v0.0.0-20241209101032-32598e5eb17d/go.mod h1:oisRZcrNIC0PzgYKWhigzPopTwV6UPOHWuch0hjbWFI= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053 h1:QITPra7AB0hZecarYx8Qavj2ig/gRQ5BOaEuku2OjCE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053/go.mod h1:APyC0tKaIlFUwb+npug+au4EpW7vTsnx+kzoqKRnjDU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d h1:t3S60+bAUotM6OqT/pw/oF0yruZmV/5ykL0GEgiQbUo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d/go.mod h1:RwdpmjF5vzAeQfg0BPF5V+1ROHFUbnkSK+vp0bZM0YY= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= From 1aa2812fc293953d4ade96fbe342e10f1c137950 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 19 Dec 2024 16:36:12 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0e8c935..7191e72 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe github.com/networkservicemesh/sdk-sriov v0.0.0-20241219163232-71b9665ccd89 - github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index becd431..aeb340a 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe h1:l8SBNe github.com/networkservicemesh/sdk v0.5.1-0.20241219162646-55b1f2b101fe/go.mod h1:4UxNmG1wYL5v93pZHIgIn0jTsvzn4x0QioQ/v48zuD8= github.com/networkservicemesh/sdk-sriov v0.0.0-20241219163232-71b9665ccd89 h1:ojJV+v0FeF2lS16Uhz+3AGrGgl6HJPoUdj1sqHl3iZo= github.com/networkservicemesh/sdk-sriov v0.0.0-20241219163232-71b9665ccd89/go.mod h1:pwlBSvc66FOZMVEYVrAE+aIIXFQsavzFJhJ1uohUbCg= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053 h1:QITPra7AB0hZecarYx8Qavj2ig/gRQ5BOaEuku2OjCE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241209114937-cbdcc96c0053/go.mod h1:APyC0tKaIlFUwb+npug+au4EpW7vTsnx+kzoqKRnjDU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d h1:t3S60+bAUotM6OqT/pw/oF0yruZmV/5ykL0GEgiQbUo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241219163229-38fe6a858f0d/go.mod h1:RwdpmjF5vzAeQfg0BPF5V+1ROHFUbnkSK+vp0bZM0YY= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=