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

docs: link warning to both timeout config options #6620

Merged

Conversation

katrinleinweber
Copy link
Contributor

@katrinleinweber katrinleinweber commented May 3, 2024

Description

Should these warnings only mention the CLI flag? How about instead linking to a docs page 1 level higher, so that users who encounter these warnings can then pick the relevant way to set their higher timeout?

(Semi-)Related issues

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
    • The exact strings don't seem to be tested for, so is this needed?
    • … double-checking locally …
  • [~] I've updated the documentation with the relevant information (if needed).
  • [~] I've added usage information (if the PR introduces new options)
  • [~] I've included a "before" and "after" example to the description (if the PR is a user interface change).

@@ -140,7 +140,7 @@ func Run(ctx context.Context, opt flag.Options) error {
var err error
defer func() {
if errors.Is(err, context.DeadlineExceeded) {
log.Warn("Increase --timeout value")
log.Warn("Provide a higher timeout value, see https://aquasecurity.github.io/trivy/latest/docs/configuration/")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or more terse:

Suggested change
log.Warn("Provide a higher timeout value, see https://aquasecurity.github.io/trivy/latest/docs/configuration/")
log.Warn("Increase timeout value, see https://aquasecurity.github.io/trivy/latest/docs/configuration/")

?

@katrinleinweber katrinleinweber marked this pull request as ready for review May 6, 2024 07:16
Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@knqyf263 knqyf263 enabled auto-merge May 6, 2024 08:03
@knqyf263 knqyf263 added this pull request to the merge queue May 6, 2024
Merged via the queue into aquasecurity:main with commit 38e2fbf May 6, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants