Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/context/store: remove filePath(), make contextDir() accept name 

removing the extra abstraction, and simplify use of contextDir()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-09-28 18:08:22 +02:00
parent 9720d5b451
commit 38f54e7926
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/context/store/store.go
View File

@ -191,10 +191,9 @@ func (s *store) GetTLSData(contextName, endpointName, fileName string) ([]byte,
} }
func (s *store) GetStorageInfo(contextName string) StorageInfo { func (s *store) GetStorageInfo(contextName string) StorageInfo {
dir := contextdirOf(contextName)
return StorageInfo{ return StorageInfo{
MetadataPath: s.meta.contextDir(dir), MetadataPath: s.meta.contextDir(contextdirOf(contextName)),
TLSPath: s.tls.contextDir(dir), TLSPath: s.tls.contextDir(contextName),
} }
} }

34
cli/context/store/tlsstore.go
View File

@ -11,33 +11,28 @@ type tlsStore struct {
root string root string
} }
func (s *tlsStore) contextDir(id contextdir) string { func (s *tlsStore) contextDir(name string) string {
return filepath.Join(s.root, string(id)) return filepath.Join(s.root, string(contextdirOf(name)))
} }
func (s *tlsStore) endpointDir(contextID contextdir, name string) string { func (s *tlsStore) endpointDir(name, endpointName string) string {
return filepath.Join(s.root, string(contextID), name) return filepath.Join(s.contextDir(name), endpointName)
}
func (s *tlsStore) filePath(contextID contextdir, endpointName, filename string) string {
return filepath.Join(s.root, string(contextID), endpointName, filename)
} }
func (s *tlsStore) createOrUpdate(name, 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) parentOfRoot := filepath.Dir(s.root)
if err := os.MkdirAll(parentOfRoot, 0755); err != nil { if err := os.MkdirAll(parentOfRoot, 0755); err != nil {
return err return err
} }
if err := os.MkdirAll(epdir, 0700); err != nil { endpointDir := s.endpointDir(name, endpointName)
if err := os.MkdirAll(endpointDir, 0700); err != nil {
return err return err
} }
return os.WriteFile(s.filePath(contextID, endpointName, filename), data, 0600) return os.WriteFile(filepath.Join(endpointDir, filename), data, 0600)
} }
func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error) { func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error) {
data, err := os.ReadFile(s.filePath(contextdirOf(name), endpointName, filename)) data, err := os.ReadFile(filepath.Join(s.endpointDir(name, endpointName), filename))
if err != nil { if err != nil {
return nil, convertTLSDataDoesNotExist(endpointName, filename, err) return nil, convertTLSDataDoesNotExist(endpointName, filename, err)
} }
@ -47,7 +42,7 @@ func (s *tlsStore) getData(name, endpointName, filename string) ([]byte, error)
// remove removes a TLS data from an endpoint // remove removes a TLS data from an endpoint
// TODO(thaJeztah) tlsStore.remove() is not used anywhere outside of tests; should we use removeAllEndpointData() only? // TODO(thaJeztah) tlsStore.remove() is not used anywhere outside of tests; should we use removeAllEndpointData() only?
func (s *tlsStore) remove(name, endpointName, filename string) error { func (s *tlsStore) remove(name, endpointName, filename string) error {
err := os.Remove(s.filePath(contextdirOf(name), endpointName, filename)) err := os.Remove(filepath.Join(s.endpointDir(name, endpointName), filename))
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil return nil
} }
@ -55,16 +50,16 @@ func (s *tlsStore) remove(name, endpointName, filename string) error {
} }
func (s *tlsStore) removeAllEndpointData(name, endpointName string) error { func (s *tlsStore) removeAllEndpointData(name, endpointName string) error {
return os.RemoveAll(s.endpointDir(contextdirOf(name), endpointName)) return os.RemoveAll(s.endpointDir(name, endpointName))
} }
func (s *tlsStore) removeAllContextData(name string) error { func (s *tlsStore) removeAllContextData(name string) error {
return os.RemoveAll(s.contextDir(contextdirOf(name))) return os.RemoveAll(s.contextDir(name))
} }
func (s *tlsStore) listContextData(name string) (map[string]EndpointFiles, error) { func (s *tlsStore) listContextData(name string) (map[string]EndpointFiles, error) {
contextID := contextdirOf(name) contextDir := s.contextDir(name)
epFSs, err := os.ReadDir(s.contextDir(contextID)) epFSs, err := os.ReadDir(contextDir)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return map[string]EndpointFiles{}, nil return map[string]EndpointFiles{}, nil
@ -74,8 +69,7 @@ func (s *tlsStore) listContextData(name string) (map[string]EndpointFiles, error
r := make(map[string]EndpointFiles) r := make(map[string]EndpointFiles)
for _, epFS := range epFSs { for _, epFS := range epFSs {
if epFS.IsDir() { if epFS.IsDir() {
epDir := s.endpointDir(contextID, epFS.Name()) fss, err := os.ReadDir(filepath.Join(contextDir, epFS.Name()))
fss, err := os.ReadDir(epDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }