From c3ba5d060d8cdf6af289197dea2ee534094abc9b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 14:36:17 +0000 Subject: [PATCH] Remove unused nolint directives and fix more godot/misspell issues Co-authored-by: caarlos0 <245435+caarlos0@users.noreply.github.com> --- cmd/soft/main.go | 2 +- pkg/backend/lfs.go | 2 +- pkg/backend/repo.go | 2 +- pkg/daemon/daemon.go | 8 ++++---- pkg/git/lfs_auth.go | 2 +- pkg/git/service.go | 2 +- pkg/lfs/basic_transfer.go | 2 +- pkg/lfs/common.go | 2 +- pkg/lfs/http_client.go | 4 ++-- pkg/lfs/pointer.go | 8 ++++---- pkg/lfs/scanner.go | 16 ++++++++-------- pkg/storage/local.go | 2 +- pkg/webhook/webhook.go | 6 +++--- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmd/soft/main.go b/cmd/soft/main.go index 5e5770e29a8eb9e806169be5e9fae9b7e6777dc3..3aed6b2bceed919632c91288753722c7b2443d18 100644 --- a/cmd/soft/main.go +++ b/cmd/soft/main.go @@ -118,7 +118,7 @@ func main() { ctx = log.WithContext(ctx, logger) if f != nil { - defer f.Close() //nolint:errcheck + defer f.Close() } // Set global logger diff --git a/pkg/backend/lfs.go b/pkg/backend/lfs.go index 16569094ab84d41c095d8237cd8255ad648ba24e..9594c2a022d8458f412fd059bf7bca2cdeea67fa 100644 --- a/pkg/backend/lfs.go +++ b/pkg/backend/lfs.go @@ -39,7 +39,7 @@ func StoreRepoMissingLFSObjects(ctx context.Context, repo proto.Repository, dbx return objectError } - defer content.Close() //nolint: errcheck + defer content.Close() return dbx.TransactionContext(ctx, func(tx *db.Tx) error { if err := store.CreateLFSObject(ctx, tx, repo.ID(), p.Oid, p.Size); err != nil { return db.WrapError(err) diff --git a/pkg/backend/repo.go b/pkg/backend/repo.go index 5a4433ec139c62e73808647cdc79895d1d99fbc3..bab70df7b71f5ff02dc49c204ecb08196d7ad094 100644 --- a/pkg/backend/repo.go +++ b/pkg/backend/repo.go @@ -751,7 +751,7 @@ func readOneline(path string) (string, error) { return "", err } - defer f.Close() //nolint: errcheck + defer f.Close() s := bufio.NewScanner(f) s.Scan() return s.Text(), s.Err() diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index e57576474e0127c15468282fa880e4de70d30297..4bfa360754c810e9f9c2408b8286d6414392a1ca 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -139,7 +139,7 @@ func (d *GitDaemon) Serve(listener net.Listener) error { } func (d *GitDaemon) fatal(c net.Conn, err error) { - git.WritePktlineErr(c, err) //nolint: errcheck + git.WritePktlineErr(c, err) if err := c.Close(); err != nil { d.logger.Debugf("git: error closing connection: %v", err) } @@ -160,7 +160,7 @@ func (d *GitDaemon) handleClient(conn net.Conn) { } d.conns.Add(c) defer func() { - d.conns.Close(c) //nolint: errcheck + d.conns.Close(c) }() errc := make(chan error, 1) @@ -217,7 +217,7 @@ func (d *GitDaemon) handleClient(conn net.Conn) { opts := bytes.SplitN(split[1], []byte{0}, 3) if len(opts) < 2 { - d.fatal(c, git.ErrInvalidRequest) //nolint: errcheck + d.fatal(c, git.ErrInvalidRequest) return } @@ -321,7 +321,7 @@ func (d *GitDaemon) handleClient(conn net.Conn) { // Close closes the underlying listener. func (d *GitDaemon) Close() error { err := d.closeListener() - d.conns.CloseAll() //nolint: errcheck + d.conns.CloseAll() return err } diff --git a/pkg/git/lfs_auth.go b/pkg/git/lfs_auth.go index 32a8e6cba7abbc50d7499ba858bdb4ddffc9e83b..3d4135dd33f195b569fe72d6e56fc6ad2ba57b96 100644 --- a/pkg/git/lfs_auth.go +++ b/pkg/git/lfs_auth.go @@ -15,7 +15,7 @@ import ( "github.com/golang-jwt/jwt/v5" ) -// LFSAuthenticate implements teh Git LFS SSH authentication command. +// LFSAuthenticate implements the Git LFS SSH authentication command. // Context must have *config.Config, *log.Logger, proto.User. // cmd.Args should have the repo path and operation as arguments. func LFSAuthenticate(ctx context.Context, cmd ServiceCommand) error { diff --git a/pkg/git/service.go b/pkg/git/service.go index 3110d79d9dd061869e93c1a25231dac657548458..6ccc0c935bc6981cac772f50024766eda67ef9bc 100644 --- a/pkg/git/service.go +++ b/pkg/git/service.go @@ -124,7 +124,7 @@ func gitServiceHandler(ctx context.Context, svc Service, scmd ServiceCommand) er // stdin if scmd.Stdin != nil { go func() { - defer stdin.Close() //nolint: errcheck + defer stdin.Close() if _, err := io.Copy(stdin, scmd.Stdin); err != nil { log.Errorf("gitServiceHandler: failed to copy stdin: %v", err) } diff --git a/pkg/lfs/basic_transfer.go b/pkg/lfs/basic_transfer.go index 73df38635a1cbd212595799ba7192e528752a929..9b3a7452a90ab8364e07671ea6589d1faee8b121 100644 --- a/pkg/lfs/basic_transfer.go +++ b/pkg/lfs/basic_transfer.go @@ -105,7 +105,7 @@ func (a *BasicTransferAdapter) performRequest(ctx context.Context, method string } func handleErrorResponse(resp *http.Response) error { - defer resp.Body.Close() //nolint: errcheck + defer resp.Body.Close() er, err := decodeResponseError(resp.Body) if err != nil { diff --git a/pkg/lfs/common.go b/pkg/lfs/common.go index aa98c65278b7c35385f15324890235918b05e16e..d4dfc4bac68ab88b3a60704c80e2d04aba44fc62 100644 --- a/pkg/lfs/common.go +++ b/pkg/lfs/common.go @@ -28,7 +28,7 @@ const ( DefaultLocksLimit = 20 ) -// Pointer contains LFS pointer data +// Pointer contains LFS pointer data. type Pointer struct { Oid string `json:"oid"` Size int64 `json:"size"` diff --git a/pkg/lfs/http_client.go b/pkg/lfs/http_client.go index e517f437fa213b9a8e4e42be600eaff6a42f3c75..1b214126a663d70233b7cb2e4ad0871776a8373c 100644 --- a/pkg/lfs/http_client.go +++ b/pkg/lfs/http_client.go @@ -86,7 +86,7 @@ func (c *httpClient) batch(ctx context.Context, operation string, objects []Poin logger.Errorf("Error while processing request: %v", err) return nil, err } - defer res.Body.Close() //nolint: errcheck + defer res.Body.Close() if res.StatusCode != http.StatusOK { return nil, fmt.Errorf("Unexpected server response: %s", res.Status) @@ -162,7 +162,7 @@ func (c *httpClient) performOperation(ctx context.Context, objects []Pointer, dc err = transferAdapter.Upload(ctx, object.Pointer, content, link) - content.Close() //nolint: errcheck + content.Close() if err != nil { return err diff --git a/pkg/lfs/pointer.go b/pkg/lfs/pointer.go index 69bceca1da4ab857a895fee44e2b85dec4258d55..02fd805ad6974f4b00fe92f5db76c8b50cb9ff5e 100644 --- a/pkg/lfs/pointer.go +++ b/pkg/lfs/pointer.go @@ -27,17 +27,17 @@ const ( ) var ( - // ErrMissingPrefix occurs if the content lacks the LFS prefix + // ErrMissingPrefix occurs if the content lacks the LFS prefix. ErrMissingPrefix = errors.New("Content lacks the LFS prefix") - // ErrInvalidStructure occurs if the content has an invalid structure + // ErrInvalidStructure occurs if the content has an invalid structure. ErrInvalidStructure = errors.New("Content has an invalid structure") - // ErrInvalidOIDFormat occurs if the oid has an invalid format + // ErrInvalidOIDFormat occurs if the oid has an invalid format. ErrInvalidOIDFormat = errors.New("OID has an invalid format") ) -// ReadPointer tries to read LFS pointer data from the reader +// ReadPointer tries to read LFS pointer data from the reader. func ReadPointer(reader io.Reader) (Pointer, error) { buf := make([]byte, blobSizeCutoff) n, err := io.ReadFull(reader, buf) diff --git a/pkg/lfs/scanner.go b/pkg/lfs/scanner.go index 6688e4225a67a5aa5e0ac5fc59b02e6f1a2066cb..50a0ad56cef963063e1427b98687b7c7ca02c2e7 100644 --- a/pkg/lfs/scanner.go +++ b/pkg/lfs/scanner.go @@ -51,7 +51,7 @@ func SearchPointerBlobs(ctx context.Context, repo *git.Repository, pointerChan c func createPointerResultsFromCatFileBatch(ctx context.Context, catFileBatchReader *io.PipeReader, wg *sync.WaitGroup, pointerChan chan<- PointerBlob) { defer wg.Done() - defer catFileBatchReader.Close() //nolint: errcheck + defer catFileBatchReader.Close() bufferedReader := bufio.NewReader(catFileBatchReader) buf := make([]byte, 1025) @@ -104,8 +104,8 @@ loop: func catFileBatch(ctx context.Context, shasToBatchReader *io.PipeReader, catFileBatchWriter *io.PipeWriter, wg *sync.WaitGroup, basePath string) { defer wg.Done() - defer shasToBatchReader.Close() //nolint: errcheck - defer catFileBatchWriter.Close() //nolint: errcheck + defer shasToBatchReader.Close() + defer catFileBatchWriter.Close() stderr := new(bytes.Buffer) var errbuf strings.Builder @@ -122,7 +122,7 @@ func catFileBatch(ctx context.Context, shasToBatchReader *io.PipeReader, catFile func blobsLessThan1024FromCatFileBatchCheck(catFileCheckReader *io.PipeReader, shasToBatchWriter *io.PipeWriter, wg *sync.WaitGroup) { defer wg.Done() - defer catFileCheckReader.Close() //nolint: errcheck + defer catFileCheckReader.Close() scanner := bufio.NewScanner(catFileCheckReader) defer func() { _ = shasToBatchWriter.CloseWithError(scanner.Err()) @@ -154,8 +154,8 @@ func blobsLessThan1024FromCatFileBatchCheck(catFileCheckReader *io.PipeReader, s func catFileBatchCheck(ctx context.Context, shasToCheckReader *io.PipeReader, catFileCheckWriter *io.PipeWriter, wg *sync.WaitGroup, basePath string) { defer wg.Done() - defer shasToCheckReader.Close() //nolint: errcheck - defer catFileCheckWriter.Close() //nolint: errcheck + defer shasToCheckReader.Close() + defer catFileCheckWriter.Close() stderr := new(bytes.Buffer) var errbuf strings.Builder @@ -172,7 +172,7 @@ func catFileBatchCheck(ctx context.Context, shasToCheckReader *io.PipeReader, ca func blobsFromRevListObjects(revListReader *io.PipeReader, shasToCheckWriter *io.PipeWriter, wg *sync.WaitGroup) { defer wg.Done() - defer revListReader.Close() //nolint: errcheck + defer revListReader.Close() scanner := bufio.NewScanner(revListReader) defer func() { _ = shasToCheckWriter.CloseWithError(scanner.Err()) @@ -201,7 +201,7 @@ func blobsFromRevListObjects(revListReader *io.PipeReader, shasToCheckWriter *io func revListAllObjects(ctx context.Context, revListWriter *io.PipeWriter, wg *sync.WaitGroup, basePath string, errChan chan<- error) { defer wg.Done() - defer revListWriter.Close() //nolint: errcheck + defer revListWriter.Close() stderr := new(bytes.Buffer) var errbuf strings.Builder diff --git a/pkg/storage/local.go b/pkg/storage/local.go index bf2fac9a5a37498b645f3dd234b3129bb985b6ac..a6a8bc40948ce8c2e7912515b0e0222ae7e18f3e 100644 --- a/pkg/storage/local.go +++ b/pkg/storage/local.go @@ -51,7 +51,7 @@ func (l *LocalStorage) Put(name string, r io.Reader) (int64, error) { if err != nil { return 0, err } - defer f.Close() //nolint: errcheck + defer f.Close() return io.Copy(f, r) } diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index 12ad1f4b97725ee9d1ee0564f0542f223e6a0e64..8e78c51fff93810535690ee66d75d95d06a3d4df 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -70,7 +70,7 @@ func SendWebhook(ctx context.Context, w models.Webhook, event Event, payload int if err != nil { return err } - buf.WriteString(v.Encode()) //nolint: errcheck + buf.WriteString(v.Encode()) default: return ErrInvalidContentType } @@ -90,7 +90,7 @@ func SendWebhook(ctx context.Context, w models.Webhook, event Event, payload int reqBody := buf.String() if w.Secret != "" { sig := hmac.New(sha256.New, []byte(w.Secret)) - sig.Write([]byte(reqBody)) //nolint: errcheck + sig.Write([]byte(reqBody)) headers.Add("X-SoftServe-Signature", "sha256="+hex.EncodeToString(sig.Sum(nil))) } @@ -111,7 +111,7 @@ func SendWebhook(ctx context.Context, w models.Webhook, event Event, payload int } if res.Body != nil { - defer res.Body.Close() //nolint: errcheck + defer res.Body.Close() b, err := io.ReadAll(res.Body) if err != nil { return err