diff --git a/Makefile b/Makefile index 9b381d3a..55cbe24d 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ ${RESOURCE_FILE}: ./dist/info.rc ./dist/${SRC_ICO} .FORCE ## Dev dependencies .PHONY: install-devel-tools install-linter install-go-mod-outdated install-git-hooks -LINTVER:="v1.52.2" +LINTVER:="v1.55.2" LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh" install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated diff --git a/internal/versioner/version.go b/internal/versioner/version.go index bfd3b149..88c85e48 100644 --- a/internal/versioner/version.go +++ b/internal/versioner/version.go @@ -30,6 +30,7 @@ import ( ) const sumFile = ".sum" +const sigFile = ".sig" type Version struct { version *semver.Version @@ -83,7 +84,7 @@ func VerifyUpdateFolder(kr *crypto.KeyRing, path string) error { return err } - sigBytes, err := os.ReadFile(filepath.Join(path, sumFile+".sig")) //nolint:gosec + sigBytes, err := os.ReadFile(filepath.Join(path, sumFile+sigFile)) //nolint:gosec if err != nil { return err } diff --git a/internal/versioner/version_test.go b/internal/versioner/version_test.go index cf839852..869b6e9c 100644 --- a/internal/versioner/version_test.go +++ b/internal/versioner/version_test.go @@ -136,5 +136,5 @@ func signFile(t *testing.T, path string, kr *crypto.KeyRing) { sig, err := kr.SignDetached(crypto.NewPlainMessage(file)) require.NoError(t, err) - require.NoError(t, os.WriteFile(path+".sig", sig.GetBinary(), 0o700)) + require.NoError(t, os.WriteFile(path+sigFile, sig.GetBinary(), 0o700)) } diff --git a/internal/versioner/versioner_test.go b/internal/versioner/versioner_test.go index f5ae301e..6bf92c72 100644 --- a/internal/versioner/versioner_test.go +++ b/internal/versioner/versioner_test.go @@ -66,7 +66,7 @@ func makeDummyVersionDirectory(t *testing.T, exeName, updates, version string) s require.NoError(t, exe.Close()) require.NoError(t, os.Chmod(exe.Name(), 0o700)) - sig, err := os.Create(filepath.Join(target, getExeName(exeName)+".sig")) + sig, err := os.Create(filepath.Join(target, getExeName(exeName)+sigFile)) require.NoError(t, err) require.NotNil(t, sig) require.NoError(t, sig.Close()) diff --git a/tests/collector_test.go b/tests/collector_test.go index c1a56395..1eb74213 100644 --- a/tests/collector_test.go +++ b/tests/collector_test.go @@ -63,13 +63,17 @@ func (c *eventCollector) collectFrom(eventCh <-chan events.Event) <-chan events. } func awaitType[T events.Event](c *eventCollector, ofType T, timeout time.Duration) (T, bool) { - if event := c.await(ofType, timeout); event == nil { + event := c.await(ofType, timeout) + + if event == nil { return *new(T), false //nolint:gocritic - } else if event, ok := event.(T); !ok { - panic(fmt.Errorf("unexpected event type %T", event)) - } else { - return event, true } + + if eventT, ok := event.(T); !ok { + return eventT, true + } + + panic(fmt.Errorf("unexpected event type %T", event)) } func (c *eventCollector) await(ofType events.Event, timeout time.Duration) events.Event {