From acfc376efda39919baeca9a8b68992b7fb74bcc0 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Fri, 15 Dec 2023 14:25:12 -0800 Subject: [PATCH] add .golangci.yaml --- .golangci.yaml | 27 +++++++++++++++++++++++++++ readline/history.go | 4 ++-- server/download.go | 6 +++--- server/manifests.go | 4 ++-- server/routes.go | 3 ++- server/routes_test.go | 1 - server/upload.go | 2 +- 7 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 .golangci.yaml diff --git a/.golangci.yaml b/.golangci.yaml new file mode 100644 index 00000000..85558f03 --- /dev/null +++ b/.golangci.yaml @@ -0,0 +1,27 @@ +run: + timeout: 5m +linters: + enable: + - asasalint + - bidichk + - bodyclose + - containedctx + - contextcheck + - exportloopref + - gocheckcompilerdirectives + # FIXME: for some reason this errors on windows + # - gofmt + # - goimports + - misspell + - nilerr + - unused +linters-settings: + errcheck: + # exclude the following functions since we don't generally + # need to be concerned with the returned errors + exclude-functions: + - encoding/binary.Read + - (*os.File).Seek + - (*bufio.Writer).WriteString + - (*github.com/spf13/pflag.FlagSet).Set + - (*github.com/jmorganca/ollama/llm.readSeekOffset).Seek diff --git a/readline/history.go b/readline/history.go index 57fccb7c..52c7d342 100644 --- a/readline/history.go +++ b/readline/history.go @@ -49,7 +49,7 @@ func (h *History) Init() error { h.Filename = path - f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0600) + f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0o600) if err != nil { if errors.Is(err, os.ErrNotExist) { return nil @@ -132,7 +132,7 @@ func (h *History) Save() error { tmpFile := h.Filename + ".tmp" - f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_APPEND, 0666) + f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_APPEND, 0o666) if err != nil { return err } diff --git a/server/download.go b/server/download.go index 3c823f32..d586c9cd 100644 --- a/server/download.go +++ b/server/download.go @@ -98,7 +98,7 @@ func (b *blobDownload) Prepare(ctx context.Context, requestURL *url.URL, opts *R b.Total, _ = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64) - var size = b.Total / numDownloadParts + size := b.Total / numDownloadParts switch { case size < minDownloadPartSize: size = minDownloadPartSize @@ -132,7 +132,7 @@ func (b *blobDownload) run(ctx context.Context, requestURL *url.URL, opts *Regis defer blobDownloadManager.Delete(b.Digest) ctx, b.CancelFunc = context.WithCancel(ctx) - file, err := os.OpenFile(b.Name+"-partial", os.O_CREATE|os.O_RDWR, 0644) + file, err := os.OpenFile(b.Name+"-partial", os.O_CREATE|os.O_RDWR, 0o644) if err != nil { return err } @@ -246,7 +246,7 @@ func (b *blobDownload) readPart(partName string) (*blobDownloadPart, error) { } func (b *blobDownload) writePart(partName string, part *blobDownloadPart) error { - partFile, err := os.OpenFile(partName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644) + partFile, err := os.OpenFile(partName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o644) if err != nil { return err } diff --git a/server/manifests.go b/server/manifests.go index 4e42b2ca..2b39db65 100644 --- a/server/manifests.go +++ b/server/manifests.go @@ -26,9 +26,9 @@ func WriteManifest(name string, config *Layer, layers []*Layer) error { return err } - if err := os.MkdirAll(filepath.Dir(manifestPath), 0755); err != nil { + if err := os.MkdirAll(filepath.Dir(manifestPath), 0o755); err != nil { return err } - return os.WriteFile(manifestPath, b.Bytes(), 0644) + return os.WriteFile(manifestPath, b.Bytes(), 0o644) } diff --git a/server/routes.go b/server/routes.go index 648a408c..fe4102d2 100644 --- a/server/routes.go +++ b/server/routes.go @@ -198,7 +198,8 @@ func GenerateHandler(c *gin.Context) { c.JSON(http.StatusOK, api.GenerateResponse{ CreatedAt: time.Now().UTC(), Model: req.Model, - Done: true}) + Done: true, + }) return } diff --git a/server/routes_test.go b/server/routes_test.go index 07bb699d..e09648f9 100644 --- a/server/routes_test.go +++ b/server/routes_test.go @@ -201,5 +201,4 @@ func Test_Routes(t *testing.T) { } } - } diff --git a/server/upload.go b/server/upload.go index 721c5e7c..7e8f55ea 100644 --- a/server/upload.go +++ b/server/upload.go @@ -88,7 +88,7 @@ func (b *blobUpload) Prepare(ctx context.Context, requestURL *url.URL, opts *Reg return nil } - var size = b.Total / numUploadParts + size := b.Total / numUploadParts switch { case size < minUploadPartSize: size = minUploadPartSize