|
|
@ -17,13 +17,12 @@ package getter
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"bytes"
|
|
|
|
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"os"
|
|
|
|
"os/exec"
|
|
|
|
"os/exec"
|
|
|
|
"path/filepath"
|
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"helm.sh/helm/v3/pkg/cli"
|
|
|
|
"helm.sh/helm/v3/pkg/cli"
|
|
|
|
"helm.sh/helm/v3/pkg/plugin"
|
|
|
|
"helm.sh/helm/v3/pkg/plugin"
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -78,7 +77,7 @@ func (p *pluginGetter) Get(href string, options ...Option) (*bytes.Buffer, error
|
|
|
|
if err := prog.Run(); err != nil {
|
|
|
|
if err := prog.Run(); err != nil {
|
|
|
|
if eerr, ok := err.(*exec.ExitError); ok {
|
|
|
|
if eerr, ok := err.(*exec.ExitError); ok {
|
|
|
|
os.Stderr.Write(eerr.Stderr)
|
|
|
|
os.Stderr.Write(eerr.Stderr)
|
|
|
|
return nil, errors.Errorf("plugin %q exited with error", p.command)
|
|
|
|
return nil, fmt.Errorf("plugin %q exited with error", p.command)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|