1sept/drone-helm3
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the tiny helper functions from plan.go [#67]

Browse Source 
Now that InitKube, AddRepo, and UpdateDependencies are initialized with
NewSTEPNAME functions, the helper functions in plan.go are
unnecessary--they do too little to be a useful abstraction, and they
aren't complex or frequently-used enough to be worth extracting.
This commit is contained in:
Erin Call
2020-01-16 13:57:28 -08:00
parent 588c7cb9f7
commit 21b9d32329
2 changed files with 14 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
internal/helm/plan.go
View File

@@ -93,10 +93,13 @@ func (p *Plan) Execute() error {
}
var upgrade = func(cfg env.Config) []Step {
steps := initKube(cfg)
steps = append(steps, addRepos(cfg)...)
var steps []Step
steps = append(steps, run.NewInitKube(cfg, kubeConfigTemplate, kubeConfigFile))
for _, repo := range cfg.AddRepos {
steps = append(steps, run.NewAddRepo(repo))
}
if cfg.UpdateDependencies {
steps = append(steps, depUpdate(cfg)...)
steps = append(steps, run.NewDepUpdate(cfg))
}
steps = append(steps, run.NewUpgrade(cfg))
@@ -104,9 +107,10 @@ var upgrade = func(cfg env.Config) []Step {
}
var uninstall = func(cfg env.Config) []Step {
steps := initKube(cfg)
var steps []Step
steps = append(steps, run.NewInitKube(cfg, kubeConfigTemplate, kubeConfigFile))
if cfg.UpdateDependencies {
steps = append(steps, depUpdate(cfg)...)
steps = append(steps, run.NewDepUpdate(cfg))
}
steps = append(steps, run.NewUninstall(cfg))
@@ -114,9 +118,12 @@ var uninstall = func(cfg env.Config) []Step {
}
var lint = func(cfg env.Config) []Step {
steps := addRepos(cfg)
var steps []Step
for _, repo := range cfg.AddRepos {
steps = append(steps, run.NewAddRepo(repo))
}
if cfg.UpdateDependencies {
steps = append(steps, depUpdate(cfg)...)
steps = append(steps, run.NewDepUpdate(cfg))
}
steps = append(steps, run.NewLint(cfg))
return steps
@@ -125,20 +132,3 @@ var lint = func(cfg env.Config) []Step {
var help = func(cfg env.Config) []Step {
return []Step{run.NewHelp(cfg)}
}
func initKube(cfg env.Config) []Step {
return []Step{run.NewInitKube(cfg, kubeConfigTemplate, kubeConfigFile)}
}
func addRepos(cfg env.Config) []Step {
steps := make([]Step, 0)
for _, repo := range cfg.AddRepos {
steps = append(steps, run.NewAddRepo(repo))
}
return steps
}
func depUpdate(cfg env.Config) []Step {
return []Step{run.NewDepUpdate(cfg)}
}