kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

address code review comments 

add better error handling and remove duplication in enableOrDisableAddonsInternal
pull/6124/head
Priya Wadhwa 2020-01-06 13:42:09 -08:00
parent 885ec3c725
commit 6ad7e4a9a0
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/addons/addons.go
View File

@ -45,22 +45,22 @@ func Set(name, value, profile string) error {
// Run any additional validations for this property
if err := run(name, value, profile, a.validations); err != nil {
return err
return errors.Wrap(err, "running validations")
}
// Set the value
c, err := config.Load(profile)
if err != nil {
return err
return errors.Wrap(err, "loading profile")
}
if err := a.set(c, name, value); err != nil {
return err
return errors.Wrap(err, "setting new value of addon")
}
// Run any callbacks for this property
if err := run(name, value, profile, a.callbacks); err != nil {
return err
return errors.Wrap(err, "running callbacks")
}
// Write the value
@ -175,37 +175,24 @@ func isAddonAlreadySet(addon *assets.Addon, enable bool) (bool, error) {
func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data interface{}, enable bool) error {
var err error
if enable {
for _, addon := range addon.Assets {
var addonFile assets.CopyableFile
if addon.IsTemplate() {
addonFile, err = addon.Evaluate(data)
if err != nil {
return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
}
updateFile := cmd.Copy
if !enable {
updateFile = cmd.Remove
}
} else {
addonFile = addon
}
if err := cmd.Copy(addonFile); err != nil {
return errors.Wrapf(err, "enabling addon %s", addon.AssetName)
for _, addon := range addon.Assets {
var addonFile assets.CopyableFile
if addon.IsTemplate() {
addonFile, err = addon.Evaluate(data)
if err != nil {
return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
}
} else {
addonFile = addon
}
} else {
for _, addon := range addon.Assets {
var addonFile assets.CopyableFile
if addon.IsTemplate() {
addonFile, err = addon.Evaluate(data)
if err != nil {
return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
}
} else {
addonFile = addon
}
if err := cmd.Remove(addonFile); err != nil {
return errors.Wrapf(err, "disabling addon %s", addon.AssetName)
}
if err := updateFile(addonFile); err != nil {
return errors.Wrapf(err, "updating addon %s", addon.AssetName)
}
}
return nil