Skip to content

Commit

Permalink
Add context around checkout failures (#210)
Browse files Browse the repository at this point in the history
* Added context around failure to fetch branch for different checkout method

* Added suggestions for fetch failures

* Update gitclone/checkout_method_pr_auto_diff.go

Co-authored-by: Olivér Falvai <[email protected]>

* Update gitclone/checkout_method_pr_auto_merge_branch.go

Co-authored-by: Olivér Falvai <[email protected]>

* Update gitclone/checkout_method_pr_manual.go

Co-authored-by: Olivér Falvai <[email protected]>

* Update gitclone/checkout_method_pr_manual.go

Co-authored-by: Olivér Falvai <[email protected]>

* Update gitclone/checkout_helper.go

Co-authored-by: lpusok <[email protected]>

* Fix error formatting

* Fixed failing unit test

* Fixed error wrapping for fetch errors

* Remove steperror changes

* Added additional context before commit checkout

* Added a suggestion for simple commit checkout

* Added context and suggestion for initial branch fetch

* Wrap errors

* Add context when tag fetch failed

* Fix tests

* Handled empty error scenario

* Update gitclone/checkout_helper.go

Co-authored-by: Olivér Falvai <[email protected]>

* Updated go-steputils dep

---------

Co-authored-by: Olivér Falvai <[email protected]>
Co-authored-by: lpusok <[email protected]>
  • Loading branch information
3 people authored Mar 20, 2023
1 parent d03a3a0 commit f29bfca
Show file tree
Hide file tree
Showing 12 changed files with 72 additions and 44 deletions.
15 changes: 9 additions & 6 deletions gitclone/checkout_helper.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gitclone

import (
"errors"
"fmt"
"strings"

Expand Down Expand Up @@ -72,7 +73,7 @@ func fetch(gitCmd git.Git, remote string, ref string, options fetchOptions) erro
return handleCheckoutError(
listBranches(gitCmd),
fetchFailedTag,
fmt.Errorf("fetch failed: %v", err),
err,
"Fetching repository has failed",
branch,
)
Expand All @@ -92,7 +93,7 @@ func checkoutWithCustomRetry(gitCmd git.Git, arg string, retry fallbackRetry) er
return runner.Run(gitCmd.Checkout(arg))
}

return fmt.Errorf("checkout failed (%s): %v", arg, cErr)
return fmt.Errorf("checkout failed (%s): %w", arg, cErr)
}

return nil
Expand All @@ -101,7 +102,8 @@ func checkoutWithCustomRetry(gitCmd git.Git, arg string, retry fallbackRetry) er
func fetchInitialBranch(gitCmd git.Git, remote string, branchRef string, fetchTraits fetchOptions) error {
branch := strings.TrimPrefix(branchRef, refsHeadsPrefix)
if err := fetch(gitCmd, remote, branchRef, fetchTraits); err != nil {
return err
wErr := fmt.Errorf("failed to fetch branch (%s): %w", branchRef, err)
return fmt.Errorf("%v: %w", wErr, errors.New("please make sure the branch still exists"))
}

if err := checkoutWithCustomRetry(gitCmd, branch, nil); err != nil {
Expand All @@ -119,7 +121,7 @@ func fetchInitialBranch(gitCmd git.Git, remote string, branchRef string, fetchTr
if err := runner.Run(gitCmd.Merge(remoteBranch)); err != nil {
return newStepError(
"update_branch_failed",
fmt.Errorf("updating branch (merge) failed %s: %v", branch, err),
fmt.Errorf("updating branch (%s) failed: %w", branch, err),
"Updating branch failed",
)
}
Expand All @@ -138,7 +140,8 @@ func mergeWithCustomRetry(gitCmd git.Git, arg string, retry fallbackRetry) error
return runner.Run(gitCmd.Merge(arg))
}

return fmt.Errorf("merge failed (%s): %v", arg, mErr)
wErr := fmt.Errorf("merge failed (%s): %w", arg, mErr)
return fmt.Errorf("%v: %w", wErr, errors.New("please try to resolve all conflicts between the base and compare branches"))
}

return nil
Expand All @@ -148,7 +151,7 @@ func detachHead(gitCmd git.Git) error {
if err := runner.Run(gitCmd.Checkout("--detach")); err != nil {
return newStepError(
"detach_head_failed",
fmt.Errorf("detaching head failed: %v", err),
fmt.Errorf("detaching head failed: %w", err),
"Detaching head failed",
)
}
Expand Down
2 changes: 1 addition & 1 deletion gitclone/checkout_method_pr_auto_diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type checkoutPRDiffFile struct {
func (c checkoutPRDiffFile) do(gitCmd git.Git, fetchOptions fetchOptions, fallback fallbackRetry) error {
destBranchRef := refsHeadsPrefix + c.params.DestinationBranch
if err := fetch(gitCmd, originRemoteName, destBranchRef, fetchOptions); err != nil {
return err
return fmt.Errorf("failed to fetch base branch: %w", err)
}

if err := checkoutWithCustomRetry(gitCmd, c.params.DestinationBranch, fallback); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion gitclone/checkout_method_pr_auto_merge_branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (c checkoutPRMergeRef) do(gitCmd git.Git, fetchOpts fetchOptions, fallback
// $ git fetch origin refs/remotes/pull/7/merge:refs/pull/7/merge
err := fetch(gitCmd, originRemoteName, refSpec, fetchOpts)
if err != nil {
return err
return fmt.Errorf("failed to fetch merge ref: %w", err)
}

// Also fetch the PR head ref because the step exports outputs based on the PR head commit (see output.go)
Expand Down
12 changes: 6 additions & 6 deletions gitclone/checkout_method_pr_manual.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ func NewPRManualMergeParams(sourceBranch, commit, sourceRepoURL, destBranch stri

func validatePRManualMergeParams(sourceBranch, commit, sourceRepoURL, destBranch string) error {
if strings.TrimSpace(sourceBranch) == "" {
return NewParameterValidationError("manual PR merge checkout strategy can not be used: no source branch specified")
return NewParameterValidationError("manual PR merge checkout strategy cannot be used: no source branch specified")
}

if strings.TrimSpace(destBranch) == "" {
return NewParameterValidationError("manual PR merge checkout strategy can not be used: no destination branch specified")
return NewParameterValidationError("manual PR merge checkout strategy cannot be used: no destination branch specified")
}

if strings.TrimSpace(sourceRepoURL) == "" && strings.TrimSpace(commit) == "" {
return NewParameterValidationError("manual PR merge chekout strategy can not be used: no source repository URL or source branch commit hash specified")
return NewParameterValidationError("manual PR merge checkout strategy cannot be used: no source repository URL or source branch commit hash specified")
}

return nil
Expand All @@ -62,7 +62,7 @@ func (c checkoutPRManualMerge) do(gitCmd git.Git, fetchOptions fetchOptions, fal
// Fetch and checkout destinations branch
destBranchRef := refsHeadsPrefix + c.params.DestinationBranch
if err := fetchInitialBranch(gitCmd, originRemoteName, destBranchRef, fetchOptions); err != nil {
return err
return fmt.Errorf("failed to fetch base branch: %w", err)
}

commitHash, err := runner.RunForOutput(gitCmd.Log("%H"))
Expand All @@ -77,7 +77,7 @@ func (c checkoutPRManualMerge) do(gitCmd git.Git, fetchOptions fetchOptions, fal

// Add fork remote
if err := runner.Run(gitCmd.RemoteAdd(forkRemoteName, c.params.SourceRepoURL)); err != nil {
return fmt.Errorf("adding remote fork repository failed (%s): %v", c.params.SourceRepoURL, err)
return fmt.Errorf("adding remote fork repository failed (%s): %w", c.params.SourceRepoURL, err)
}

} else {
Expand All @@ -87,7 +87,7 @@ func (c checkoutPRManualMerge) do(gitCmd git.Git, fetchOptions fetchOptions, fal
// Fetch and merge
sourceBranchRef := refsHeadsPrefix + c.params.SourceBranch
if err := fetch(gitCmd, remoteName, sourceBranchRef, fetchOptions); err != nil {
return err
return fmt.Errorf("failed to fetch compare branch: %w", err)
}

if err := mergeWithCustomRetry(gitCmd, c.params.SourceMergeArg, fallback); err != nil {
Expand Down
8 changes: 5 additions & 3 deletions gitclone/checkout_method_simple.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ func (c checkoutCommit) do(gitCmd git.Git, fetchOptions fetchOptions, fallback f
}

if err := fetch(gitCmd, remote, c.params.BranchRef, fetchOptions); err != nil {
return err
return fmt.Errorf("failed to fetch branch ref (%s) while checking out commit: %w", c.params.BranchRef, err)
}

if err := checkoutWithCustomRetry(gitCmd, c.params.Commit, fallback); err != nil {
return err
err = fmt.Errorf("failed to checkout commit: %w", err)
newErr := fmt.Errorf("please check if the provided commit hash (%s) is valid", c.params.Commit)
return fmt.Errorf("%v: %w", err, newErr)
}

return nil
Expand Down Expand Up @@ -128,7 +130,7 @@ type checkoutTag struct {
func (c checkoutTag) do(gitCmd git.Git, fetchOptions fetchOptions, fallback fallbackRetry) error {
ref := fmt.Sprintf("%s:%s", c.ref(), c.ref())
if err := fetch(gitCmd, originRemoteName, ref, fetchOptions); err != nil {
return err
return fmt.Errorf("failed to fetch tag (%s): %w", c.ref(), err)
}

if err := checkoutWithCustomRetry(gitCmd, c.params.Tag, fallback); err != nil {
Expand Down
6 changes: 5 additions & 1 deletion gitclone/command_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ func (r DefaultRunner) Run(c *command.Model) error {
err := c.SetStdout(os.Stdout).SetStderr(io.MultiWriter(os.Stderr, &buffer)).Run()
if err != nil {
if errorutil.IsExitStatusError(err) {
return errors.New(strings.TrimSpace(buffer.String()))
errorStr := buffer.String()
if errorStr == "" {
errorStr = "please check the command output for errors"
}
return errors.New(strings.TrimSpace(errorStr))
}
return err
}
Expand Down
5 changes: 2 additions & 3 deletions gitclone/gitclone_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"testing"

"github.com/bitrise-io/go-steputils/step"
"github.com/bitrise-io/go-utils/command/git"
"github.com/bitrise-io/go-utils/v2/command"
"github.com/bitrise-io/go-utils/v2/env"
Expand Down Expand Up @@ -201,7 +200,7 @@ func Test_checkoutState(t *testing.T) {
`git "fetch" "--jobs=10"`,
`git "branch" "-r"`,
},
wantErrType: &step.Error{},
wantErr: fmt.Errorf("failed to fetch base branch: failed to fetch branch (refs/heads/master): dummy_cmd_error: please make sure the branch still exists"),
},
{
name: "PR - fork - no merge ref - diff file available",
Expand Down Expand Up @@ -372,7 +371,7 @@ func Test_checkoutState(t *testing.T) {
},
wantErr: newStepErrorWithBranchRecommendations(
fetchFailedTag,
fmt.Errorf("fetch failed: %v", errors.New(rawCmdError)),
fmt.Errorf("failed to fetch branch (refs/heads/fake): %w: please make sure the branch still exists", errors.New(rawCmdError)),
"Fetching repository has failed",
"fake",
[]string{"master"},
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ go 1.17
require (
github.com/bitrise-io/bitrise-init v0.0.0-20210518121553-1e678625c45d
github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5
github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77
github.com/bitrise-io/go-steputils v1.0.5
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.15
github.com/bitrise-io/go-utils v1.0.1
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.15
github.com/hashicorp/go-retryablehttp v0.7.1
github.com/stretchr/testify v1.8.1
)

Expand All @@ -17,7 +18,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gofrs/uuid v4.3.1+incompatible // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
Expand Down
20 changes: 13 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5 h1:3jVXjsejV+1EW
github.com/bitrise-io/envman v0.0.0-20210517135508-b2b4fe89eac5/go.mod h1:m8pTp1o3Sw9uzDxb1WRm5IBRnMau2iOvPMSnRCAhQNI=
github.com/bitrise-io/go-plist v0.0.0-20210301100253-4b1a112ccd10/go.mod h1:pARutiL3kEuRLV3JvswidvfCj+9Y3qMZtji2BDqLFsA=
github.com/bitrise-io/go-steputils v0.0.0-20210507072936-92fde382fb33/go.mod h1:YCtb1VETn/rF9tCt9oInhd/cwbt1ETPm+dTlDIfyD+A=
github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 h1:+wd+ADdtJCRL9JEghE1RMbR4ywXBYNvIBelAW/UkWr8=
github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77/go.mod h1:H0iZjgsAR5NA6pnlD/zKB6AbxEsskq55pwJ9klVmP8w=
github.com/bitrise-io/go-steputils v1.0.5 h1:OBH7CPXeqIWFWJw6BOUMQnUb8guspwKr2RhYBhM9tfc=
github.com/bitrise-io/go-steputils v1.0.5/go.mod h1:YIUaQnIAyK4pCvQG0hYHVkSzKNT9uL2FWmkFNW4mfNI=
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.15 h1:wG037NV+pS8cEwtalE5K58bmKLyUkU0+4m4IuXjTzmo=
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.15/go.mod h1:M09BbxYoh6B7KJnXk/yvtuU5nZPh7RQBJGKc1dp+0hQ=
github.com/bitrise-io/go-utils v0.0.0-20201019131314-6cc2aa4d248a/go.mod h1:tTEsKvbz1LbzuN/KpVFHXnLtcAPdEgIdM41s0lL407s=
Expand Down Expand Up @@ -96,22 +97,27 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/whilp/git-urls v1.0.0/go.mod h1:J16SAmobsqc3Qcy98brfl5f5+e0clUvg1krgwk/qCfE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.6.1-0.20230215202200-ebe92624d142 h1:6FrMYOmITa8TPF0uNY6SCU4Z68JxTSnlFPFn992MoIw=
golang.org/x/crypto v0.6.1-0.20230215202200-ebe92624d142/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -123,31 +129,31 @@ golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200220224806-8a925fa4c0df/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
30 changes: 17 additions & 13 deletions vendor/github.com/bitrise-io/go-steputils/input/fileprovider.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/bitrise-io/go-steputils/step/steperror.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ github.com/bitrise-io/bitrise-init/errormapper
## explicit
github.com/bitrise-io/envman/envman
github.com/bitrise-io/envman/models
# github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77
# github.com/bitrise-io/go-steputils v1.0.5
## explicit; go 1.15
github.com/bitrise-io/go-steputils/input
github.com/bitrise-io/go-steputils/step
Expand Down

0 comments on commit f29bfca

Please sign in to comment.