Assorted nits reported by revive linter

[kolyshkin]

See individual commits for details.

[rhatdan]

/approve LGTM

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kolyshkin, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• ~~OWNERS~~ [rhatdan]

Approvers can indicate their approval by writing /approve in a comment Approvers can cancel approval by writing /approve cancel in a comment

[nalind]

Should this be enabling the linter in .golangci.yml, too?

[kolyshkin]

Should this be enabling the linter in .golangci.yml, too?

This linter is sort of too opinionated, and thus it's best to run it manually and only fix those warnings that make sense.

We can, of course, annotate all the warnings that we don't want to fix, and then enable the linter, but I'm not sure it makes sense.

[rhatdan]

/lgtm