From 12ddbe8d1ae5925ee9c503e8f7796084a849965c Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 14 Aug 2024 13:48:11 +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/844 Commit: c500070 Author: Network Service Mesh Bot Date: 2024-08-14 08:47:15 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#844) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/674 Commit: a23cb71 Author: Network Service Mesh Bot Date: 2024-08-14 08:43:41 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#674) PR link: https://github.com/networkservicemesh/sdk/pull/1630 Commit: 78bedfb Author: Network Service Mesh Bot Date: 2024-08-14 08:41:05 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/api@main (#1630) PR link: https://github.com/networkservicemesh/api/pull/152 Commit: 03f6633 Author: Nikita Skrynnik Date: 2024-08-14 20:39:07 +1100 Message: - Delete unused helper functions (#152) * delete some helper functions * delete more hepler functions * delete more unused helper function * fix linter * return som e helper functions * fix CI --------- Signed-off-by: Nikita Skrynnik 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 b6931f0..046efb6 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ require ( github.com/edwarnicke/grpcfd v1.1.4 github.com/golang/protobuf v1.5.3 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 + github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240812103952-7e0cf2c383fb + github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f github.com/networkservicemesh/sdk-sriov v0.0.0-20240808114059-19b4478ca63e - github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d + github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed 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 a2d3f45..7150d80 100644 --- a/go.sum +++ b/go.sum @@ -112,16 +112,16 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= -github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 h1:EaWGgdwbUP404Hlee80R+jSxgzjOh/tW5Fm4/9NE4B0= -github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= +github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 h1:tG5+0VSj+NUQW2zFseHn0n0nZqskXlQklF/xP/XX9Ec= +github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677/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.20240812103952-7e0cf2c383fb h1:p+JeHErfPxRMfF/RF2Dzx23Nr1Q5MQxvS4tvRO7S0X0= -github.com/networkservicemesh/sdk v0.5.1-0.20240812103952-7e0cf2c383fb/go.mod h1:soFR6Mg5LTVvEI0zXNcbWoBnn4hqUK7ItZBQJ3Jbszo= +github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f h1:ntNPiVMUTljkkVDdzoJwJihU5udtbsYqyiYdHLm4/LM= +github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f/go.mod h1:Tg63o7jzlUWAnD4DAbgbPb2TIbJ/KAP0/DAgl7rS5xk= github.com/networkservicemesh/sdk-sriov v0.0.0-20240808114059-19b4478ca63e h1:QzTx+qX7sOSmRb8tcDCRY/jUL3Z+t7seuomKW0EuVkc= github.com/networkservicemesh/sdk-sriov v0.0.0-20240808114059-19b4478ca63e/go.mod h1:3W3PXrhP1rYBfhKpJNsVHhyP1JeM8MlSHC3AUBX621s= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d h1:UJvYyFTpOPowsCUcPcfsNNT772A3w9TsaqnuMj87/M8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d/go.mod h1:Akzw8+4yai5UzAooU7yCMyUi+Zr7qKX44V/hZrUKNVo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed h1:wHDodKJTaw2085ZPgpM65Pe8d+FcGQbytAYA3uburlA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed/go.mod h1:Fx0f0aH5TYwwAW8krOAbUMA200yTnStIczDqXNh4IUE= 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 b376352c251fe766ab1bd2ac7fe870ac529668d3 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 14 Aug 2024 13:51:23 +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 13b84c3..dbda00e 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.20240814134105-78bedfb4371f github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af - github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d + github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed 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 93361fd..52ed575 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f h1:ntNPiV github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f/go.mod h1:Tg63o7jzlUWAnD4DAbgbPb2TIbJ/KAP0/DAgl7rS5xk= github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af h1:VUcTY0VUfRsgmHwlzIA1boapj569Y5lSKAD51VIp0nc= github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af/go.mod h1:e64mVG2JVZ1DV9AJR4Jj9Rv0HMdzrNyIy86M7Mu/i7E= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d h1:UJvYyFTpOPowsCUcPcfsNNT772A3w9TsaqnuMj87/M8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240812104625-93e46256d10d/go.mod h1:Akzw8+4yai5UzAooU7yCMyUi+Zr7qKX44V/hZrUKNVo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed h1:wHDodKJTaw2085ZPgpM65Pe8d+FcGQbytAYA3uburlA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed/go.mod h1:Fx0f0aH5TYwwAW8krOAbUMA200yTnStIczDqXNh4IUE= 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=