From 2c0c85dbc9fd6487ac9b7663c11f9983536e0c1f Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 29 May 2024 11:00:17 +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/833 Commit: 345d2ce Author: Network Service Mesh Bot Date: 2024-05-29 05:59:24 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#833) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/665 Commit: 06cfa69 Author: Network Service Mesh Bot Date: 2024-05-29 05:55:56 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#665) PR link: https://github.com/networkservicemesh/sdk/pull/1636 Commit: c01f9e1 Author: Nikita Skrynnik Date: 2024-05-29 21:53:30 +1100 Message: - Add peer cleanup on Requests and Closes from begin (#1636) * Add peer cleanup on Requests and Closes from begin * fix go linter issues * fix race condition + fix all go linter issues --------- 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 93bbb33..8a2544b 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 + github.com/networkservicemesh/sdk v0.5.1-0.20240529105330-c01f9e100851 github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4 + github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba 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 d9f7b4f..475498a 100644 --- a/go.sum +++ b/go.sum @@ -116,12 +116,12 @@ github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 h1:EaWGg github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= 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.20240518183313-7b51d9c9b5d0 h1:nC7dOI5zxRH3AXOpJWlLthEzYXraaRO6zXY8bTQXjm0= -github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= +github.com/networkservicemesh/sdk v0.5.1-0.20240529105330-c01f9e100851 h1:vGMzgzaW/YiKZ2lTY8xk2sJnCFfM4ifmm8NLy4cEG1c= +github.com/networkservicemesh/sdk v0.5.1-0.20240529105330-c01f9e100851/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 h1:cs3m7ZDCpYa/6ZWKfHvqz9l40qksloE+qaT6uIRYzN0= github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301/go.mod h1:OdUhoA+qBkBkcsCIKXar496Qpl+GRlM4/Qt8NsUhCWc= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4 h1:sFCtKOjxJ26zZfXt4nWY1VNJt+1CoPOb8jIxlGlQIGE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4/go.mod h1:0aHfHCxn4uO+iZQBDoWOTNOZHTErcA1KJjT7UvzpPZI= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba h1:HHsEqqE2C2E3w8xW/5uPghMUfadagx3VMrr3WL04sNg= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba/go.mod h1:WHsLMIII54qCKVSqw3mBSYKsXIygv7Q9gmCfwn7vrCk= 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 99fc9e941bbd3a1307957e817690c2915dee1982 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 29 May 2024 11:03:39 +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 5efd93a..bd3c309 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.20240529105330-c01f9e100851 github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4 + github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba 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 321b757..a5e3dcf 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240529105330-c01f9e100851 h1:vGMzgz github.com/networkservicemesh/sdk v0.5.1-0.20240529105330-c01f9e100851/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8 h1:M0kRBrDRGAXprbsnTJ019gzRfCV5rqRN7ti3Y9yzUn8= github.com/networkservicemesh/sdk-sriov v0.0.0-20240529105909-c76bb0360fa8/go.mod h1:Rp531mQB3DevPoS7dtE6mRyngdJOfpTSOwj5DC586GE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4 h1:sFCtKOjxJ26zZfXt4nWY1VNJt+1CoPOb8jIxlGlQIGE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240527103015-206c36682ec4/go.mod h1:0aHfHCxn4uO+iZQBDoWOTNOZHTErcA1KJjT7UvzpPZI= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba h1:HHsEqqE2C2E3w8xW/5uPghMUfadagx3VMrr3WL04sNg= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240529105924-345d2cefa1ba/go.mod h1:WHsLMIII54qCKVSqw3mBSYKsXIygv7Q9gmCfwn7vrCk= 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=