Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

license: unredact logs written by license enforcer #134875

Merged
merged 1 commit into from
Nov 12, 2024

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Nov 11, 2024

This makes it so log messages are not redacted unnecessarily.

  • Use redact.StringBuilder instead of strings.Builder.
  • Avoid using .String() arguments for log.Infof, since strings are always redacted.
  • Mark license type as a redact.SafeValue.

Epic: None
Release note: None

@rafiss rafiss added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.3.x Flags PRs that need to be backported to 24.3 labels Nov 11, 2024
@rafiss rafiss requested a review from spilchen November 11, 2024 21:50
@rafiss rafiss requested a review from a team as a code owner November 11, 2024 21:50
Copy link

blathers-crl bot commented Nov 11, 2024

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@spilchen spilchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm: Your CI failures look related to the SafeValue change for LicType. Do we need to update the allowlist in redactcheck.go?

Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rafiss)

@rafiss
Copy link
Collaborator Author

rafiss commented Nov 12, 2024

ah yeah, that's correct. i always forget about that redactcheck linter

This makes it so log messages are not redacted unnecessarily.

- Use redact.StringBuilder instead of strings.Builder.
- Avoid using `.String()` arguments for log.Infof, since strings are
  always redacted.
- Mark license type as a redact.SafeValue.

Release note: None
@rafiss
Copy link
Collaborator Author

rafiss commented Nov 12, 2024

tftr!

bors r+

Copy link

blathers-crl bot commented Nov 12, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 255f10f to blathers/backport-release-23.1-134875: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@rafiss rafiss deleted the unredact-license-enforcer branch November 12, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.3.x Flags PRs that need to be backported to 24.3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants