Skip to content

Commit

Permalink
Update golangci-lint (#2606)
Browse files Browse the repository at this point in the history
Signed-off-by: Matej Vašek <mvasek@redhat.com>
  • Loading branch information
matejvasek authored Dec 2, 2024
1 parent cd24d85 commit 3d19d9b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/func-util/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/knative/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3d19d9b

Please sign in to comment.