diff --git a/Makefile b/Makefile index bead416b..bfec6d6e 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ check: $(BIN_GOLANGCI_LINT) ## Check code quality (lint) cd test && $(BIN_GOLANGCI_LINT) run --timeout 300s $(BIN_GOLANGCI_LINT): - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.59.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.62.2 .PHONY: generate/zz_filesystem_generated.go generate/zz_filesystem_generated.go: clean_templates templates/certs/ca-certificates.crt diff --git a/cmd/func-util/main.go b/cmd/func-util/main.go index b1e098cf..39f355c0 100644 --- a/cmd/func-util/main.go +++ b/cmd/func-util/main.go @@ -56,7 +56,7 @@ func main() { } func unknown(_ context.Context) error { - return fmt.Errorf("unknown command: " + os.Args[0]) + return fmt.Errorf("unknown command: %q", os.Args[0]) } func socat(ctx context.Context) error { diff --git a/cmd/root.go b/cmd/root.go index 6ad99c80..e5fca1bf 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -303,7 +303,7 @@ func mergeEnvs(envs []fn.Env, envToUpdate *util.OrderedMap, envToRemove []string errMsg := fn.ValidateEnvs(envs) if len(errMsg) > 0 { - return []fn.Env{}, 0, fmt.Errorf(strings.Join(errMsg, "\n")) + return []fn.Env{}, 0, fmt.Errorf("error(s) while validating envs: %s", strings.Join(errMsg, "\n")) } return envs, counter, nil diff --git a/pkg/knative/deployer.go b/pkg/knative/deployer.go index f4012c55..cd59583e 100644 --- a/pkg/knative/deployer.go +++ b/pkg/knative/deployer.go @@ -996,7 +996,7 @@ func checkResourcesArePresent(ctx context.Context, namespace string, referencedS } if errMsg != "" { - return fmt.Errorf("\n" + errMsg) + return fmt.Errorf("error(s) while validating resources:\n%s", errMsg) } return nil