Skip to content

Add missing template commits #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olblak merged 3 commits into from
Apr 28, 2020
+22 −13
Merged

Add missing template commits #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
526d748
Add configuration option using go templates
olblak Apr 27, 2020
8196387
Remove debugging os.Exit
olblak Apr 27, 2020
eb27004
Correctly handle values.yaml
olblak Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func Execute() {

func init() {
rootCmd.Flags().StringVarP(&cfgFile, "config", "c", "./updateCli.yaml", "config file (default is ./updateCli.yaml)")
rootCmd.Flags().StringVarP(&valuesFile, "values", "v", "./values.yaml", "values file (default is ./values.yaml)")
rootCmd.Flags().StringVarP(&valuesFile, "values", "v", "", "values file")
}

func run(cfg string) {
Expand All @@ -64,7 +64,7 @@ func run(cfg string) {
run(filepath.Join(cfg, file))
}
} else {
err := engine.Run(cfg)
err := engine.Run(cfg, valuesFile)
if err != nil {
fmt.Printf("\n\u26A0 %s \n\n", err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (config *Config) Reset() {
}

// ReadFile reads the updatecli configuration file
func (config *Config) ReadFile(cfgFile string) {
func (config *Config) ReadFile(cfgFile, valuesFile string) {

config.Reset()

Expand All @@ -36,7 +36,7 @@ func (config *Config) ReadFile(cfgFile string) {
case ".tpl", ".tmpl":
t := Template{
CfgFile: filepath.Join(dirname, basename),
ValuesFile: "values.yaml",
ValuesFile: valuesFile,
}

err := t.Unmarshal(config)
Expand Down
23 changes: 16 additions & 7 deletions pkg/config/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,23 @@ func (t *Template) Unmarshal(config *Config) error {
return err
}

v, err := os.Open(t.ValuesFile)
defer v.Close()
if err != nil {
return err
}
content := []byte{}

content, err := ioutil.ReadAll(v)
if err != nil {
if _, err := os.Stat(t.ValuesFile); err == nil && t.ValuesFile != "" {

if t.ValuesFile != "" {
v, err := os.Open(t.ValuesFile)
defer v.Close()
if err != nil {
return err
}

content, err = ioutil.ReadAll(v)
if err != nil {
return err
}
}
} else if err != nil && t.ValuesFile != "" {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/engine/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Engine struct {
}

// Run run the full process one yaml file
func Run(cfgFile string) error {
func Run(cfgFile, valuesFile string) error {

_, basename := filepath.Split(cfgFile)
cfgFileName := strings.TrimSuffix(basename, filepath.Ext(basename))
Expand All @@ -26,7 +26,7 @@ func Run(cfgFile string) error {
fmt.Printf("# %s #\n", strings.ToTitle(cfgFileName))
fmt.Printf("%s\n\n", strings.Repeat("#", len(cfgFileName)+4))

engine.conf.ReadFile(cfgFile)
engine.conf.ReadFile(cfgFile, valuesFile)

engine.conf.Check()

Expand Down