Skip to content

[release-21.0] Potential fix for code scanning alert no. 2992: Clear-text logging of sensitive information (#18754)#18757

Closed
vitess-bot[bot] wants to merge 1 commit intorelease-21.0from
backport-18754-to-release-21.0
Closed

[release-21.0] Potential fix for code scanning alert no. 2992: Clear-text logging of sensitive information (#18754)#18757
vitess-bot[bot] wants to merge 1 commit intorelease-21.0from
backport-18754-to-release-21.0

Conversation

@vitess-bot
Copy link
Contributor

@vitess-bot vitess-bot bot commented Oct 16, 2025

Description

This is a backport of #18754

@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Oct 16, 2025

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Oct 16, 2025

Hello @timvaillancourt, 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 18757 -R vitessio/vitess
git reset --hard origin/release-21.0
git cherry-pick -m 1 aa24f381f8ba0a163b750a42d6303b91fc09d23c

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Oct 16, 2025
@github-actions github-actions bot added this to the v21.0.6 milestone Oct 16, 2025
@timvaillancourt
Copy link
Contributor

Nothing to commit after conflict-resolution:

tim@tims-mbp vitess % git cherry-pick --continue
On branch backport-18754-to-release-21.0
Your branch is behind 'origin/backport-18754-to-release-21.0' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

You are currently cherry-picking commit aa24f381f8.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

Closing ❌

@timvaillancourt timvaillancourt deleted the backport-18754-to-release-21.0 branch October 16, 2025 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport This is a backport Component: vtctldclient Merge Conflict NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says Skip CI Skip CI actions from running Type: Internal Cleanup Type: Security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant