diff --git a/helmexec/exec.go b/helmexec/exec.go index 29f1d1ce..9fbf8eb8 100644 --- a/helmexec/exec.go +++ b/helmexec/exec.go @@ -76,6 +76,18 @@ func (helm *execer) SyncChart(name, chart string, flags ...string) error { return err } +func (helm *execer) DiffChart(name, chart string, flags ...string) error { + chart, err := normalizeChart(chart) + if err != nil { + return err + } + out, err := helm.exec(append([]string{"diff", name, chart}, flags...)...) + if helm.writer != nil { + helm.writer.Write(out) + } + return err +} + func (helm *execer) DeleteChart(name string) error { out, err := helm.exec("delete", name) if helm.writer != nil { diff --git a/helmexec/helmexec.go b/helmexec/helmexec.go index 72150663..b62fb70e 100644 --- a/helmexec/helmexec.go +++ b/helmexec/helmexec.go @@ -7,5 +7,6 @@ type Interface interface { UpdateRepo() error SyncChart(name, chart string, flags ...string) error + DiffChart(name, chart string, flags ...string) error DeleteChart(name string) error } diff --git a/main.go b/main.go index 05dd4f5e..8079f716 100644 --- a/main.go +++ b/main.go @@ -107,6 +107,45 @@ func main() { return nil }, }, + { + Name: "diff", + Usage: "diff charts from state file against env (helm diff)", + Flags: []cli.Flag{ + cli.StringSliceFlag{ + Name: "values", + Usage: "additional value files to be merged into the command", + }, + cli.BoolFlag{ + Name: "sync-repos", + Usage: "enable a repo sync prior to diffing", + }, + }, + Action: func(c *cli.Context) error { + state, helm, err := before(c) + if err != nil { + return err + } + + if c.Bool("sync-repos") { + if errs := state.SyncRepos(helm); errs != nil && len(errs) > 0 { + for _, err := range errs { + fmt.Printf("err: %s\n", err.Error()) + } + os.Exit(1) + } + } + + values := c.StringSlice("values") + + if errs := state.DiffCharts(helm, values); errs != nil && len(errs) > 0 { + for _, err := range errs { + fmt.Printf("err: %s\n", err.Error()) + } + os.Exit(1) + } + return nil + }, + }, { Name: "sync", Usage: "sync all resources from state file (repos && charts)", diff --git a/state/state.go b/state/state.go index f620f99b..435456d9 100644 --- a/state/state.go +++ b/state/state.go @@ -115,6 +115,44 @@ func (state *HelmState) SyncCharts(helm helmexec.Interface, additonalValues []st return nil } +func (state *HelmState) DiffCharts(helm helmexec.Interface, additonalValues []string) []error { + var wg sync.WaitGroup + errs := []error{} + + for _, chart := range state.Charts { + wg.Add(1) + go func(wg *sync.WaitGroup, chart ChartSpec) { + // Plugin command doesn't support explicit namespace + chart.Namespace = "" + flags, flagsErr := flagsForChart(&chart) + if flagsErr != nil { + errs = append(errs, flagsErr) + } + for _, value := range additonalValues { + wd, wdErr := os.Getwd() + if wdErr != nil { + errs = append(errs, wdErr) + } + valfile := filepath.Join(wd, value) + flags = append(flags, "--values", valfile) + } + if len(errs) == 0 { + if err := helm.DiffChart(chart.Name, chart.Chart, flags...); err != nil { + errs = append(errs, err) + } + } + wg.Done() + }(&wg, chart) + } + wg.Wait() + + if len(errs) != 0 { + return errs + } + + return nil +} + func (state *HelmState) DeleteCharts(helm helmexec.Interface) []error { var wg sync.WaitGroup errs := []error{}