Skip to content

Commit 4a269dd

Browse files
committed
rearrange structure and make scan only
- move the package from update to notifications - use a version-check prefix on the debug logs - move the `--no-notices` flag to the scan flags - update the tests to include a flag test - regenerate the docs
1 parent f0b9322 commit 4a269dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+59
-67
lines changed

docs/docs/references/configuration/cli/trivy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ trivy [global flags] command [flags] target
3636
--generate-default-config write the default config to trivy-default.yaml
3737
-h, --help help for trivy
3838
--insecure allow insecure server connections
39-
--no-notices suppress notices about version updates and Trivy announcements
4039
-q, --quiet suppress progress bar and log output
4140
--timeout duration timeout (default 5m0s)
4241
-v, --version show version

docs/docs/references/configuration/cli/trivy_clean.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ trivy clean [flags]
4040
-d, --debug debug mode
4141
--generate-default-config write the default config to trivy-default.yaml
4242
--insecure allow insecure server connections
43-
--no-notices suppress notices about version updates and Trivy announcements
4443
-q, --quiet suppress progress bar and log output
4544
--timeout duration timeout (default 5m0s)
4645
-v, --version show version

docs/docs/references/configuration/cli/trivy_config.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ trivy config [flags] DIR
6767
-d, --debug debug mode
6868
--generate-default-config write the default config to trivy-default.yaml
6969
--insecure allow insecure server connections
70-
--no-notices suppress notices about version updates and Trivy announcements
7170
-q, --quiet suppress progress bar and log output
7271
--timeout duration timeout (default 5m0s)
7372
-v, --version show version

docs/docs/references/configuration/cli/trivy_convert.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ trivy convert [flags] RESULT_JSON
4545
-d, --debug debug mode
4646
--generate-default-config write the default config to trivy-default.yaml
4747
--insecure allow insecure server connections
48-
--no-notices suppress notices about version updates and Trivy announcements
4948
-q, --quiet suppress progress bar and log output
5049
--timeout duration timeout (default 5m0s)
5150
-v, --version show version

docs/docs/references/configuration/cli/trivy_filesystem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ trivy filesystem [flags] PATH
6363
--list-all-pkgs output all packages in the JSON report regardless of vulnerability
6464
--misconfig-scanners strings comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
6565
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
66+
--no-notices suppress notices about version updates and Trivy announcements
6667
--no-progress suppress progress bar
6768
--offline-scan do not issue API requests to identify dependencies
6869
-o, --output string output file name
@@ -112,7 +113,6 @@ trivy filesystem [flags] PATH
112113
-d, --debug debug mode
113114
--generate-default-config write the default config to trivy-default.yaml
114115
--insecure allow insecure server connections
115-
--no-notices suppress notices about version updates and Trivy announcements
116116
-q, --quiet suppress progress bar and log output
117117
--timeout duration timeout (default 5m0s)
118118
-v, --version show version

docs/docs/references/configuration/cli/trivy_image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ trivy image [flags] IMAGE_NAME
8282
--max-image-size string [EXPERIMENTAL] maximum image size to process, specified in a human-readable format (e.g., '44kB', '17MB'); an error will be returned if the image exceeds this size
8383
--misconfig-scanners strings comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
8484
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
85+
--no-notices suppress notices about version updates and Trivy announcements
8586
--no-progress suppress progress bar
8687
--offline-scan do not issue API requests to identify dependencies
8788
-o, --output string output file name
@@ -133,7 +134,6 @@ trivy image [flags] IMAGE_NAME
133134
-d, --debug debug mode
134135
--generate-default-config write the default config to trivy-default.yaml
135136
--insecure allow insecure server connections
136-
--no-notices suppress notices about version updates and Trivy announcements
137137
-q, --quiet suppress progress bar and log output
138138
--timeout duration timeout (default 5m0s)
139139
-v, --version show version

docs/docs/references/configuration/cli/trivy_kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ trivy kubernetes [flags] [CONTEXT]
7676
--kubeconfig string specify the kubeconfig file path to use
7777
--list-all-pkgs output all packages in the JSON report regardless of vulnerability
7878
--misconfig-scanners strings comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
79+
--no-notices suppress notices about version updates and Trivy announcements
7980
--no-progress suppress progress bar
8081
--node-collector-imageref string indicate the image reference for the node-collector scan job (default "ghcr.io/aquasecurity/node-collector:0.3.1")
8182
--node-collector-namespace string specify the namespace in which the node-collector job should be deployed (default "trivy-temp")
@@ -125,7 +126,6 @@ trivy kubernetes [flags] [CONTEXT]
125126
-d, --debug debug mode
126127
--generate-default-config write the default config to trivy-default.yaml
127128
--insecure allow insecure server connections
128-
--no-notices suppress notices about version updates and Trivy announcements
129129
-q, --quiet suppress progress bar and log output
130130
--timeout duration timeout (default 5m0s)
131131
-v, --version show version

