Fix style conformance issues

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
This commit is contained in:
Martin Hickey
2019-07-29 19:17:35 +01:00
parent 095ba431aa
commit 5410e7d346
3 changed files with 14 additions and 15 deletions

View File

@@ -20,14 +20,14 @@ import (
"fmt"
"io"
"github.com/spf13/cobra"
"github.com/gosuri/uitable"
"github.com/spf13/cobra"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/releaseutil"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/release"
"helm.sh/helm/pkg/releaseutil"
)
var historyHelp = `
@@ -132,7 +132,6 @@ func getHistory(client *action.History, name string) (string, error) {
return string(history), nil
}
func getReleaseHistory(rls []*release.Release) (history releaseHistory) {
for i := len(rls) - 1; i >= 0; i-- {
r := rls[i]
@@ -182,4 +181,4 @@ func min(x, y int) int {
return x
}
return y
}
}

View File

@@ -125,12 +125,12 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
if err != nil {
errs = append(errs, errors.Wrap(err, "uninstall: Failed to purge the release"))
}
// Return the errors that occurred while deleting the release, if any
if len(errs) > 0 {
return res, errors.Errorf("uninstallation completed with %d error(s): %s", len(errs), joinErrors(errs))
}
return res, nil
}

View File

@@ -32,14 +32,14 @@ import (
// delegates all its calls to `PrintingKubeClient`
type FailingKubeClient struct {
PrintingKubeClient
CreateError error
WaitError error
GetError error
DeleteError error
WatchUntilReadyError error
UpdateError error
BuildError error
BuildUnstructuredError error
CreateError error
WaitError error
GetError error
DeleteError error
WatchUntilReadyError error
UpdateError error
BuildError error
BuildUnstructuredError error
WaitAndGetCompletedPodPhaseError error
}
@@ -113,4 +113,4 @@ func (f *FailingKubeClient) WaitAndGetCompletedPodPhase(s string, d time.Duratio
return v1.PodSucceeded, f.WaitAndGetCompletedPodPhaseError
}
return f.PrintingKubeClient.WaitAndGetCompletedPodPhase(s, d)
}
}