Skip to content

Commit ce55cee

Browse files
committed
[lint] Make govet & golanci-lint pass again
1 parent 00a84de commit ce55cee

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

cmd/lakectl/cmd/login.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ type webLoginParams struct {
2626
}
2727

2828
var (
29-
errTryAgain = errors.New("HTTP request failed; retry")
30-
errDontTryAgain = backoff.Permanent(errors.New("failed to get token"))
29+
errTryAgain = errors.New("HTTP request failed; retry")
30+
errFailedToGetToken = errors.New("failed to get token")
31+
errFailedToGetTokenDontTryAgain = backoff.Permanent(errFailedToGetToken)
3132
)
3233

3334
var loginCmd = &cobra.Command{
@@ -38,7 +39,7 @@ var loginCmd = &cobra.Command{
3839
Run: func(cmd *cobra.Command, _ []string) {
3940
serverURL, err := url.Parse(cfg.Server.EndpointURL.String())
4041
if err != nil {
41-
DieErr(fmt.Errorf("Get server URL %s: %w", cfg.Server.EndpointURL, err))
42+
DieErr(fmt.Errorf("get server URL %s: %w", cfg.Server.EndpointURL, err))
4243
}
4344

4445
client := getClient()
@@ -48,7 +49,7 @@ var loginCmd = &cobra.Command{
4849
header := tokenRedirect.HTTPResponse.Header
4950
relativeLocation, err := url.Parse(header.Get("location"))
5051
if err != nil {
51-
DieErr(fmt.Errorf("Parse relative redirect URL %s: %w", header.Get("location"), err))
52+
DieErr(fmt.Errorf("parse relative redirect URL %s: %w", header.Get("location"), err))
5253
}
5354
mailbox := header.Get("x-lakefs-mailbox")
5455

@@ -68,7 +69,7 @@ var loginCmd = &cobra.Command{
6869
return nil, errTryAgain
6970
}
7071
if resp.JSON200 == nil {
71-
return nil, errDontTryAgain
72+
return nil, errFailedToGetTokenDontTryAgain
7273
}
7374
return resp.JSON200, nil
7475
},
@@ -85,7 +86,7 @@ var loginCmd = &cobra.Command{
8586
}
8687

8788
if loginToken == nil {
88-
Die("nil login token", 2)
89+
Die("nil login token", 1)
8990
}
9091

9192
cache := getTokenCacheOnce()

pkg/api/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,10 +915,10 @@ type UserData struct {
915915
}
916916

917917
var (
918-
textHTML = contenttype.MediaType{"text", "html", nil}
918+
textHTML = contenttype.MediaType{Type: "text", Subtype: "html"}
919919
releaseTokenAcceptableMediaTypes = []contenttype.MediaType{
920920
textHTML,
921-
{"*", "*", nil},
921+
{Type: "*", Subtype: "*"},
922922
}
923923
)
924924

0 commit comments

Comments
 (0)