From ef9dcb0a4e978dfc6f4fc10f9ffabad0af500589 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Wed, 8 Jul 2020 21:09:38 -0400 Subject: [PATCH] Fix service lookup (#134) * Update deps. Fix service lookup by name when creating service edge router policies. Fixes GH-133 --- doc/release-notes.md | 1 + go.mod | 4 ++-- go.sum | 10 ++++------ .../create_service_edge_router_policy.go | 2 +- ziti/cmd/ziti/cmd/edge_controller/policy_advisor.go | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index d42e8aef8..66950b9dc 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -5,6 +5,7 @@ * Bug fixes * [#129](https://github.com/openziti/ziti/issues/129) - minor issue with `ziti-tunnel enroll` outputting the success message at ERROR level * [#131](https://github.com/openziti/ziti/issues/131) - issues w/ creating identities, CAs and validating CAs + * [#133](https://github.com/openziti/ziti/issues/133) - fix service lookup by name when creating service edge router policies * [edge#191](https://github.com/openziti/edge/issues/191) - updating self password via CLI would error with 404 not found * [edge#231](https://github.com/openziti/edge/issues/231) - identities missing enrollment expiresAt property * [edge#237](https://github.com/openziti/edge/issues/237) - Policy Advisor CLI is failing because common routers IsOnline value is missing diff --git a/go.mod b/go.mod index a0a89e146..8ecf79f0e 100644 --- a/go.mod +++ b/go.mod @@ -25,8 +25,8 @@ require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc - github.com/openziti/edge v0.15.14 - github.com/openziti/fabric v0.11.52 + github.com/openziti/edge v0.15.15 + github.com/openziti/fabric v0.11.53 github.com/openziti/foundation v0.11.11 github.com/openziti/sdk-golang v0.13.20 github.com/pborman/uuid v1.2.0 diff --git a/go.sum b/go.sum index 661ef0b5f..75595e0d8 100644 --- a/go.sum +++ b/go.sum @@ -322,12 +322,10 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openziti/edge v0.15.14 h1:Md5wZSvRDZ7hUFq8Ou+E0dTzSGW5dkICH9yvr42h00k= -github.com/openziti/edge v0.15.14/go.mod h1:uNCh9yCUM12+mDyZshpT+Of5sLtaGATE0lMGoBNDp74= -github.com/openziti/fabric v0.11.52 h1:Fugq+7l+0K3wQ7B2OmVs/U7N7fSYV3FrVSitLsI9pg4= -github.com/openziti/fabric v0.11.52/go.mod h1:elWkCKKtfE7FaqVx8Th++KifopbKzFGpBxp3A+FGSfA= -github.com/openziti/foundation v0.11.10 h1:ot2cmzNgaPttc59gCflJr9MUHy9rSYH+V/rjhNqXIrg= -github.com/openziti/foundation v0.11.10/go.mod h1:Qdd7eCuTrpRwEeDbvYy89sFbEY4+J7OuX8UygxNBsvY= +github.com/openziti/edge v0.15.15 h1:mbsHPtIsN07scBBSQsTldKGiS/fSZKdDEk4w3VJgSrY= +github.com/openziti/edge v0.15.15/go.mod h1:kOesYan0FSNFSUdnyo/E1Rg12jfa61gKmWPUCEQHo8Q= +github.com/openziti/fabric v0.11.53 h1:OVT71Hmbgf5gqsO7fz4iwsyP/T/ZzUfgOD0Bp39z/3U= +github.com/openziti/fabric v0.11.53/go.mod h1:d0EueCQD4CIC3TLAMdw0EoYb+GsmwPrZz3BwRgtU28c= github.com/openziti/foundation v0.11.11 h1:GPASO0aTtzuzwQbfvu1OMOPdAKzi/DTkxKJ0y2NTzXU= github.com/openziti/foundation v0.11.11/go.mod h1:Qdd7eCuTrpRwEeDbvYy89sFbEY4+J7OuX8UygxNBsvY= github.com/openziti/sdk-golang v0.13.20 h1:vnpGvaS/TBz2zd8lUO4cGVYmRWcnAX0v8k/P9+q36BI= diff --git a/ziti/cmd/ziti/cmd/edge_controller/create_service_edge_router_policy.go b/ziti/cmd/ziti/cmd/edge_controller/create_service_edge_router_policy.go index 5b685a3fe..4f6443a2a 100644 --- a/ziti/cmd/ziti/cmd/edge_controller/create_service_edge_router_policy.go +++ b/ziti/cmd/ziti/cmd/edge_controller/create_service_edge_router_policy.go @@ -71,7 +71,7 @@ func runCreateServiceEdgeRouterPolicy(o *createServiceEdgeRouterPolicyOptions) e return err } - serviceRoles, err := convertNamesToIds(o.serviceRoles, "identities") + serviceRoles, err := convertNamesToIds(o.serviceRoles, "services") if err != nil { return err } diff --git a/ziti/cmd/ziti/cmd/edge_controller/policy_advisor.go b/ziti/cmd/ziti/cmd/edge_controller/policy_advisor.go index 285a5aea7..030443005 100644 --- a/ziti/cmd/ziti/cmd/edge_controller/policy_advisor.go +++ b/ziti/cmd/ziti/cmd/edge_controller/policy_advisor.go @@ -304,13 +304,13 @@ func runPolicyAdvisorForService(serviceId string, o *policyAdvisorOptions) error filter = fmt.Sprintf(`true skip %v limit 2`, skip) children, _, err := filterSubEntitiesOfType("services", "identities", serviceId, filter, &o.commonOptions) if err != nil { - panic(err) + return err } for _, child := range children { identityId, _ := child.S("id").Data().(string) if err := runPolicyAdvisorForIdentityAndService(identityId, serviceId, o); err != nil { - panic(err) + return err } } skip += len(children)