As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects
Unverified Commit 4fc58f1c authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Rename to parsing failed as it's an error string

parent ec516663
No related branches found
No related tags found
No related merge requests found
Showing
with 19 additions and 24 deletions
Loading
Loading
@@ -139,7 +139,7 @@ func TestExecute(t *testing.T) {
GitlabKeyId: "badresponse",
SshArgs: []string{cmdname, "newtoken", "read_api,read_repository"},
},
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "when API returns an error",
Loading
Loading
Loading
Loading
@@ -85,7 +85,7 @@ func TestExecute(t *testing.T) {
desc: "With bad response",
arguments: &commandargs.Shell{GitlabKeyId: "-1"},
answer: "yes\n",
expectedOutput: question + errorHeader + "Parsing failed\n",
expectedOutput: question + errorHeader + "parsing failed\n",
},
{
desc: "With API returns an error",
Loading
Loading
Loading
Loading
@@ -126,7 +126,7 @@ func TestExecute(t *testing.T) {
{
desc: "With bad response",
arguments: &commandargs.Shell{GitlabKeyId: "-1"},
expectedOutput: errorHeader + "Parsing failed\n",
expectedOutput: errorHeader + "parsing failed\n",
},
{
desc: "With API returns an error",
Loading
Loading
Loading
Loading
@@ -174,7 +174,7 @@ func TestErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
fakeID: "3",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
Loading
Loading
@@ -70,7 +70,7 @@ func TestGetByKeyErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
key: "broken-json",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "A forbidden (403) response without message",
Loading
Loading
Loading
Loading
@@ -70,7 +70,7 @@ func TestGetByKeyErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
key: "broken-json",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "A forbidden (403) response without message",
Loading
Loading
Loading
Loading
@@ -11,10 +11,6 @@ import (
"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
)
var (
ParsingError = fmt.Errorf("Parsing failed")
)
func GetClient(config *config.Config) (*client.GitlabNetClient, error) {
httpClient, err := config.HTTPClient()
if err != nil {
Loading
Loading
@@ -30,7 +26,7 @@ func GetClient(config *config.Config) (*client.GitlabNetClient, error) {
func ParseJSON(hr *http.Response, response interface{}) error {
if err := json.NewDecoder(hr.Body).Decode(response); err != nil {
return ParsingError
return fmt.Errorf("parsing failed")
}
return nil
Loading
Loading
Loading
Loading
@@ -120,7 +120,7 @@ func TestErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
fakeUsername: "broken_json",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
Loading
Loading
@@ -64,7 +64,7 @@ func TestFailedRequests(t *testing.T) {
{
desc: "With bad response",
args: &commandargs.Shell{GitlabKeyId: "-1", CommandType: commandargs.LfsAuthenticate, SshArgs: []string{"git-lfs-authenticate", repo, "download"}},
expectedOutput: "Parsing failed",
expectedOutput: "parsing failed",
},
{
desc: "With API returns an error",
Loading
Loading
Loading
Loading
@@ -140,7 +140,7 @@ func TestErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
fakeID: "3",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
Loading
Loading
@@ -122,7 +122,7 @@ func TestErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
fakeID: "3",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
Loading
Loading
@@ -127,7 +127,7 @@ func TestErrorResponses(t *testing.T) {
{
desc: "A response with bad JSON",
fakeID: "3",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
@@ -178,7 +178,7 @@ func TestErrorResponsesPush(t *testing.T) {
{
desc: "A response with bad JSON",
fakeID: "3",
expectedError: "Parsing failed",
expectedError: "parsing failed",
},
{
desc: "An error response without message",
Loading
Loading
Loading
Loading
@@ -341,11 +341,10 @@ internal/gitlabnet/accessverifier/client_test.go:280:6: go-require: do not use r
internal/gitlabnet/accessverifier/client_test.go:301:5: go-require: do not use require in http handlers (testifylint)
internal/gitlabnet/accessverifier/client_test.go:305:5: go-require: do not use require in http handlers (testifylint)
internal/gitlabnet/client.go:1:1: package-comments: should have a package comment (revive)
internal/gitlabnet/client.go:15:2: exported: exported var ParsingError should have comment or be unexported (revive)
internal/gitlabnet/client.go:18:1: exported: exported function GetClient should have comment or be unexported (revive)
internal/gitlabnet/client.go:25:15: ST1005: error strings should not be capitalized (stylecheck)
internal/gitlabnet/client.go:31:1: exported: exported function ParseJSON should have comment or be unexported (revive)
internal/gitlabnet/client.go:39:1: exported: exported function ParseIP should have comment or be unexported (revive)
internal/gitlabnet/client.go:14:1: exported: exported function GetClient should have comment or be unexported (revive)
internal/gitlabnet/client.go:21:15: ST1005: error strings should not be capitalized (stylecheck)
internal/gitlabnet/client.go:27:1: exported: exported function ParseJSON should have comment or be unexported (revive)
internal/gitlabnet/client.go:35:1: exported: exported function ParseIP should have comment or be unexported (revive)
internal/gitlabnet/git/client_test.go:56:14: string `0032want 0a53e9ddeaddad63ad106860237bbf53411d11a7
` has 3 occurrences, make it a constant (goconst)
internal/gitlabnet/git/client_test.go:160:5: go-require: do not use require in http handlers (testifylint)
Loading
Loading
@@ -397,8 +396,8 @@ internal/gitlabnet/lfstransfer/client.go:104:5: exported: exported var ClientHea
internal/gitlabnet/lfstransfer/client.go:106:1: exported: exported function NewClient should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:124:1: exported: exported method Client.Batch should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:125: internal/gitlabnet/lfstransfer/client.go:125: Line contains TODO/BUG/FIXME/NOTE/OPTIMIZE/HACK: "FIXME: This causes tests to fail" (godox)
internal/gitlabnet/lfstransfer/client.go:171:1: exported: exported method Client.GetObject should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:191:1: exported: exported method Client.PutObject should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:171:28: unused-parameter: parameter 'oid' seems to be unused, consider removing or renaming it as _ (revive)
internal/gitlabnet/lfstransfer/client.go:191:28: unused-parameter: parameter 'oid' seems to be unused, consider removing or renaming it as _ (revive)
internal/gitlabnet/lfstransfer/client.go:212:1: exported: exported method Client.Lock should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:269:1: exported: exported method Client.Unlock should have comment or be unexported (revive)
internal/gitlabnet/lfstransfer/client.go:319:1: exported: exported method Client.ListLocksVerify should have comment or be unexported (revive)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment