More CI updates

.circleci/config.yml

@@ -6,15 +6,15 @@ orbs:
 parameters:
   cosign-version:
     type: string
-    default: '2.4.2'
+    default: '2.5.0'
 
 executors:
   node:
     docker:
       - image: node:22-slim
   golangci-lint:
     docker:
-      - image: golangci/golangci-lint:v1.63
+      - image: golangci/golangci-lint:v2.1
   golang-previous:
     docker:
       - image: golang:1.23

.golangci.yml

@@ -1,10 +1,12 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - bidichk
     - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
     - decorder
     - dogsled
     - dupl
@@ -14,13 +16,11 @@ linters:
     - goconst
     - gocyclo
     - godox
-    - gofumpt
-    - goimports
     - goprintffuncname
-    - gosimple
     - govet
     - grouper
     - ineffassign
+    - intrange
     - ireturn
     - maintidx
     - misspell
@@ -29,9 +29,29 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - usetesting
+    - wsl
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

client/archive.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -39,6 +39,7 @@ func (ar *archiver) writeEntry(name string) (err error) {
 	if _, ok := ar.archived[name]; ok {
 		return nil
 	}
+
 	defer func() {
 		if err == nil {
 			ar.archived[name] = struct{}{}
@@ -56,6 +57,7 @@ func (ar *archiver) writeEntry(name string) (err error) {
 	if err != nil {
 		return err
 	}
+
 	h.Name = filepath.ToSlash(name)
 
 	// Check that we're writing a supported type, and make any necessary adjustments.

client/build.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -95,6 +95,7 @@
 		}
 
 		bo.workingDir = dir
+
 		return nil
 	}
 }
@@ -174,12 +175,14 @@
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
+
 	req.Header.Set("Content-Type", "application/json")
 
 	res, err := c.httpClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
+
 	defer res.Body.Close()
 
 	if res.StatusCode/100 != 2 { // non-2xx status code

client/build_context.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -68,12 +68,14 @@ func (c *Client) getBuildContextUploadLocation(ctx context.Context, size int64,
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
+
 	req.Header.Set("Content-Type", "application/json")
 
 	res, err := c.buildContextHTTPClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
+
 	defer res.Body.Close()
 
 	if res.StatusCode/100 != 2 { // non-2xx status code
@@ -94,6 +96,7 @@ func (c *Client) putBuildContext(ctx context.Context, loc *url.URL, r io.Reader,
 	if err != nil {
 		return err
 	}
+
 	req.Header.Set("Content-Type", "application/octet-stream")
 	req.Header.Del("Authorization")
 
@@ -103,11 +106,13 @@ func (c *Client) putBuildContext(ctx context.Context, loc *url.URL, r io.Reader,
 	if err != nil {
 		return fmt.Errorf("%w", err)
 	}
+
 	defer res.Body.Close()
 
 	if res.StatusCode/100 != 2 {
 		return fmt.Errorf("%w", errorFromResponse(res))
 	}
+
 	return nil
 }
 
@@ -139,6 +144,7 @@ func (c *Client) uploadBuildContext(ctx context.Context, rw io.ReadWriteSeeker,
 		if errors.Is(err, errContextAlreadyPresent) {
 			return digest, nil
 		}
+
 		return "", fmt.Errorf("failed to get build context upload location: %w", err)
 	}
 

client/build_context_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -51,6 +51,7 @@ func (m *mockUploadBuildContext) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			Size   int64  `json:"size"`
 			Digest string `json:"digest"`
 		}
+
 		if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
 			m.t.Fatalf("failed to decode request: %v", err)
 		}
@@ -218,6 +219,7 @@ func (m *mockDeleteBuildContext) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		if err := jsonresp.WriteError(w, "", m.code); err != nil {
 			m.t.Fatalf("failed to write error: %v", err)
 		}
+
 		return
 	}
 
@@ -253,8 +255,6 @@ func TestClient_DeleteBuildContext(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

client/build_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -36,6 +36,7 @@ func TestSubmit(t *testing.T) {
 
 	// Start a mock server
 	m := mockService{t: t}
+
 	s := httptest.NewServer(&m)
 	defer s.Close()
 
@@ -62,9 +63,11 @@ func TestSubmit(t *testing.T) {
 				if bi.ID() == "" {
 					t.Fatalf("invalid ID")
 				}
+
 				if bi.LibraryRef() == "" {
 					t.Errorf("empty Library ref")
 				}
+
 				if bi.LibraryURL() == "" {
 					t.Errorf("empty Library URL")
 				}
@@ -76,6 +79,7 @@ func TestSubmit(t *testing.T) {
 func TestCancel(t *testing.T) {
 	// Start a mock server
 	m := mockService{t: t}
+
 	s := httptest.NewServer(&m)
 	defer s.Close()
 

client/client.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
 // distributed with the sources of this project regarding your rights to use or distribute this
 // software.
@@ -126,6 +126,7 @@ func NewClient(opts ...Option) (*Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
+
 	c.baseURL = u
 
 	return &c, nil
@@ -153,6 +154,7 @@ func (c *Client) setRequestHeaders(h http.Header) {
 	if v := c.bearerToken; v != "" {
 		h.Set("Authorization", fmt.Sprintf("BEARER %s", v))
 	}
+
 	if v := c.userAgent; v != "" {
 		h.Set("User-Agent", v)
 	}

client/client_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -153,6 +153,7 @@ func TestNewRequest(t *testing.T) {
 				if err != nil {
 					t.Errorf("failed to read body: %v", err)
 				}
+
 				if got, want := string(b), tt.body; got != want {
 					t.Errorf("got body %v, want %v", got, want)
 				}
@@ -161,10 +162,12 @@ func TestNewRequest(t *testing.T) {
 				if got, want := ok, (tt.wantBearerToken != ""); got != want {
 					t.Fatalf("presence of auth bearer %v, want %v", got, want)
 				}
+
 				if ok {
 					if got, want := len(authBearer), 1; got != want {
 						t.Fatalf("got %v auth bearer(s), want %v", got, want)
 					}
+
 					if got, want := authBearer[0], tt.wantBearerToken; got != want {
 						t.Errorf("got auth bearer %v, want %v", got, want)
 					}
@@ -174,10 +177,12 @@ func TestNewRequest(t *testing.T) {
 				if got, want := ok, (tt.wantUserAgent != ""); got != want {
 					t.Fatalf("presence of user agent %v, want %v", got, want)
 				}
+
 				if ok {
 					if got, want := len(userAgent), 1; got != want {
 						t.Fatalf("got %v user agent(s), want %v", got, want)
 					}
+
 					if got, want := userAgent[0], tt.wantUserAgent; got != want {
 						t.Errorf("got user agent %v, want %v", got, want)
 					}

client/error.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
 // distributed with the sources of this project regarding your rights to use or distribute this
 // software.
@@ -27,6 +27,7 @@ func (e *httpError) Error() string {
 	if e.err != nil {
 		return fmt.Sprintf("%v %v: %v", e.Code, http.StatusText(e.Code), e.err.Error())
 	}
+
 	return fmt.Sprintf("%v %v", e.Code, http.StatusText(e.Code))
 }
 

client/error_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
 // distributed with the sources of this project regarding your rights to use or distribute this
 // software.
@@ -41,9 +41,11 @@ func TestHTTPError(t *testing.T) {
 			if got, want := err.Code, tt.code; got != want {
 				t.Errorf("got code %v, want %v", got, want)
 			}
+
 			if got, want := err.Unwrap(), tt.err; got != want {
 				t.Errorf("got unwrapped error %v, want %v", got, want)
 			}
+
 			if got, want := err.Error(), tt.wantMessage; got != want {
 				t.Errorf("got message %v, want %v", got, want)
 			}