Using errormapper from bitrise-init (#128)

* Removed code redundancy
bitrise-steplib · Nov 9, 2020 · af8aa6f · af8aa6f
1 parent c33b9a8
commit af8aa6f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 238 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/errormapper/errormapper_test.go b/errormapper/errormapper_test.go
diff --git a/gitclone/git.go b/gitclone/git.go
@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/bitrise-io/bitrise-init/errormapper"
 	"github.com/bitrise-io/bitrise-init/step"
 	"github.com/bitrise-io/go-utils/command"
 	"github.com/bitrise-io/go-utils/command/git"
@@ -21,7 +22,6 @@ import (
 	"github.com/bitrise-io/go-utils/pathutil"
 	"github.com/bitrise-io/go-utils/retry"
 	"github.com/bitrise-io/go-utils/sliceutil"
-	"github.com/bitrise-steplib/steps-git-clone/errormapper"
 )
 
 const (

diff --git a/gitclone/steperror.go b/gitclone/steperror.go
@@ -3,8 +3,8 @@ package gitclone
 import (
 	"fmt"
 
+	"github.com/bitrise-io/bitrise-init/errormapper"
 	"github.com/bitrise-io/bitrise-init/step"
-	"github.com/bitrise-steplib/steps-git-clone/errormapper"
 )
 
 func mapRecommendation(tag, errMsg string) step.Recommendation {
@@ -85,7 +85,7 @@ func newFetchFailedGenericDetailedError(params ...string) errormapper.DetailedEr
 	}
 }
 
-func newFetchFailedSSHAccessErrorDetailedError(params ...string) errormapper.DetailedError {
+func newFetchFailedSSHAccessErrorDetailedError(...string) errormapper.DetailedError {
 	return errormapper.DetailedError{
 		Title:       "We couldn’t access your repository.",
 		Description: "Please abort the process, double-check your SSH key and try again.",
@@ -100,7 +100,7 @@ func newFetchFailedCouldNotFindGitRepoDetailedError(params ...string) errormappe
 	}
 }
 
-func newFetchFailedHTTPAccessErrorDetailedError(params ...string) errormapper.DetailedError {
+func newFetchFailedHTTPAccessErrorDetailedError(...string) errormapper.DetailedError {
 	return errormapper.DetailedError{
 		Title:       "We couldn’t access your repository.",
 		Description: "Please abort the process and try again, by providing the repository with SSH URL.",
@@ -115,7 +115,7 @@ func newFetchFailedCouldConnectErrorDetailedError(params ...string) errormapper.
 	}
 }
 
-func newFetchFailedSamlSSOEnforcedDetailedError(params ...string) errormapper.DetailedError {
+func newFetchFailedSamlSSOEnforcedDetailedError(...string) errormapper.DetailedError {
 	return errormapper.DetailedError{
 		Title:       "To access this repository, you need to use SAML SSO.",
 		Description: `Please abort the process, update your SSH settings and try again. You can find out more about <a target="_blank" href="https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/authorizing-an-ssh-key-for-use-with-saml-single-sign-on">using SAML SSO in the Github docs</a>.`,

diff --git a/gitclone/steperror_test.go b/gitclone/steperror_test.go
@@ -5,12 +5,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/bitrise-io/bitrise-init/errormapper"
 	"github.com/bitrise-io/bitrise-init/step"
-	"github.com/bitrise-steplib/steps-git-clone/errormapper"
 )
 
-var mapRecommendationMock func(tag, errMsg string) step.Recommendation
-
 func Test_mapRecommendation(t *testing.T) {
 	type args struct {
 		tag    string

diff --git a/errormapper/errormapper.go → ...o/bitrise-init/errormapper/errormapper.go b/errormapper/errormapper.go → ...o/bitrise-init/errormapper/errormapper.go