upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(plugins): add error when updating modified plugins

Browse source 
If git has autosetuprebase enabled pulling will fail without a
descriptive error message.
This commit is contained in:
Adam Reese 2017-05-19 13:48:37 -07:00 committed by Adam Reese
parent 15254e4c5c
commit 1e8ebae249
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/plugin/installer/vcs_installer.go
View file

@ -16,6 +16,7 @@ limitations under the License.
package installer // import "k8s.io/helm/pkg/plugin/installer"
import (
"errors"
"fmt"
"os"
"sort"
@ -92,6 +93,9 @@ func (i *VCSInstaller) Install() error {
// Update updates a remote repository
func (i *VCSInstaller) Update() error {
debug("updating %s", i.Repo.Remote())
if i.Repo.IsDirty() {
return errors.New("plugin repo was modified")
}
if err := i.Repo.Update(); err != nil {
return err
}

6
pkg/plugin/installer/vcs_installer_test.go
View file

@ -195,9 +195,9 @@ func TestVCSInstallerUpdate(t *testing.T) {
os.Remove(filepath.Join(i.Path(), "plugin.yaml"))
// Testing update for error
if err := Update(i); err == nil {
t.Error("expected error for plugin metadata missing, got none")
} else if err.Error() != "plugin metadata (plugin.yaml) missing" {
t.Errorf("expected error for plugin metadata missing, got (%v)", err)
t.Error("expected error for plugin modified, got none")
} else if err.Error() != "plugin repo was modified" {
t.Errorf("expected error for plugin modified, got (%v)", err)
}
}