diff options
| author | Paul Buetow <paul@buetow.org> | 2026-07-22 18:53:43 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-07-22 18:53:43 +0300 |
| commit | 456cb2d3be55d431ba507367764ccfd13b13b4b4 (patch) | |
| tree | 71c241dcf9fd963661023779e8edefc30ad7a4be /internal/codeberg/codeberg.go | |
| parent | 23ecaa2c7f731a4f7188aec2404594641faf2f7f (diff) | |
fix(errcheck): handle all unchecked error returns without changing behaviormain
errcheck ./... flagged unchecked HTTP response Close(), file Close(),
os.RemoveAll(), fmt.Scanln(), and fmt.Fprintf() calls across codeberg,
github, release, showcase, and sync. None of these were bugs causing
incorrect behavior today, but leaving them unchecked hid real failure
modes (e.g. a lagging NFS mount failing a file Close() after writes,
which this codebase has hit before per commit 23ecaa2).
- internal/codeberg/codeberg.go, internal/github/github.go,
internal/release/release.go: added a small closeResponseBody(resp)
helper per package and used it for all deferred resp.Body.Close()
calls. The body is always fully read (or abandoned on an earlier
error) by the time Close() runs, so the error is intentionally
discarded - matching the explicit `_ = ...` discard convention
already used elsewhere in this repo (e.g. showcase.go's
os.RemoveAll on the worktree-add failure path).
- internal/release/release.go: the two fmt.Scanln(&response) prompts
now explicitly discard the return values; a Scanln error already
leaves response == "", which the existing y/yes check already
treats as a safe decline, so behavior is unchanged.
- internal/showcase/code_extractor.go, images.go, language_detector.go:
added a shared closeFile(*os.File) helper (package showcase) for the
read-only file Close() calls, matching the same discard rationale.
copyFile's destination Close() is the one write-side case where a
close failure is real data-loss information, so it now uses a named
return to surface it via err without masking any earlier error.
- internal/showcase/showcase.go: the deferred os.RemoveAll(tempRoot)
now explicitly discards its error, matching the sibling `_ =` call
three lines above in the same function.
- internal/sync/branch_analyzer.go: GenerateDeleteScript's per-repository
fmt.Fprintf(file, ...) calls are now checked and wrapped with
fmt.Errorf(...: %w), matching the error-wrapping convention already
used by writeBranchDeletionBlock right below it in the same file
(the repeated repo-header writes were pulled into a new
writeDeleteScriptRepoHeader helper to keep this readable). The
script file's defer file.Close() now uses a named return so a close
failure is reported instead of silently discarded.
Added focused tests for the two behavior-relevant paths: copyFile's
missing-source/success paths after the named-return change, and
PromptConfirmation's empty-input-declines/explicit-yes behavior after
touching the Scanln call. Trivial defer-Close discards elsewhere are
not additionally unit tested per the task's guidance against
overengineering.
Verified: go build ./..., go vet ./..., errcheck ./... (clean), and
go test ./... all pass.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Diffstat (limited to 'internal/codeberg/codeberg.go')
| -rw-r--r-- | internal/codeberg/codeberg.go | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/internal/codeberg/codeberg.go b/internal/codeberg/codeberg.go index f881be9..9bff36e 100644 --- a/internal/codeberg/codeberg.go +++ b/internal/codeberg/codeberg.go @@ -42,6 +42,15 @@ type Client struct { var _ forge.RepoClient = (*Client)(nil) var _ forge.RepoDescriptionClient = (*Client)(nil) +// closeResponseBody closes an HTTP response body. By the time this runs the +// body has already been fully read (or the caller is bailing out on an +// earlier error), so a close failure here cannot change the outcome that was +// already determined - the error is intentionally discarded rather than +// treated as actionable. +func closeResponseBody(resp *http.Response) { + _ = resp.Body.Close() +} + // NewClient creates a new Codeberg API client func NewClient(token, org string) *Client { c := &Client{ @@ -97,7 +106,7 @@ func (c *Client) GetRepo(repoName string) (Repository, bool, error) { if err != nil { return repo, false, err } - defer resp.Body.Close() + defer closeResponseBody(resp) if resp.StatusCode == 404 { return repo, false, nil @@ -149,7 +158,7 @@ func (c *Client) UpdateRepoDescription(repoName, description string) error { if err != nil { return err } - defer resp.Body.Close() + defer closeResponseBody(resp) if resp.StatusCode != http.StatusOK { b, _ := io.ReadAll(resp.Body) @@ -242,7 +251,7 @@ func (c *Client) listReposPage(url string) ([]Repository, error) { if err != nil { return nil, fmt.Errorf("failed to fetch repositories: %w", err) } - defer resp.Body.Close() + defer closeResponseBody(resp) if resp.StatusCode != http.StatusOK { return nil, fmt.Errorf("API returned status %d", resp.StatusCode) @@ -273,7 +282,7 @@ func (c *Client) RepoExists(repoName string) (bool, error) { if err != nil { return false, err } - defer resp.Body.Close() + defer closeResponseBody(resp) return resp.StatusCode == 200, nil } @@ -316,7 +325,7 @@ func (c *Client) CreateRepo(repoName, description string, private bool) error { if err != nil { return err } - defer resp.Body.Close() + defer closeResponseBody(resp) if resp.StatusCode != http.StatusCreated { // Read the response body to get more detailed error information @@ -365,7 +374,7 @@ func (c *Client) DeleteRepo(repoName string) error { if err != nil { return err } - defer resp.Body.Close() + defer closeResponseBody(resp) body, _ := io.ReadAll(resp.Body) return forge.DeleteStatusError(resp.StatusCode, string(body)) |
