From 6facca567d56abe350750cd420b0dd53e4ba7503 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 20 Aug 2024 09:08:55 +0000 Subject: [PATCH 1/3] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/847 Commit: a7b2adb Author: Network Service Mesh Bot Date: 2024-08-20 04:08:04 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#847) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/677 Commit: 573b7f2 Author: Network Service Mesh Bot Date: 2024-08-20 04:03:42 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#677) PR link: https://github.com/networkservicemesh/sdk/pull/1656 Commit: 6fad31a Author: Nikita Skrynnik Date: 2024-08-20 20:00:35 +1100 Message: - Use a context with exteded timeout on Requests in begin (#1656) * Use an extended timeout in case of reselect requests * add unit test * fix race condition * use a context with exteded timeout on Requests in begin * fix unit tests * fix race conditions in dial * fix variable name * fix go linter issues --------- Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 53ea88e1..c93ef914 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,11 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a + github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a - github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b + github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 diff --git a/go.sum b/go.sum index c9d64ee9..e2e96cbf 100644 --- a/go.sum +++ b/go.sum @@ -135,16 +135,16 @@ github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e h1:Fs34Z github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e/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.20240819093036-ae25bb43f39a h1:yGa3JaE4yLKzKTefxu/5sT7ESFmIxj2Ai0VnxvQ69co= -github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= +github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa h1:+/bYBzySJJLgnCSjR8SLHsA+r6PYmAusUbka/W/bw5w= +github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a h1:bhpkqGkkRjO36IGTmA7TRuLvMPgjAw/4KRQCG6XUfqo= github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a/go.mod h1:N6OhPGQHfCN/xRbgyZfzbZ56/t8oZ04GyWlffsFDE9I= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 h1:seMpnNEml+jwSVL8gYoRLxv3Jkw3lZMtxo37S9gBnoI= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91/go.mod h1:eCKvsQyvharf35MLlqaQ9PF8AtTjgdFpsoprVye7zb0= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 h1:RPlVBQr3jFtbWc7dTZLLVgZkwPwnqduHgXtLVt4LM6k= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21/go.mod h1:elW4+KUjWtfWk5W/pFVX7zVMoqvIinSmAJN7Cu3e9CU= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 h1:wUo1fWJAZ5RkW0FaZ1DekwOKKCe6zhjJrBcQdGGfUBw= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199/go.mod h1:pMxDdhmCcfwQFrtcljU5CmSFyrCMsbAlH6dZjb5BjGU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b h1:29EvRX9L5ijP9qyJRJXJGpiFMZS7Kc+SxZERp4lJ7w0= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b/go.mod h1:dzzJ0EPV3+tOZyJuzRMGBxK0BNezStxml+AfmLD7npA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c h1:kVHDKU5TO7uRSe1v/ZGTJJDbTQpkzAnLRYfEjooV0fo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c/go.mod h1:9Lb1b/bE9hPq3RAwMLPFYJDbJ/MzmmKZd6m8UqSzbuc= 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 9cfeb3526dff3835eee7f3df68fe5bc969560479 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 20 Aug 2024 09:13:27 +0000 Subject: [PATCH 2/3] 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 4c7fc391..678d3ae6 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa github.com/networkservicemesh/sdk-k8s v0.0.0-20240820090606-8ccf44f03a0c - github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 diff --git a/go.sum b/go.sum index a895e3db..42536b24 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa h1:+/bYBz github.com/networkservicemesh/sdk v0.5.1-0.20240820090035-6fad31a9f0aa/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-k8s v0.0.0-20240820090606-8ccf44f03a0c h1:Namhq3ECi0XwFQsy30/6za6s4Pz+VHDjT8lUkyf0Bvs= github.com/networkservicemesh/sdk-k8s v0.0.0-20240820090606-8ccf44f03a0c/go.mod h1:dyxBHYOndvZdRmvuErwMunPJsbK14DSCYl1kP1KXrrs= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 h1:seMpnNEml+jwSVL8gYoRLxv3Jkw3lZMtxo37S9gBnoI= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91/go.mod h1:eCKvsQyvharf35MLlqaQ9PF8AtTjgdFpsoprVye7zb0= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 h1:RPlVBQr3jFtbWc7dTZLLVgZkwPwnqduHgXtLVt4LM6k= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21/go.mod h1:elW4+KUjWtfWk5W/pFVX7zVMoqvIinSmAJN7Cu3e9CU= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 h1:wUo1fWJAZ5RkW0FaZ1DekwOKKCe6zhjJrBcQdGGfUBw= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199/go.mod h1:pMxDdhmCcfwQFrtcljU5CmSFyrCMsbAlH6dZjb5BjGU= github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c h1:kVHDKU5TO7uRSe1v/ZGTJJDbTQpkzAnLRYfEjooV0fo= From b1ebf9e1b087699d582c578fffc4efcfa2a9b919 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 20 Aug 2024 09:17:33 +0000 Subject: [PATCH 3/3] 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 b9340522..9eb9356a 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/networkservicemesh/sdk-k8s v0.0.0-20240820090606-8ccf44f03a0c github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 github.com/networkservicemesh/sdk-sriov v0.0.0-20240820090712-5e0c0b17cf3f - github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b + github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 diff --git a/go.sum b/go.sum index 080a1b00..ffb226ce 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21 h1:R github.com/networkservicemesh/sdk-kernel v0.0.0-20240820090342-573b7f288d21/go.mod h1:elW4+KUjWtfWk5W/pFVX7zVMoqvIinSmAJN7Cu3e9CU= github.com/networkservicemesh/sdk-sriov v0.0.0-20240820090712-5e0c0b17cf3f h1:s4LjkJUpraxrphQhzOxkfB98aD7v7tiFUcgdM/z9Klg= github.com/networkservicemesh/sdk-sriov v0.0.0-20240820090712-5e0c0b17cf3f/go.mod h1:AkXaMezzbe6El6AJPPSd0E9BnckOmwDCnNOp9sfJABM= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b h1:29EvRX9L5ijP9qyJRJXJGpiFMZS7Kc+SxZERp4lJ7w0= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b/go.mod h1:dzzJ0EPV3+tOZyJuzRMGBxK0BNezStxml+AfmLD7npA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c h1:kVHDKU5TO7uRSe1v/ZGTJJDbTQpkzAnLRYfEjooV0fo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240820090804-a7b2adbdeb0c/go.mod h1:9Lb1b/bE9hPq3RAwMLPFYJDbJ/MzmmKZd6m8UqSzbuc= 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=