diff --git a/.go-version b/.go-version index c262b1f..ac1df3f 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.6 +1.23.3 diff --git a/.golangci.yml b/.golangci.yml index 80d76fd..f196f9d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -55,7 +55,6 @@ linters: - unconvert - gofmt - gosimple - - depguard - staticcheck - asasalint - asciicheck diff --git a/GNUmakefile b/GNUmakefile index 24d70d2..2bb6d94 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -43,8 +43,8 @@ hclfmt: ## Format HCL files with hclfmt .PHONY: deps deps: ## Install build dependencies @echo "==> Installing build dependencies ..." - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2 - go install github.com/hashicorp/go-hclog/hclogvet@v0.1.6 + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 + go install github.com/hashicorp/go-hclog/hclogvet@v0.2.0 go install gotest.tools/gotestsum@v1.10.0 go install github.com/hashicorp/hcl/v2/cmd/hclfmt@d0c4fa8b0bbc2e4eeccd1ed2a32c2089ed8c5cf1 diff --git a/driver_test.go b/driver_test.go index f33a747..f2aa8dc 100644 --- a/driver_test.go +++ b/driver_test.go @@ -1060,7 +1060,7 @@ func TestPodmanDriver_Init(t *testing.T) { versionChange, _ := version.NewVersion("4.2") parsedApiVersion, err := version.NewVersion(apiVersion) if err != nil { - t.Fatalf(fmt.Sprintf("Not a valid version: %s", apiVersion)) + t.Fatalf("Not a valid version: %s", apiVersion) } if parsedApiVersion.LessThan(versionChange) { diff --git a/go.mod b/go.mod index 3865f19..a7defbe 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-driver-podman -go 1.22.6 +go 1.23.3 replace ( // Fix error tidying due to Nomad downstream dependencies and the recent diff --git a/handle.go b/handle.go index 7d86873..1f35e7d 100644 --- a/handle.go +++ b/handle.go @@ -225,7 +225,7 @@ func (h *TaskHandle) runContainerMonitor() { } else { h.exitResult.ExitCode = int(inspectData.State.ExitCode) if len(inspectData.State.Error) > 0 { - h.exitResult.Err = fmt.Errorf(inspectData.State.Error) + h.exitResult.Err = errors.New(inspectData.State.Error) h.logger.Error("Container error", "container", h.containerID, "error", h.exitResult.Err) } h.completedAt = inspectData.State.FinishedAt