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

Do repo error-checking in AddRepo.Prepare [#26]

Browse Source
This commit is contained in:
Erin Call
2019-12-30 13:24:57 -08:00
parent 48b6b3f5b3
commit 499ab6877f
4 changed files with 38 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/run/addrepo.go
View File

@@ -2,12 +2,12 @@ package run
import (
"fmt"
"strings"
)
// AddRepo is an execution step that calls `helm repo add` when executed.
type AddRepo struct {
Name string
URL string
Repo string
cmd cmd
}
@@ -18,13 +18,17 @@ func (a *AddRepo) Execute(_ Config) error {
// Prepare gets the AddRepo ready to execute.
func (a *AddRepo) Prepare(cfg Config) error {
if a.Name == "" {
return fmt.Errorf("repo name is required")
if a.Repo == "" {
return fmt.Errorf("repo is required")
}
if a.URL == "" {
return fmt.Errorf("repo URL is required")
split := strings.SplitN(a.Repo, "=", 2)
if len(split) != 2 {
return fmt.Errorf("bad repo spec '%s'", a.Repo)
}
name := split[0]
url := split[1]
args := make([]string, 0)
if cfg.Namespace != "" {
@@ -34,7 +38,7 @@ func (a *AddRepo) Prepare(cfg Config) error {
args = append(args, "--debug")
}
args = append(args, "repo", "add", a.Name, a.URL)
args = append(args, "repo", "add", name, url)
a.cmd = command(helmBin, args...)
a.cmd.Stdout(cfg.Stdout)

41
internal/run/addrepo_test.go
View File

@@ -46,8 +46,7 @@ func (suite *AddRepoTestSuite) TestPrepareAndExecute() {
Stderr: &stderr,
}
a := AddRepo{
Name: "edeath",
URL: "https://github.com/n_marks/e-death",
Repo: "edeath=https://github.com/n_marks/e-death",
}
suite.mockCmd.EXPECT().
@@ -58,8 +57,8 @@ func (suite *AddRepoTestSuite) TestPrepareAndExecute() {
Times(1)
suite.Require().NoError(a.Prepare(cfg))
suite.Equal(suite.commandPath, helmBin)
suite.Equal(suite.commandArgs, []string{"repo", "add", "edeath", "https://github.com/n_marks/e-death"})
suite.Equal(helmBin, suite.commandPath)
suite.Equal([]string{"repo", "add", "edeath", "https://github.com/n_marks/e-death"}, suite.commandArgs)
suite.mockCmd.EXPECT().
Run().
@@ -69,23 +68,33 @@ func (suite *AddRepoTestSuite) TestPrepareAndExecute() {
}
func (suite *AddRepoTestSuite) TestRequiredFields() {
func (suite *AddRepoTestSuite) TestPrepareRepoIsRequired() {
// These aren't really expected, but allowing them gives clearer test-failure messages
suite.mockCmd.EXPECT().Stdout(gomock.Any()).AnyTimes()
suite.mockCmd.EXPECT().Stderr(gomock.Any()).AnyTimes()
cfg := Config{}
a := AddRepo{
Name: "idgen",
}
a := AddRepo{}
err := a.Prepare(cfg)
suite.EqualError(err, "repo URL is required")
suite.EqualError(err, "repo is required")
}
a.Name = ""
a.URL = "https://github.com/n_marks/idgen"
func (suite *AddRepoTestSuite) TestPrepareMalformedRepo() {
a := AddRepo{
Repo: "dwim",
}
err := a.Prepare(Config{})
suite.EqualError(err, "bad repo spec 'dwim'")
}
err = a.Prepare(cfg)
suite.EqualError(err, "repo name is required")
func (suite *AddRepoTestSuite) TestPrepareWithEqualSignInURL() {
suite.mockCmd.EXPECT().Stdout(gomock.Any()).AnyTimes()
suite.mockCmd.EXPECT().Stderr(gomock.Any()).AnyTimes()
a := AddRepo{
Repo: "samaritan=https://github.com/arthur_claypool/samaritan?version=2.1",
}
suite.NoError(a.Prepare(Config{}))
suite.Contains(suite.commandArgs, "https://github.com/arthur_claypool/samaritan?version=2.1")
}
func (suite *AddRepoTestSuite) TestNamespaceFlag() {
@@ -95,8 +104,7 @@ func (suite *AddRepoTestSuite) TestNamespaceFlag() {
Namespace: "alliteration",
}
a := AddRepo{
Name: "edeath",
URL: "https://github.com/theater_guy/e-death",
Repo: "edeath=https://github.com/theater_guy/e-death",
}
suite.NoError(a.Prepare(cfg))
@@ -124,8 +132,7 @@ func (suite *AddRepoTestSuite) TestDebugFlag() {
Stderr: &stderr,
}
a := AddRepo{
Name: "edeath",
URL: "https://github.com/the_bug/e-death",
Repo: "edeath=https://github.com/the_bug/e-death",
}
suite.Require().NoError(a.Prepare(cfg))