Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-20 19:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Refactor config into package

Browse source 
* Move CLI config management into cli/config
* Add ability to save current context
* Remove ability to rename the config file as this was never used

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
Christopher Crone 2020-05-14 09:48:53 +02:00
parent 2d14bfeb38
commit d46398dbef
6 changed files with 165 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

68
context/config.go
View file

@ -1,68 +0,0 @@
/*
Copyright (c) 2020 Docker Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH
THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package context
import (
"encoding/json"
"fmt"
"os"
"path/filepath"
)
// LoadConfigFile loads the docker configuration
func LoadConfigFile(configDir string, configFileName string) (*ConfigFile, error) {
filename := filepath.Join(configDir, configFileName)
configFile := &ConfigFile{
Filename: filename,
}
if _, err := os.Stat(filename); err == nil {
file, err := os.Open(filename)
if err != nil {
return nil, fmt.Errorf("can't read %s: %w", filename, err)
}
// nolint errcheck
defer file.Close()
err = json.NewDecoder(file).Decode(&configFile)
if err != nil {
err = fmt.Errorf("can't read %s: %w", filename, err)
}
return configFile, err
} else if !os.IsNotExist(err) {
// if file is there but we can't stat it for any reason other
// than it doesn't exist then stop
return nil, fmt.Errorf("can't read %s: %w", filename, err)
}
return configFile, nil
}
// ConfigFile contains the current context from the docker configuration file
type ConfigFile struct {
Filename string `json:"-"` // Note: for internal use only
CurrentContext string `json:"currentContext,omitempty"`
}

24
context/flags.go
View file

@ -29,31 +29,17 @@ package context
import (
"os"
"path/filepath"
"github.com/mitchellh/go-homedir"
"github.com/spf13/pflag"
)
const (
// ConfigFileName is the name of config file
ConfigFileName = "config.json"
configFileDir = ".docker"
)
// Flags are the global cli flags
type Flags struct {
Config string
// ContextFlags are the global CLI flags
// nolint stutter
type ContextFlags struct {
Context string
}
// AddFlags adds persistent (global) flags
func (c *Flags) AddFlags(flags *pflag.FlagSet) {
flags.StringVar(&c.Config, "config", filepath.Join(home(), configFileDir), "Location of the client config files `DIRECTORY`")
// AddContextFlags adds persistent (global) flags
func (c *ContextFlags) AddContextFlags(flags *pflag.FlagSet) {
flags.StringVarP(&c.Context, "context", "c", os.Getenv("DOCKER_CONTEXT"), "context")
}
func home() string {
home, _ := homedir.Dir()
return home
}