[release-22.0] Fix some linting issues (#19246)

[vitess-bot]

Description

This is a backport of #19246

[vitess-bot]

Hello @arthurschreiber, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 19247
git reset --hard origin/release-22.0
git cherry-pick -m 1 762c494399356660bff348210187684298c47de5