From fa4b81266fbcc40898ae929c00c3fe40cd69142f Mon Sep 17 00:00:00 2001 From: Eugene K Date: Thu, 11 Jun 2020 14:09:21 -0400 Subject: [PATCH 1/3] update sdk --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c37d0ec69..745aaf0ec 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/oleiade/reflections v1.0.0 // indirect github.com/openziti/fabric v0.11.39 github.com/openziti/foundation v0.11.1 - github.com/openziti/sdk-golang v0.12.2 + github.com/openziti/sdk-golang v0.13.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v0.0.7 diff --git a/go.sum b/go.sum index 11f5781cb..779df018e 100644 --- a/go.sum +++ b/go.sum @@ -292,6 +292,8 @@ github.com/openziti/foundation v0.11.1 h1:hM6CefjMMPxD/iY/AFMmPRSIqLug6FqDUQJwvx github.com/openziti/foundation v0.11.1/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk= github.com/openziti/sdk-golang v0.12.2 h1:3UXDBmr4QrR90uvU6ZeCCWV62AmaHuVSbftkOz1J2t0= github.com/openziti/sdk-golang v0.12.2/go.mod h1:GMnh/rVo+Yp00WUuOkNI10KAuvhP1aP4X4j8tNWfSfQ= +github.com/openziti/sdk-golang v0.13.0 h1:YWxzOKCX4GtIWf5Ekmb3mBItwgpntg2SVP5UXfbdXOc= +github.com/openziti/sdk-golang v0.13.0/go.mod h1:GMnh/rVo+Yp00WUuOkNI10KAuvhP1aP4X4j8tNWfSfQ= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= From c36ed5709da30e664a6f6efaeeb74a489fca8495 Mon Sep 17 00:00:00 2001 From: Eugene K Date: Fri, 12 Jun 2020 12:14:34 -0400 Subject: [PATCH 2/3] disable failing test(GH-198) for now --- tests/data_flow_hs_rotating_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/data_flow_hs_rotating_test.go b/tests/data_flow_hs_rotating_test.go index 2eb695b00..2b1458eb4 100644 --- a/tests/data_flow_hs_rotating_test.go +++ b/tests/data_flow_hs_rotating_test.go @@ -41,6 +41,8 @@ func Test_HSRotatingDataflow(t *testing.T) { ctx.createEnrollAndStartEdgeRouter() + t.Skip("disabled GH-198") + t.Run("test client first smart routing", func(t *testing.T) { ctx.testContextChanged(t) testClientFirstWithStrategy(ctx, "smartrouting") From 9b2d180c62bfeb8e4cb425f5f186e2a980d50bf0 Mon Sep 17 00:00:00 2001 From: Eugene K Date: Sun, 14 Jun 2020 21:26:54 -0400 Subject: [PATCH 3/3] update to 0.13.3 --- go.mod | 4 ++-- go.sum | 4 ++++ tests/data_flow_hs_rotating_test.go | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 745aaf0ec..96e0778f1 100644 --- a/go.mod +++ b/go.mod @@ -36,8 +36,8 @@ require ( github.com/mitchellh/mapstructure v1.3.0 github.com/oleiade/reflections v1.0.0 // indirect github.com/openziti/fabric v0.11.39 - github.com/openziti/foundation v0.11.1 - github.com/openziti/sdk-golang v0.13.0 + github.com/openziti/foundation v0.11.2 + github.com/openziti/sdk-golang v0.13.3 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v0.0.7 diff --git a/go.sum b/go.sum index 779df018e..818015415 100644 --- a/go.sum +++ b/go.sum @@ -290,10 +290,14 @@ github.com/openziti/fabric v0.11.39 h1:64QrGjoYHgAlVftE69GHbSE/DhOfpAuotJ47lX08q github.com/openziti/fabric v0.11.39/go.mod h1:yoJHbU2nS969Ghfr1lEJguIFEzr9MrYixRmzN2ZZ/IA= github.com/openziti/foundation v0.11.1 h1:hM6CefjMMPxD/iY/AFMmPRSIqLug6FqDUQJwvxQYwOk= github.com/openziti/foundation v0.11.1/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk= +github.com/openziti/foundation v0.11.2 h1:h6jsPLDkNzH1WTVPb8MPaECgYqEwzlXFwLRFeO1Aojk= +github.com/openziti/foundation v0.11.2/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk= github.com/openziti/sdk-golang v0.12.2 h1:3UXDBmr4QrR90uvU6ZeCCWV62AmaHuVSbftkOz1J2t0= github.com/openziti/sdk-golang v0.12.2/go.mod h1:GMnh/rVo+Yp00WUuOkNI10KAuvhP1aP4X4j8tNWfSfQ= github.com/openziti/sdk-golang v0.13.0 h1:YWxzOKCX4GtIWf5Ekmb3mBItwgpntg2SVP5UXfbdXOc= github.com/openziti/sdk-golang v0.13.0/go.mod h1:GMnh/rVo+Yp00WUuOkNI10KAuvhP1aP4X4j8tNWfSfQ= +github.com/openziti/sdk-golang v0.13.3 h1:FU28BkuRrQvPDgP2eGhUtfWF7ttZc7G0r5Hnh7kezgQ= +github.com/openziti/sdk-golang v0.13.3/go.mod h1:sBp8VaoiF6GXi0ZfP6sF/xj1f+Q9Jw5kSFlImFH0fAM= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/tests/data_flow_hs_rotating_test.go b/tests/data_flow_hs_rotating_test.go index 2b1458eb4..2eb695b00 100644 --- a/tests/data_flow_hs_rotating_test.go +++ b/tests/data_flow_hs_rotating_test.go @@ -41,8 +41,6 @@ func Test_HSRotatingDataflow(t *testing.T) { ctx.createEnrollAndStartEdgeRouter() - t.Skip("disabled GH-198") - t.Run("test client first smart routing", func(t *testing.T) { ctx.testContextChanged(t) testClientFirstWithStrategy(ctx, "smartrouting")