From 8a4752a111e586580737ada6c5fa3c76e622db27 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 9 Oct 2020 11:12:13 -0400 Subject: [PATCH] Fix delete for api-sessions and sessions from ziti CLI --- go.mod | 8 ++++---- ziti/cmd/ziti/cmd/edge_controller/delete.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 182230687..ab94465ea 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,15 @@ module github.com/openziti/ziti go 1.14 -replace github.com/openziti/foundation => ../foundation +// replace github.com/openziti/foundation => ../foundation // replace github.com/michaelquigley/dilithium => ../../q/research/dilithium -replace github.com/openziti/fabric => ../fabric +// replace github.com/openziti/fabric => ../fabric // replace github.com/openziti/sdk-golang => ../sdk-golang -replace github.com/openziti/edge => ../edge +// replace github.com/openziti/edge => ../edge require ( github.com/Jeffail/gabs v1.4.0 @@ -28,7 +28,7 @@ require ( github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc github.com/openziti/edge v0.16.38 - github.com/openziti/fabric v0.14.8 + github.com/openziti/fabric v0.14.9-0.20201009024557-3768481c8198 github.com/openziti/foundation v0.14.8 github.com/openziti/sdk-golang v0.13.52 github.com/pborman/uuid v1.2.0 diff --git a/ziti/cmd/ziti/cmd/edge_controller/delete.go b/ziti/cmd/ziti/cmd/edge_controller/delete.go index 204e42a26..00cbdec90 100644 --- a/ziti/cmd/ziti/cmd/edge_controller/delete.go +++ b/ziti/cmd/ziti/cmd/edge_controller/delete.go @@ -96,7 +96,7 @@ func newDeleteCmdForEntityType(entityType string, command deleteCmdRunner, optio func runDeleteEntityOfType(o *commonOptions, entityType string) error { var err error ids := []string{o.Args[0]} - if entityType != "terminators" { + if entityType != "terminators" && entityType != "api-sessions" && entityType != "sessions" { ids, err = mapNamesToIDs(entityType, o.Args[0]) } if err != nil {