Skip to content

Commit

Permalink
update golangci linter config with fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Pranay Valson <[email protected]>
  • Loading branch information
noslav committed Jan 9, 2025
1 parent 2153518 commit 3ab977e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
- name: Set up Go 1.22.5
- name: Set up Go 1.23.4
uses: actions/setup-go@v4
with:
go-version: 1.22.5
go-version: 1.23.4
id: go
- run: go version

- name: Lint
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4
go mod tidy
./bin/golangci-lint run -v --timeout=3m --go=1.22.5
./bin/golangci-lint run -v --config=.golangci.yml --timeout=3m --go=1.23.4
# Optional: working directory, useful for monorepos
# working-directory: somedir
Expand Down
6 changes: 5 additions & 1 deletion dag/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ func (fetcher *httpContentFetcher) tryFetch(ctx context.Context, cid string, url
return emptyBytes, err
}

defer resp.Body.Close()
defer func() {
if err := resp.Body.Close(); err != nil {
log.Printf("failed to close response body: %v", err)
}
}()
if resp.StatusCode == 200 {
return io.ReadAll(resp.Body)
} else {
Expand Down
22 changes: 18 additions & 4 deletions server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ func readContentFromRequest(r *http.Request) (map[string][]byte, error) {
if err != nil {
return nil, err
}
defer file.Close()
defer func() {
if err := file.Close(); err != nil {
log.Printf("failed to close file: %v", err)
}
}()

data, err := io.ReadAll(file)
if err != nil {
Expand Down Expand Up @@ -310,7 +314,12 @@ func uploadHandler(contents []byte, node pinner.PinnerNode) (cid.Cid, error) {
return cid.Undef, err
}

defer carf.Close() // should delete the file due to unlink
defer func() {
if err := carf.Close(); err != nil {
log.Printf("failed to close car file: %v", err)
}
}()

defer func() {
err := syscall.Unlink(carf.Name())
if err != nil {
Expand All @@ -322,7 +331,10 @@ func uploadHandler(contents []byte, node pinner.PinnerNode) (cid.Cid, error) {

err = node.CarExporter().Export(ctx, fcid, carf)
if err != nil {
carf.Close()
// For the non-deferred calls:
if err := carf.Close(); err != nil {
log.Printf("failed to close car file: %v", err)
}
log.Printf("%v", err)
return cid.Undef, err
}
Expand All @@ -339,7 +351,9 @@ func uploadHandler(contents []byte, node pinner.PinnerNode) (cid.Cid, error) {
}
log.Printf("uploaded file has root cid: %s\n", ccid)

carf.Close()
if err := carf.Close(); err != nil {
log.Printf("failed to close car file: %v", err)
}
return ccid, nil
}

Expand Down

0 comments on commit 3ab977e

Please sign in to comment.