From c3eb116f9cac44c9a6c752aacfffb1de59b4a390 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Sep 2022 17:36:21 +0200 Subject: [PATCH] cli/context/store: removeAllEndpointData(): accept name instead of ID This allows callers to just pass the name, and handle the conversion to ID and path internally. Signed-off-by: Sebastiaan van Stijn --- cli/context/store/store.go | 2 +- cli/context/store/tlsstore.go | 4 ++-- cli/context/store/tlsstore_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/context/store/store.go b/cli/context/store/store.go index 03fac95515..ed82e52c47 100644 --- a/cli/context/store/store.go +++ b/cli/context/store/store.go @@ -168,7 +168,7 @@ func (s *store) ResetTLSMaterial(name string, data *ContextTLSData) error { func (s *store) ResetEndpointTLSMaterial(contextName string, endpointName string, data *EndpointTLSData) error { id := contextdirOf(contextName) - if err := s.tls.removeAllEndpointData(id, endpointName); err != nil { + if err := s.tls.removeAllEndpointData(contextName, endpointName); err != nil { return patchErrContextName(err, contextName) } if data == nil { diff --git a/cli/context/store/tlsstore.go b/cli/context/store/tlsstore.go index 9b1eda5891..5d54ca8dfe 100644 --- a/cli/context/store/tlsstore.go +++ b/cli/context/store/tlsstore.go @@ -51,8 +51,8 @@ func (s *tlsStore) remove(contextID contextdir, endpointName, filename string) e return err } -func (s *tlsStore) removeAllEndpointData(contextID contextdir, endpointName string) error { - return os.RemoveAll(s.endpointDir(contextID, endpointName)) +func (s *tlsStore) removeAllEndpointData(name, endpointName string) error { + return os.RemoveAll(s.endpointDir(contextdirOf(name), endpointName)) } func (s *tlsStore) removeAllContextData(name string) error { diff --git a/cli/context/store/tlsstore_test.go b/cli/context/store/tlsstore_test.go index ede8955d4e..dd7c571ea9 100644 --- a/cli/context/store/tlsstore_test.go +++ b/cli/context/store/tlsstore_test.go @@ -62,7 +62,7 @@ func TestTlsListAndBatchRemove(t *testing.T) { assert.NilError(t, err) assert.DeepEqual(t, resAll, all) - err = testee.removeAllEndpointData(contextID, "ep3") + err = testee.removeAllEndpointData(contextName, "ep3") assert.NilError(t, err) resEp1ep2, err := testee.listContextData(contextID) assert.NilError(t, err)