docs/docs/references/configuration/cli/trivy_module.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Manage modules
1818
-d, --debug debug mode
1919
--generate-default-config write the default config to trivy-default.yaml
2020
--insecure allow insecure server connections
21-
--no-notices suppress notices about version updates and Trivy announcements
2221
-q, --quiet suppress progress bar and log output
2322
--timeout duration timeout (default 5m0s)
2423
-v, --version show version

docs/docs/references/configuration/cli/trivy_module_install.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ trivy module install [flags] REPOSITORY
2222
--generate-default-config write the default config to trivy-default.yaml
2323
--insecure allow insecure server connections
2424
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
25-
--no-notices suppress notices about version updates and Trivy announcements
2625
-q, --quiet suppress progress bar and log output
2726
--timeout duration timeout (default 5m0s)
2827
-v, --version show version

docs/docs/references/configuration/cli/trivy_module_uninstall.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ trivy module uninstall [flags] REPOSITORY
2222
--generate-default-config write the default config to trivy-default.yaml
2323
--insecure allow insecure server connections
2424
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
25-
--no-notices suppress notices about version updates and Trivy announcements
2625
-q, --quiet suppress progress bar and log output
2726
--timeout duration timeout (default 5m0s)
2827
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Manage plugins
1616
-d, --debug debug mode
1717
--generate-default-config write the default config to trivy-default.yaml
1818
--insecure allow insecure server connections
19-
--no-notices suppress notices about version updates and Trivy announcements
2019
-q, --quiet suppress progress bar and log output
2120
--timeout duration timeout (default 5m0s)
2221
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_info.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin info PLUGIN_NAME
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_install.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ trivy plugin install NAME | URL | FILE_PATH
3333
-d, --debug debug mode
3434
--generate-default-config write the default config to trivy-default.yaml
3535
--insecure allow insecure server connections
36-
--no-notices suppress notices about version updates and Trivy announcements
3736
-q, --quiet suppress progress bar and log output
3837
--timeout duration timeout (default 5m0s)
3938
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_list.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin list
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_run.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin run NAME | URL | FILE_PATH
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_search.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin search [KEYWORD]
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_uninstall.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin uninstall PLUGIN_NAME
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_update.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin update
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_plugin_upgrade.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ trivy plugin upgrade [PLUGIN_NAMES]
2020
-d, --debug debug mode
2121
--generate-default-config write the default config to trivy-default.yaml
2222
--insecure allow insecure server connections
23-
--no-notices suppress notices about version updates and Trivy announcements
2423
-q, --quiet suppress progress bar and log output
2524
--timeout duration timeout (default 5m0s)
2625
-v, --version show version

docs/docs/references/configuration/cli/trivy_registry.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Manage registry authentication
1616
-d, --debug debug mode
1717
--generate-default-config write the default config to trivy-default.yaml
1818
--insecure allow insecure server connections
19-
--no-notices suppress notices about version updates and Trivy announcements
2019
-q, --quiet suppress progress bar and log output
2120
--timeout duration timeout (default 5m0s)
2221
-v, --version show version

docs/docs/references/configuration/cli/trivy_registry_login.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ trivy registry login SERVER [flags]
3030
-d, --debug debug mode
3131
--generate-default-config write the default config to trivy-default.yaml
3232
--insecure allow insecure server connections
33-
--no-notices suppress notices about version updates and Trivy announcements
3433
-q, --quiet suppress progress bar and log output
3534
--timeout duration timeout (default 5m0s)
3635
-v, --version show version

docs/docs/references/configuration/cli/trivy_registry_logout.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ trivy registry logout SERVER [flags]
2727
-d, --debug debug mode
2828
--generate-default-config write the default config to trivy-default.yaml
2929
--insecure allow insecure server connections
30-
--no-notices suppress notices about version updates and Trivy announcements
3130
-q, --quiet suppress progress bar and log output
3231
--timeout duration timeout (default 5m0s)
3332
-v, --version show version

