From 3b7f13a5e51d24f2fc33d107188ec46377b6b103 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Sep 2022 17:38:12 +0200 Subject: [PATCH] cli/context/store: createOrUpdate(): 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 | 6 ++---- cli/context/store/tlsstore.go | 3 ++- cli/context/store/tlsstore_test.go | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cli/context/store/store.go b/cli/context/store/store.go index ed82e52c47..56554dd01a 100644 --- a/cli/context/store/store.go +++ b/cli/context/store/store.go @@ -149,7 +149,6 @@ func (s *store) GetMetadata(name string) (Metadata, error) { } func (s *store) ResetTLSMaterial(name string, data *ContextTLSData) error { - id := contextdirOf(name) if err := s.tls.removeAllContextData(name); err != nil { return patchErrContextName(err, name) } @@ -158,7 +157,7 @@ func (s *store) ResetTLSMaterial(name string, data *ContextTLSData) error { } for ep, files := range data.Endpoints { for fileName, data := range files.Files { - if err := s.tls.createOrUpdate(id, ep, fileName, data); err != nil { + if err := s.tls.createOrUpdate(name, ep, fileName, data); err != nil { return patchErrContextName(err, name) } } @@ -167,7 +166,6 @@ 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(contextName, endpointName); err != nil { return patchErrContextName(err, contextName) } @@ -175,7 +173,7 @@ func (s *store) ResetEndpointTLSMaterial(contextName string, endpointName string return nil } for fileName, data := range data.Files { - if err := s.tls.createOrUpdate(id, endpointName, fileName, data); err != nil { + if err := s.tls.createOrUpdate(contextName, endpointName, fileName, data); err != nil { return patchErrContextName(err, contextName) } } diff --git a/cli/context/store/tlsstore.go b/cli/context/store/tlsstore.go index 5d54ca8dfe..47303607e4 100644 --- a/cli/context/store/tlsstore.go +++ b/cli/context/store/tlsstore.go @@ -23,7 +23,8 @@ func (s *tlsStore) filePath(contextID contextdir, endpointName, filename string) return filepath.Join(s.root, string(contextID), endpointName, filename) } -func (s *tlsStore) createOrUpdate(contextID contextdir, endpointName, filename string, data []byte) error { +func (s *tlsStore) createOrUpdate(name, endpointName, filename string, data []byte) error { + contextID := contextdirOf(name) epdir := s.endpointDir(contextID, endpointName) parentOfRoot := filepath.Dir(s.root) if err := os.MkdirAll(parentOfRoot, 0755); err != nil { diff --git a/cli/context/store/tlsstore_test.go b/cli/context/store/tlsstore_test.go index dd7c571ea9..9b1606b809 100644 --- a/cli/context/store/tlsstore_test.go +++ b/cli/context/store/tlsstore_test.go @@ -15,12 +15,12 @@ func TestTlsCreateUpdateGetRemove(t *testing.T) { _, err := testee.getData(contextID, "test-ep", "test-data") assert.Equal(t, true, IsErrTLSDataDoesNotExist(err)) - err = testee.createOrUpdate(contextID, "test-ep", "test-data", []byte("data")) + err = testee.createOrUpdate(contextName, "test-ep", "test-data", []byte("data")) assert.NilError(t, err) data, err := testee.getData(contextID, "test-ep", "test-data") assert.NilError(t, err) assert.Equal(t, string(data), "data") - err = testee.createOrUpdate(contextID, "test-ep", "test-data", []byte("data2")) + err = testee.createOrUpdate(contextName, "test-ep", "test-data", []byte("data2")) assert.NilError(t, err) data, err = testee.getData(contextID, "test-ep", "test-data") assert.NilError(t, err) @@ -53,7 +53,7 @@ func TestTlsListAndBatchRemove(t *testing.T) { contextID := contextdirOf(contextName) for name, files := range all { for _, file := range files { - err := testee.createOrUpdate(contextID, name, file, []byte("data")) + err := testee.createOrUpdate(contextName, name, file, []byte("data")) assert.NilError(t, err) } }