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

Add s3 object count to trace logs #975

Merged
merged 2 commits into from Dec 14, 2022
Merged

Conversation

bill-rich
Copy link
Collaborator

No description provided.

@bill-rich bill-rich requested review from a team as code owners December 13, 2022 23:48
main.go Outdated
Comment on lines 121 to 122
log.SetLevel(3)
log.SetLevelForControl(logLevel, 3)
Copy link
Collaborator

Choose a reason for hiding this comment

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

We may want to use 2 here to match what we have in enterprise.

Copy link
Collaborator

Choose a reason for hiding this comment

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

We could also solely rely on the globalLogLevel that is set via log.SetLevel.. in other words I think we could remove the logLevel variable altogether.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I thought the same, but it doesn't seem to work without the SetLevelForControl. I'm not super familiar with the logging setup, so I'm not sure why that is.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think when we do log.WithLeveler it replaces the default global with the one we provide. We could probably just remove the control entirely, but that can happen in another PR.

@bill-rich bill-rich merged commit 36ca260 into main Dec 14, 2022
@bill-rich bill-rich deleted the THOG-856_Add_object_count branch December 14, 2022 00:46
javajawa added a commit to mewbotorg/mewbot that referenced this pull request Dec 26, 2022
Update trufflehog from 3.19.0 to 3.21.0.

- Bump github.com/xanzy/go-gitlab from 0.76.0 to 0.77.0 by @​dependabot in trufflesecurity/trufflehog#981
- Bump golang.org/x/crypto from 0.3.0 to 0.4.0 by @​dependabot in trufflesecurity/trufflehog#982
- Add configuration parsing and custom detectors to engine by @​mcastorina in trufflesecurity/trufflehog#968
- Add custom regex detector docs by @​mcastorina in trufflesecurity/trufflehog#983
- Remove custom log leveler by @​mcastorina in trufflesecurity/trufflehog#985
- Bump github.com/xanzy/go-gitlab from 0.74.0 to 0.76.0 by @​dependabot in trufflesecurity/trufflehog#934
- Bump github.com/bill-rich/disk-buffer-reader from v0.1.6 to v0.1.7 by @​bill-rich in trufflesecurity/trufflehog#970
- Bump go.mongodb.org/mongo-driver from 1.11.0 to 1.11.1 by @​dependabot in trufflesecurity/trufflehog#971
- Bump github.com/getsentry/sentry-go from 0.15.0 to 0.16.0 by @​dependabot in trufflesecurity/trufflehog#973
- [bug] - Handle error when scanning s3 bucket. by @​ahrav in trufflesecurity/trufflehog#969
- Bump github.com/go-git/go-git/v5 from 5.4.2 to 5.5.1 by @​dependabot in trufflesecurity/trufflehog#972
- Bump github.com/envoyproxy/protoc-gen-validate from 0.6.13 to 0.9.1 by @​dependabot in trufflesecurity/trufflehog#963
- Add more logging for git sources by @​mcastorina in trufflesecurity/trufflehog#974
- Add s3 object count to trace logs by @​bill-rich in trufflesecurity/trufflehog#975
- Implement CustomRegex detector by @​mcastorina in trufflesecurity/trufflehog#950
- Use Todoist's REST API v2 by @​goncalossilva in trufflesecurity/trufflehog#978
- Allow using a glob for include list. by @​ahrav in trufflesecurity/trufflehog#977
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants