From 9e8c97de5e5bc2d4104124fb5512c550d0ab31ba Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 8 Apr 2022 10:55:33 -0400 Subject: [PATCH 1/2] updates change log and edge deps - fixes default admin flag not taken into account --- CHANGELOG.md | 1 + go.mod | 4 ++-- go.sum | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de78239d6..863a44668 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Release 0.25.5 * Bug fix: Fixes an issue where dial could fail if the terminator router didn't response to routing last +* Bug fix: Fixes an issue where Edge administrator checks would not take default admin flag into account # Release 0.25.4 diff --git a/go.mod b/go.mod index c624c417b..b74dc6419 100644 --- a/go.mod +++ b/go.mod @@ -37,8 +37,8 @@ require ( github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.6.9 github.com/openziti/channel v0.18.23 - github.com/openziti/edge v0.21.174 - github.com/openziti/fabric v0.17.93 + github.com/openziti/edge v0.21.179 + github.com/openziti/fabric v0.17.96 github.com/openziti/foundation v0.17.22 github.com/openziti/sdk-golang v0.16.44 github.com/openziti/storage v0.1.4 diff --git a/go.sum b/go.sum index 9737cf446..7d8041c3f 100644 --- a/go.sum +++ b/go.sum @@ -816,8 +816,13 @@ github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAP github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= github.com/openziti/edge v0.21.174 h1:tRRfQKcAq31E8UUy2w9PMQ43EdLP5gCG221K9Kr30aM= github.com/openziti/edge v0.21.174/go.mod h1:jHSwfe65MANZLyei6h80w3c0VNEIo+L1w8toghxyIOg= +github.com/openziti/edge v0.21.178 h1:ebZ5TqGF7vWpNRpxJvlIIYRICEwfzWxQQopIbpWbAEg= +github.com/openziti/edge v0.21.178/go.mod h1:cksNzHHYedLnCMeQ2c0Ya+9GogdcxeCxtnL+vio8dJI= +github.com/openziti/edge v0.21.179 h1:Qef7c6xEc3+Krv4Rk2CvxKI41SJXXb/+KsXPR+YoKzc= +github.com/openziti/edge v0.21.179/go.mod h1:cksNzHHYedLnCMeQ2c0Ya+9GogdcxeCxtnL+vio8dJI= github.com/openziti/fabric v0.17.93 h1:POAYjSBLrJ2J77VChd92FWttXHKDYK+n3Jy0WUhwR7o= github.com/openziti/fabric v0.17.93/go.mod h1:31hewCwTmm/6ZpTzSlsbKw0aadl+OhUNDxqmD1K6j80= +github.com/openziti/fabric v0.17.96/go.mod h1:31hewCwTmm/6ZpTzSlsbKw0aadl+OhUNDxqmD1K6j80= github.com/openziti/foundation v0.17.20/go.mod h1:Nnr0vsqovHJimkdBHf2s4ZJAgvNhg6UdVqP+s0nY3P4= github.com/openziti/foundation v0.17.22 h1:zFfgNHdLocEcoBqtognpJnYsVQaTm28EwqMNjBw8avk= github.com/openziti/foundation v0.17.22/go.mod h1:Nnr0vsqovHJimkdBHf2s4ZJAgvNhg6UdVqP+s0nY3P4= From 779835b6644d4034bdb01e4bae2a036087afcb99 Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 8 Apr 2022 10:58:22 -0400 Subject: [PATCH 2/2] go mod tidy --- go.sum | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/go.sum b/go.sum index 7d8041c3f..11f3f7440 100644 --- a/go.sum +++ b/go.sum @@ -809,29 +809,20 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/channel v0.18.21/go.mod h1:P6hCAQuuhTA5UGCZZWK/tro4L8WN5exPocC7gyc+7Ms= github.com/openziti/channel v0.18.23 h1:5JsD5mwtprPRDDniwoLQrQSlUM2nJlIOpWaG0c/ew7o= github.com/openziti/channel v0.18.23/go.mod h1:GnMk+jbZ/I6/98mAUo+5iq3TZamrAKzLP/6LxWuicuQ= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.21.174 h1:tRRfQKcAq31E8UUy2w9PMQ43EdLP5gCG221K9Kr30aM= -github.com/openziti/edge v0.21.174/go.mod h1:jHSwfe65MANZLyei6h80w3c0VNEIo+L1w8toghxyIOg= -github.com/openziti/edge v0.21.178 h1:ebZ5TqGF7vWpNRpxJvlIIYRICEwfzWxQQopIbpWbAEg= -github.com/openziti/edge v0.21.178/go.mod h1:cksNzHHYedLnCMeQ2c0Ya+9GogdcxeCxtnL+vio8dJI= github.com/openziti/edge v0.21.179 h1:Qef7c6xEc3+Krv4Rk2CvxKI41SJXXb/+KsXPR+YoKzc= github.com/openziti/edge v0.21.179/go.mod h1:cksNzHHYedLnCMeQ2c0Ya+9GogdcxeCxtnL+vio8dJI= -github.com/openziti/fabric v0.17.93 h1:POAYjSBLrJ2J77VChd92FWttXHKDYK+n3Jy0WUhwR7o= -github.com/openziti/fabric v0.17.93/go.mod h1:31hewCwTmm/6ZpTzSlsbKw0aadl+OhUNDxqmD1K6j80= +github.com/openziti/fabric v0.17.96 h1:ra9PKp+rStg4xB9c3dUPGiobGywrk54RCH0Auh+98O0= github.com/openziti/fabric v0.17.96/go.mod h1:31hewCwTmm/6ZpTzSlsbKw0aadl+OhUNDxqmD1K6j80= -github.com/openziti/foundation v0.17.20/go.mod h1:Nnr0vsqovHJimkdBHf2s4ZJAgvNhg6UdVqP+s0nY3P4= github.com/openziti/foundation v0.17.22 h1:zFfgNHdLocEcoBqtognpJnYsVQaTm28EwqMNjBw8avk= github.com/openziti/foundation v0.17.22/go.mod h1:Nnr0vsqovHJimkdBHf2s4ZJAgvNhg6UdVqP+s0nY3P4= -github.com/openziti/sdk-golang v0.16.42/go.mod h1:iYDQW7vbLhAaZBMiBXAsAoKzNyBX0m/zDlnF5s/xa3Y= github.com/openziti/sdk-golang v0.16.44 h1:1FfRrk8JjxOk2/JAl5Hi/sBM/QiGPruNjIFztbZ/5iw= github.com/openziti/sdk-golang v0.16.44/go.mod h1:YLf7qITZMK0Y3REj7CbQTOP53SX/iDxo5QG1YeoQ8ow= github.com/openziti/storage v0.1.4 h1:horz3P0fABJH6R2Orvl2OLksmhXHpCaHP+0TCKfbGPM= github.com/openziti/storage v0.1.4/go.mod h1:aMf2fqWAyXjXH7N0CxfpeGMrlLIDCT7nRSR3cGrsEoI= -github.com/openziti/transport v0.1.0/go.mod h1:2n6p2AZu3H9NzbJbQ7vOGFwtZKpvy8tIp+x+J7G5Sw0= github.com/openziti/transport v0.1.3 h1:IEAOyJaGzgDGzGpJAXKRGX8SKmRO6T+C73PsJEE+UYY= github.com/openziti/transport v0.1.3/go.mod h1:NK1wWR16q1IBgvItzruGtvDc2C7AaJpRQqryC2tGIgA= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=