From 7fc33f52a93a299caf5c6a0303638c276002b98a Mon Sep 17 00:00:00 2001 From: Adam Hughes <9903835+tri-adam@users.noreply.github.com> Date: Thu, 17 Jul 2025 11:01:56 -0400 Subject: [PATCH] chore: bump module to Go 1.24 --- .circleci/config.yml | 4 ++-- go.mod | 2 +- pkg/integrity/clearsign_test.go | 11 +++++------ pkg/integrity/dsse_test.go | 9 ++++----- pkg/integrity/sign_test.go | 5 ++--- pkg/integrity/verify_test.go | 8 ++++---- pkg/user/unmount_test.go | 5 ++--- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 499165e9..4813c385 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,10 +12,10 @@ executors: - image: golangci/golangci-lint:v2.2 golang-previous: docker: - - image: golang:1.23 + - image: golang:1.24 golang-latest: docker: - - image: golang:1.24 + - image: golang:1.25 jobs: lint-markdown: diff --git a/go.mod b/go.mod index 9863f208..b4fc1715 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/sylabs/sif/v2 -go 1.23.0 +go 1.24.0 require ( github.com/ProtonMail/go-crypto v1.3.0 diff --git a/pkg/integrity/clearsign_test.go b/pkg/integrity/clearsign_test.go index e164f49a..a9325859 100644 --- a/pkg/integrity/clearsign_test.go +++ b/pkg/integrity/clearsign_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved. +// Copyright (c) 2020-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. @@ -8,7 +8,6 @@ package integrity import ( "bufio" "bytes" - "context" "crypto" "errors" "io" @@ -54,7 +53,7 @@ func Test_clearsignEncoder_signMessage(t *testing.T) { t.Run(tt.name, func(t *testing.T) { b := bytes.Buffer{} - ht, err := tt.en.signMessage(context.Background(), &b, strings.NewReader(testMessage)) + ht, err := tt.en.signMessage(t.Context(), &b, strings.NewReader(testMessage)) if got, want := err, tt.wantErr; (got != nil) != want { t.Fatalf("got error %v, wantErr %v", got, want) } @@ -65,7 +64,7 @@ func Test_clearsignEncoder_signMessage(t *testing.T) { } var vr VerifyResult - b, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), ht, &vr) + b, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), ht, &vr) if err != nil { t.Fatal(err) } @@ -180,7 +179,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) { Time: fixedTime, }, } - h, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage)) + h, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage)) if err != nil { t.Fatal(err) } @@ -196,7 +195,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) { // Decode and verify message. var vr VerifyResult - message, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), h, &vr) + message, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), h, &vr) if got, want := err, tt.wantErr; !errors.Is(got, want) { t.Fatalf("got error %v, want %v", got, want) diff --git a/pkg/integrity/dsse_test.go b/pkg/integrity/dsse_test.go index ec1cbb14..9674405a 100644 --- a/pkg/integrity/dsse_test.go +++ b/pkg/integrity/dsse_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2022-2024, 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. @@ -7,7 +7,6 @@ package integrity import ( "bytes" - "context" "crypto" "encoding/base64" "encoding/json" @@ -83,7 +82,7 @@ func Test_dsseEncoder_signMessage(t *testing.T) { en := newDSSEEncoder(tt.signers, tt.signOpts...) - ht, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage)) + ht, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage)) if got, want := err, tt.wantErr; (got != nil) != want { t.Fatalf("got error %v, wantErr %v", got, want) } @@ -321,7 +320,7 @@ func Test_dsseDecoder_verifyMessage(t *testing.T) { en := newDSSEEncoder(tt.signers, tt.signOpts...) // Sign and encode message. - h, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage)) + h, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage)) if err != nil { t.Fatal(err) } @@ -343,7 +342,7 @@ func Test_dsseDecoder_verifyMessage(t *testing.T) { // Decode and verify message. var vr VerifyResult - message, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), h, &vr) + message, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), h, &vr) if got, want := err, tt.wantErr; !errors.Is(got, want) { t.Errorf("got error %v, want %v", got, want) diff --git a/pkg/integrity/sign_test.go b/pkg/integrity/sign_test.go index 56f02098..c3c11187 100644 --- a/pkg/integrity/sign_test.go +++ b/pkg/integrity/sign_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved. +// Copyright (c) 2020-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. @@ -7,7 +7,6 @@ package integrity import ( "bytes" - "context" "crypto" "errors" "os" @@ -339,7 +338,7 @@ func TestGroupSigner_Sign(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - di, err := tt.gs.sign(context.Background()) + di, err := tt.gs.sign(t.Context()) if (err != nil) != tt.wantErr { t.Fatalf("got error %v, want %v", err, tt.wantErr) } diff --git a/pkg/integrity/verify_test.go b/pkg/integrity/verify_test.go index e8be1a52..24c070c2 100644 --- a/pkg/integrity/verify_test.go +++ b/pkg/integrity/verify_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved. +// Copyright (c) 2020-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. @@ -161,7 +161,7 @@ func TestGroupVerifier_verify(t *testing.T) { } var vr VerifyResult - err := v.verifySignature(context.Background(), tt.sig, tt.de, &vr) + err := v.verifySignature(t.Context(), tt.sig, tt.de, &vr) if got, want := err, tt.wantErr; !errors.Is(got, want) { t.Errorf("got error %v, want %v", got, want) @@ -289,7 +289,7 @@ func TestLegacyGroupVerifier_verify(t *testing.T) { } var vr VerifyResult - err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr) + err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr) if got, want := err, tt.wantErr; !errors.Is(got, want) { t.Errorf("got error %v, want %v", got, want) @@ -427,7 +427,7 @@ func TestLegacyObjectVerifier_verify(t *testing.T) { } var vr VerifyResult - err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr) + err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr) if got, want := err, tt.wantErr; !errors.Is(got, want) { t.Errorf("got error %v, want %v", got, want) diff --git a/pkg/user/unmount_test.go b/pkg/user/unmount_test.go index 3c31cbb2..f0ac8456 100644 --- a/pkg/user/unmount_test.go +++ b/pkg/user/unmount_test.go @@ -7,7 +7,6 @@ package user import ( "bufio" - "context" "errors" "fmt" "os" @@ -74,13 +73,13 @@ func Test_Unmount(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { if tt.mountSIF != "" { - err := Mount(context.Background(), tt.mountSIF, tt.mountPath) + err := Mount(t.Context(), tt.mountSIF, tt.mountPath) if err != nil { t.Fatal(err) } } - err := Unmount(context.Background(), tt.mountPath, tt.opts...) + err := Unmount(t.Context(), tt.mountPath, tt.opts...) if err != nil && !tt.wantErr { t.Errorf("Unexpected error: %s", err)