feat(GODT-3160): make linter happy

This commit is contained in:
Jakub 2024-01-24 10:22:43 +01:00
parent 1cd35defe5
commit 374194c13b
5 changed files with 14 additions and 9 deletions

View File

@ -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

View File

@ -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
}

View File

@ -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))
}

View File

@ -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())

View File

@ -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 {