docs/docs/references/configuration/cli/trivy_repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
6262
--list-all-pkgs output all packages in the JSON report regardless of vulnerability
6363
--misconfig-scanners strings comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
6464
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
65+
--no-notices suppress notices about version updates and Trivy announcements
6566
--no-progress suppress progress bar
6667
--offline-scan do not issue API requests to identify dependencies
6768
-o, --output string output file name
@@ -111,7 +112,6 @@ trivy repository [flags] (REPO_PATH | REPO_URL)
111112
-d, --debug debug mode
112113
--generate-default-config write the default config to trivy-default.yaml
113114
--insecure allow insecure server connections
114-
--no-notices suppress notices about version updates and Trivy announcements
115115
-q, --quiet suppress progress bar and log output
116116
--timeout duration timeout (default 5m0s)
117117
-v, --version show version

docs/docs/references/configuration/cli/trivy_rootfs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ trivy rootfs [flags] ROOTDIR
6565
--list-all-pkgs output all packages in the JSON report regardless of vulnerability
6666
--misconfig-scanners strings comma-separated list of misconfig scanners to use for misconfiguration scanning (default [azure-arm,cloudformation,dockerfile,helm,kubernetes,terraform,terraformplan-json,terraformplan-snapshot])
6767
--module-dir string specify directory to the wasm modules that will be loaded (default "$HOME/.trivy/modules")
68+
--no-notices suppress notices about version updates and Trivy announcements
6869
--no-progress suppress progress bar
6970
--offline-scan do not issue API requests to identify dependencies
7071
-o, --output string output file name
@@ -113,7 +114,6 @@ trivy rootfs [flags] ROOTDIR
113114
-d, --debug debug mode
114115
--generate-default-config write the default config to trivy-default.yaml
115116
--insecure allow insecure server connections
116-
--no-notices suppress notices about version updates and Trivy announcements
117117
-q, --quiet suppress progress bar and log output
118118
--timeout duration timeout (default 5m0s)
119119
-v, --version show version

docs/docs/references/configuration/cli/trivy_sbom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ trivy sbom [flags] SBOM_PATH
4444
--ignorefile string specify .trivyignore file (default ".trivyignore")
4545
--java-db-repository strings OCI repository(ies) to retrieve trivy-java-db in order of priority (default [mirror.gcr.io/aquasec/trivy-java-db:1,ghcr.io/aquasecurity/trivy-java-db:1])
4646
--list-all-pkgs output all packages in the JSON report regardless of vulnerability
47+
--no-notices suppress notices about version updates and Trivy announcements
4748
--no-progress suppress progress bar
4849
--offline-scan do not issue API requests to identify dependencies
4950
-o, --output string output file name
@@ -85,7 +86,6 @@ trivy sbom [flags] SBOM_PATH
8586
-d, --debug debug mode
8687
--generate-default-config write the default config to trivy-default.yaml
8788
--insecure allow insecure server connections
88-
--no-notices suppress notices about version updates and Trivy announcements
8989
-q, --quiet suppress progress bar and log output
9090
--timeout duration timeout (default 5m0s)
9191
-v, --version show version

docs/docs/references/configuration/cli/trivy_server.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ trivy server [flags]
5050
-d, --debug debug mode
5151
--generate-default-config write the default config to trivy-default.yaml
5252
--insecure allow insecure server connections
53-
--no-notices suppress notices about version updates and Trivy announcements
5453
-q, --quiet suppress progress bar and log output
5554
--timeout duration timeout (default 5m0s)
5655
-v, --version show version

docs/docs/references/configuration/cli/trivy_version.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ trivy version [flags]
2121
-d, --debug debug mode
2222
--generate-default-config write the default config to trivy-default.yaml
2323
--insecure allow insecure server connections
24-
--no-notices suppress notices about version updates and Trivy announcements
2524
-q, --quiet suppress progress bar and log output
2625
--timeout duration timeout (default 5m0s)
2726
-v, --version show version

docs/docs/references/configuration/cli/trivy_vex.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
-d, --debug debug mode
1717
--generate-default-config write the default config to trivy-default.yaml
1818
--insecure allow insecure server connections
19-
--no-notices suppress notices about version updates and Trivy announcements
2019
-q, --quiet suppress progress bar and log output
2120
--timeout duration timeout (default 5m0s)
2221
-v, --version show version

0 commit comments

Comments
 (0)