From a3fdb7ab8ed2cf151e23a13cf5cce2229489689a Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Tue, 3 Sep 2024 17:01:56 +0200 Subject: [PATCH] fix linting errors --- Makefile | 2 +- pkg/auth/manager/nextcloud/nextcloud.go | 2 +- pkg/datatx/manager/rclone/rclone.go | 14 +++++++------- pkg/ocm/invite/repository/nextcloud/nextcloud.go | 12 ++++++------ pkg/ocm/share/repository/nextcloud/nextcloud.go | 2 +- pkg/user/manager/ldap/ldap_test.go | 2 +- pkg/user/manager/nextcloud/nextcloud.go | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 41def1b44d..e8d9e63fe2 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ toolchain: $(GOLANGCI_LINT) $(CALENS) $(GOLANGCI_LINT): @mkdir -p $(@D) - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINDIR=$(@D) sh -s v1.54.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINDIR=$(@D) sh -s v1.60.3 CALENS_DIR := $(shell mktemp -d) $(CALENS): diff --git a/pkg/auth/manager/nextcloud/nextcloud.go b/pkg/auth/manager/nextcloud/nextcloud.go index 29ecb77c0f..65c408fec3 100644 --- a/pkg/auth/manager/nextcloud/nextcloud.go +++ b/pkg/auth/manager/nextcloud/nextcloud.go @@ -132,7 +132,7 @@ func (am *Manager) do(ctx context.Context, a Action) (int, []byte, error) { log.Info().Msgf("am.do response %d %s", resp.StatusCode, body) if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated { - return 0, nil, fmt.Errorf("Unexpected response code from EFSS API: " + strconv.Itoa(resp.StatusCode)) + return 0, nil, fmt.Errorf("Unexpected response code from EFSS API: %s", strconv.Itoa(resp.StatusCode)) } return resp.StatusCode, body, nil } diff --git a/pkg/datatx/manager/rclone/rclone.go b/pkg/datatx/manager/rclone/rclone.go index de14886f5c..f5a313ccb4 100644 --- a/pkg/datatx/manager/rclone/rclone.go +++ b/pkg/datatx/manager/rclone/rclone.go @@ -631,7 +631,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d _, endStatusFound := txEndStatuses[job.TransferStatus.String()] if endStatusFound { - err := errors.Wrapf(errors.New("rclone driver: job already in end state"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: job already in end state"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -649,7 +649,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d data, err := json.Marshal(rcloneCancelTransferReq) if err != nil { - err := errors.Wrapf(errors.New("rclone driver: error marshalling rclone job/stop req data"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error marshalling rclone job/stop req data"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -661,7 +661,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d u, err := url.Parse(driver.config.Endpoint) if err != nil { - err := errors.Wrapf(errors.New("rclone driver: error parsing driver endpoint"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error parsing driver endpoint"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -673,7 +673,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d req, err := http.NewRequest(http.MethodPost, requestURL, bytes.NewReader(data)) if err != nil { - err := errors.Wrapf(errors.New("rclone driver: error framing post request"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error framing post request"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -686,7 +686,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d res, err := driver.client.Do(req) if err != nil { - err := errors.Wrapf(errors.New("rclone driver: error sending post request"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error sending post request"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -699,7 +699,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d if res.StatusCode != http.StatusOK { var errorResData rcloneHTTPErrorRes if err = json.NewDecoder(res.Body).Decode(&errorResData); err != nil { - err := errors.Wrapf(errors.New("rclone driver: error decoding response data"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error decoding response data"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, @@ -728,7 +728,7 @@ func (driver *rclone) CancelTransfer(ctx context.Context, transferID string) (*d } var resData rcloneCancelTransferResJSON if err = json.NewDecoder(res.Body).Decode(&resData); err != nil { - err := errors.Wrapf(errors.New("rclone driver: error decoding response data"), transferRemovedMessage) + err := errors.Wrap(errors.New("rclone driver: error decoding response data"), transferRemovedMessage) return &datatx.TxInfo{ Id: &datatx.TxId{OpaqueId: transferID}, Status: datatx.Status_STATUS_INVALID, diff --git a/pkg/ocm/invite/repository/nextcloud/nextcloud.go b/pkg/ocm/invite/repository/nextcloud/nextcloud.go index eb6519a513..40e7d7c0db 100644 --- a/pkg/ocm/invite/repository/nextcloud/nextcloud.go +++ b/pkg/ocm/invite/repository/nextcloud/nextcloud.go @@ -159,7 +159,7 @@ func (c *Client) doPostToken(token string, initiator string, description string, defer resp.Body.Close() if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated { - return false, fmt.Errorf("Unexpected response code from EFSS API: " + strconv.Itoa(resp.StatusCode)) + return false, fmt.Errorf("Unexpected response code from EFSS API: %s", strconv.Itoa(resp.StatusCode)) } return true, nil } @@ -185,7 +185,7 @@ func (c *Client) doGetToken(token string) (*apiToken, error) { } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("Unexpected response code from API: " + strconv.Itoa(resp.StatusCode)) + return nil, fmt.Errorf("Unexpected response code from API: %s", strconv.Itoa(resp.StatusCode)) } result := &apiToken{} @@ -218,7 +218,7 @@ func (c *Client) doGetAllTokens(initiator string) ([]*apiToken, error) { } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("Unexpected response code from API: " + strconv.Itoa(resp.StatusCode)) + return nil, fmt.Errorf("Unexpected response code from API: %s", strconv.Itoa(resp.StatusCode)) } result := []*apiToken{} @@ -257,7 +257,7 @@ func (c *Client) doPostRemoteUser(initiator string, opaqueUserID string, idp str defer resp.Body.Close() if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated { - return false, fmt.Errorf("Unexpected response code from EFSS API: " + strconv.Itoa(resp.StatusCode)) + return false, fmt.Errorf("Unexpected response code from EFSS API: %s", strconv.Itoa(resp.StatusCode)) } return true, nil } @@ -282,7 +282,7 @@ func (c *Client) doGetRemoteUser(initiator string, opaqueUserID string, idp stri } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("Unexpected response code from API: " + strconv.Itoa(resp.StatusCode)) + return nil, fmt.Errorf("Unexpected response code from API: %s", strconv.Itoa(resp.StatusCode)) } result := &apiOCMUser{} @@ -315,7 +315,7 @@ func (c *Client) doGetAllRemoteUsers(initiator string, search string) ([]*apiOCM } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("Unexpected response code from API: " + strconv.Itoa(resp.StatusCode)) + return nil, fmt.Errorf("Unexpected response code from API: %s", strconv.Itoa(resp.StatusCode)) } result := []*apiOCMUser{} diff --git a/pkg/ocm/share/repository/nextcloud/nextcloud.go b/pkg/ocm/share/repository/nextcloud/nextcloud.go index b70f48b529..98d379ca59 100644 --- a/pkg/ocm/share/repository/nextcloud/nextcloud.go +++ b/pkg/ocm/share/repository/nextcloud/nextcloud.go @@ -483,7 +483,7 @@ func (sm *Manager) do(ctx context.Context, a Action, username string) (int, []by log.Info().Int("status", resp.StatusCode).Msgf("sent request to EFSS API, response: %s", body) if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated { - return 0, nil, fmt.Errorf("Unexpected response from EFSS API: " + strconv.Itoa(resp.StatusCode)) + return 0, nil, fmt.Errorf("Unexpected response from EFSS API: %s", strconv.Itoa(resp.StatusCode)) } return resp.StatusCode, body, nil } diff --git a/pkg/user/manager/ldap/ldap_test.go b/pkg/user/manager/ldap/ldap_test.go index e9a071d42a..c721809437 100644 --- a/pkg/user/manager/ldap/ldap_test.go +++ b/pkg/user/manager/ldap/ldap_test.go @@ -67,6 +67,6 @@ func TestUserManager(t *testing.T) { // positive tests for New _, err = New(context.Background(), map[string]interface{}{}) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } } diff --git a/pkg/user/manager/nextcloud/nextcloud.go b/pkg/user/manager/nextcloud/nextcloud.go index b2e3f13607..fb7cbcb5e9 100644 --- a/pkg/user/manager/nextcloud/nextcloud.go +++ b/pkg/user/manager/nextcloud/nextcloud.go @@ -130,7 +130,7 @@ func (um *Manager) do(ctx context.Context, a Action, username string) (int, []by body, err := io.ReadAll(resp.Body) log.Info().Msgf("um.do res %s %s", url, string(body)) if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated { - return 0, nil, fmt.Errorf("Unexpected response code from EFSS API: " + strconv.Itoa(resp.StatusCode)) + return 0, nil, fmt.Errorf("Unexpected response code from EFSS API: %s", strconv.Itoa(resp.StatusCode)) } return resp.StatusCode, body, err }