Skip to content

Commit b58d42d

Browse files
authored
BREAKING(aws): Deprecate trivy aws as subcmd in favour of a plugin (#6819)
1 parent 6469d37 commit b58d42d

27 files changed

+47
-4337
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ trivy [global flags] command [flags] target
4343

4444
### SEE ALSO
4545

46-
* [trivy aws](trivy_aws.md) - [EXPERIMENTAL] Scan AWS account
4746
* [trivy config](trivy_config.md) - Scan config files for misconfigurations
4847
* [trivy convert](trivy_convert.md) - Convert Trivy JSON report into a different format
4948
* [trivy filesystem](trivy_filesystem.md) - Scan local filesystem

docs/docs/references/configuration/cli/trivy_aws.md

-127
This file was deleted.

go.mod

+15-48
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,21 @@ require (
2222
github.com/aquasecurity/go-npm-version v0.0.0-20201110091526-0b796d180798
2323
github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46
2424
github.com/aquasecurity/go-version v0.0.0-20240603093900-cf8a8d29271d
25-
github.com/aquasecurity/loading v0.0.5
2625
github.com/aquasecurity/table v1.8.0
2726
github.com/aquasecurity/testdocker v0.0.0-20240613070307-2c3868d658ac
2827
github.com/aquasecurity/tml v0.6.1
29-
github.com/aquasecurity/trivy-aws v0.9.1-0.20240607040622-8a7f09cd891f
3028
github.com/aquasecurity/trivy-checks v0.11.0
3129
github.com/aquasecurity/trivy-db v0.0.0-20231005141211-4fc651f7ac8d
3230
github.com/aquasecurity/trivy-java-db v0.0.0-20240109071736-184bd7481d48
3331
github.com/aquasecurity/trivy-kubernetes v0.6.7-0.20240516051533-4c5a4aad13b7
3432
github.com/aws/aws-sdk-go-v2 v1.27.2
35-
github.com/aws/aws-sdk-go-v2/config v1.27.18
36-
github.com/aws/aws-sdk-go-v2/credentials v1.17.18
37-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.24
38-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.1
39-
github.com/aws/aws-sdk-go-v2/service/ecr v1.28.5
40-
github.com/aws/aws-sdk-go-v2/service/s3 v1.55.1
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.12
33+
github.com/aws/aws-sdk-go-v2/config v1.27.15
34+
github.com/aws/aws-sdk-go-v2/credentials v1.17.15
35+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.20
36+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.161.3
37+
github.com/aws/aws-sdk-go-v2/service/ecr v1.28.2
38+
github.com/aws/aws-sdk-go-v2/service/s3 v1.54.2
39+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.9 // indirect
4240
github.com/aws/smithy-go v1.20.2
4341
github.com/bitnami/go-version v0.0.0-20231130084017-bb00604d650c
4442
github.com/bmatcuk/doublestar/v4 v4.6.1
@@ -176,46 +174,14 @@ require (
176174
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 // indirect
177175
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 // indirect
178176
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
179-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.9 // indirect
180-
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.26.7 // indirect
181-
github.com/aws/aws-sdk-go-v2/service/apigateway v1.21.6 // indirect
182-
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.18.6 // indirect
183-
github.com/aws/aws-sdk-go-v2/service/athena v1.37.3 // indirect
184-
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.36.4 // indirect
185-
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.35.6 // indirect
186-
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.32.2 // indirect
187-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.30.1 // indirect
188-
github.com/aws/aws-sdk-go-v2/service/codebuild v1.26.5 // indirect
189-
github.com/aws/aws-sdk-go-v2/service/docdb v1.34.4 // indirect
190-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.8 // indirect
177+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.7 // indirect
191178
github.com/aws/aws-sdk-go-v2/service/ebs v1.21.7 // indirect
192-
github.com/aws/aws-sdk-go-v2/service/ecs v1.35.6 // indirect
193-
github.com/aws/aws-sdk-go-v2/service/efs v1.28.1 // indirect
194-
github.com/aws/aws-sdk-go-v2/service/eks v1.41.0 // indirect
195-
github.com/aws/aws-sdk-go-v2/service/elasticache v1.34.6 // indirect
196-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.26.6 // indirect
197-
github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.25.0 // indirect
198-
github.com/aws/aws-sdk-go-v2/service/emr v1.36.0 // indirect
199-
github.com/aws/aws-sdk-go-v2/service/iam v1.28.7 // indirect
200179
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
201-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.11 // indirect
202-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.11 // indirect
203-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 // indirect
204-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.9 // indirect
205-
github.com/aws/aws-sdk-go-v2/service/kafka v1.28.5 // indirect
206-
github.com/aws/aws-sdk-go-v2/service/kinesis v1.24.6 // indirect
207-
github.com/aws/aws-sdk-go-v2/service/kms v1.32.1 // indirect
208-
github.com/aws/aws-sdk-go-v2/service/lambda v1.49.6 // indirect
209-
github.com/aws/aws-sdk-go-v2/service/mq v1.20.6 // indirect
210-
github.com/aws/aws-sdk-go-v2/service/neptune v1.28.1 // indirect
211-
github.com/aws/aws-sdk-go-v2/service/rds v1.66.1 // indirect
212-
github.com/aws/aws-sdk-go-v2/service/redshift v1.39.7 // indirect
213-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.0 // indirect
214-
github.com/aws/aws-sdk-go-v2/service/sns v1.26.6 // indirect
215-
github.com/aws/aws-sdk-go-v2/service/sqs v1.29.6 // indirect
216-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 // indirect
217-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect
218-
github.com/aws/aws-sdk-go-v2/service/workspaces v1.38.1 // indirect
180+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.9 // indirect
181+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
182+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.7 // indirect
183+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.8 // indirect
184+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.2 // indirect
219185
github.com/beorn7/perks v1.0.1 // indirect
220186
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
221187
github.com/briandowns/spinner v1.23.0 // indirect
@@ -287,6 +253,7 @@ require (
287253
github.com/gorilla/websocket v1.5.0 // indirect
288254
github.com/gosuri/uitable v0.0.4 // indirect
289255
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
256+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
290257
github.com/hashicorp/errwrap v1.1.0 // indirect
291258
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
292259
github.com/hashicorp/go-safetemp v1.0.0 // indirect
@@ -383,10 +350,10 @@ require (
383350
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
384351
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
385352
go.opentelemetry.io/otel v1.27.0 // indirect
353+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
386354
go.opentelemetry.io/otel/metric v1.27.0 // indirect
387355
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
388356
go.opentelemetry.io/otel/trace v1.27.0 // indirect
389-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
390357
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
391358
go.uber.org/multierr v1.11.0 // indirect
392359
go.uber.org/zap v1.27.0 // indirect

0 commit comments

Comments
 (0)