From 5401a5994d7785a7edae16d701a4f661bca8471b Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 20 May 2024 05:02:23 +0200 Subject: [PATCH] ci(deps): fix gci and gofmt in ".*_test.go$" (#6721) Signed-off-by: Matthieu MOREL --- .golangci.yaml | 2 -- pkg/cloud/aws/commands/run_test.go | 3 +-- pkg/cloud/report/service_test.go | 3 +-- pkg/dependency/id_test.go | 6 ++++-- pkg/dependency/parser/gradle/lockfile/parse_test.go | 3 ++- pkg/dependency/parser/hex/mix/parse_test.go | 3 ++- pkg/dependency/parser/java/jar/parse_test.go | 2 +- pkg/dependency/parser/php/composer/parse_test.go | 8 +++++--- pkg/dependency/parser/swift/cocoapods/parse_test.go | 5 +++-- pkg/dependency/parser/swift/swift/parse_test.go | 6 ++++-- pkg/dependency/parser/utils/utils_test.go | 6 ++++-- pkg/detector/ospkg/alma/alma_test.go | 7 ++++--- pkg/detector/ospkg/alpine/alpine_test.go | 5 +++-- pkg/detector/ospkg/amazon/amazon_test.go | 7 ++++--- pkg/detector/ospkg/debian/debian_test.go | 7 ++++--- pkg/detector/ospkg/oracle/oracle_test.go | 7 ++++--- pkg/detector/ospkg/photon/photon_test.go | 7 ++++--- pkg/detector/ospkg/redhat/redhat_test.go | 7 ++++--- pkg/detector/ospkg/rocky/rocky_test.go | 7 ++++--- pkg/detector/ospkg/suse/suse_test.go | 7 ++++--- pkg/detector/ospkg/ubuntu/ubuntu_test.go | 7 ++++--- pkg/fanal/analyzer/analyzer_test.go | 2 +- .../language/conda/environment/environment_test.go | 10 ++++++---- pkg/fanal/analyzer/language/java/gradle/pom_test.go | 3 ++- pkg/fanal/analyzer/language/java/jar/jar_test.go | 4 ++-- pkg/fanal/analyzer/language/julia/pkg/pkg_test.go | 5 +++-- pkg/fanal/analyzer/pkg/rpm/rpm_test.go | 6 +++--- pkg/fanal/analyzer/sbom/sbom_test.go | 2 +- pkg/fanal/applier/applier_test.go | 2 +- pkg/fanal/artifact/image/remote_sbom_test.go | 2 +- pkg/fanal/artifact/local/fs_test.go | 7 ++++--- pkg/fanal/artifact/repo/git_test.go | 5 +++-- pkg/fanal/artifact/sbom/sbom_test.go | 2 +- pkg/fanal/cache/key_test.go | 2 +- pkg/fanal/handler/unpackaged/unpackaged_test.go | 2 +- pkg/fanal/secret/scanner_test.go | 5 +++-- pkg/fanal/walker/fs_test.go | 2 +- pkg/fanal/walker/walk_test.go | 3 ++- pkg/flag/db_flags_test.go | 7 ++++--- pkg/flag/options_test.go | 13 +++++++------ pkg/flag/remote_flags_test.go | 7 ++++--- pkg/flag/report_flags_test.go | 7 ++++--- pkg/flag/scan_flags_test.go | 2 +- pkg/flag/vulnerability_flags_test.go | 9 +++++---- pkg/iac/adapters/arm/compute/adapt_test.go | 6 +++--- pkg/iac/adapters/arm/storage/adapt_test.go | 5 ++--- pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go | 3 ++- pkg/iac/adapters/cloudformation/aws/iam/iam_test.go | 3 ++- pkg/iac/adapters/cloudformation/aws/sam/sam_test.go | 3 ++- pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go | 3 ++- .../adapters/terraform/aws/apigateway/adapt_test.go | 5 +++-- pkg/iac/adapters/terraform/aws/athena/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/cloudfront/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/cloudtrail/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/cloudwatch/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/codebuild/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/config/adapt_test.go | 7 +++---- .../adapters/terraform/aws/documentdb/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/dynamodb/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/ec2/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/ec2/autoscaling_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/ec2/subnet_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/ec2/volume_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/ec2/vpc_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/ecr/adapt_test.go | 11 +++++------ pkg/iac/adapters/terraform/aws/ecs/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/efs/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/eks/adapt_test.go | 9 ++++----- .../terraform/aws/elasticache/adapt_test.go | 9 ++++----- .../terraform/aws/elasticsearch/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/elb/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/emr/adapt_test.go | 8 ++++---- pkg/iac/adapters/terraform/aws/iam/adapt_test.go | 3 ++- pkg/iac/adapters/terraform/aws/iam/groups_test.go | 3 +-- .../adapters/terraform/aws/iam/passwords_test.go | 3 +-- pkg/iac/adapters/terraform/aws/iam/policies_test.go | 6 +++--- pkg/iac/adapters/terraform/aws/iam/roles_test.go | 3 ++- .../adapters/terraform/aws/kinesis/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/kms/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/lambda/adapt_test.go | 8 ++++---- pkg/iac/adapters/terraform/aws/mq/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/msk/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/neptune/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/rds/adapt_test.go | 8 ++++---- .../adapters/terraform/aws/redshift/adapt_test.go | 8 ++++---- pkg/iac/adapters/terraform/aws/s3/adapt_test.go | 10 +++++----- pkg/iac/adapters/terraform/aws/s3/bucket_test.go | 4 ++-- pkg/iac/adapters/terraform/aws/sns/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/aws/sqs/adapt_test.go | 11 +++++------ pkg/iac/adapters/terraform/aws/ssm/adapt_test.go | 9 ++++----- .../adapters/terraform/aws/workspaces/adapt_test.go | 9 ++++----- .../terraform/azure/appservice/adapt_test.go | 9 ++++----- .../terraform/azure/authorization/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/compute/adapt_test.go | 9 ++++----- .../terraform/azure/container/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/database/adapt_test.go | 8 ++++---- .../terraform/azure/datafactory/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/datalake/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/keyvault/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/monitor/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/network/adapt_test.go | 8 ++++---- .../terraform/azure/securitycenter/adapt_test.go | 9 ++++----- .../adapters/terraform/azure/storage/adapt_test.go | 8 ++++---- .../adapters/terraform/azure/synapse/adapt_test.go | 9 ++++----- .../terraform/cloudstack/compute/adapt_test.go | 9 ++++----- .../terraform/digitalocean/compute/adapt_test.go | 8 ++++---- .../terraform/digitalocean/spaces/adapt_test.go | 9 ++++----- .../github/branch_protections/adapt_test.go | 4 ++-- .../terraform/github/repositories/adapt_test.go | 4 ++-- .../adapters/terraform/github/secrets/adapt_test.go | 3 +-- .../terraform/google/bigquery/adapt_test.go | 9 ++++----- .../adapters/terraform/google/compute/adapt_test.go | 3 ++- .../adapters/terraform/google/compute/disks_test.go | 3 +-- .../terraform/google/compute/instances_test.go | 3 +-- .../terraform/google/compute/metadata_test.go | 3 +-- .../terraform/google/compute/networks_test.go | 3 +-- .../adapters/terraform/google/compute/ssl_test.go | 3 +-- pkg/iac/adapters/terraform/google/dns/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/google/gke/adapt_test.go | 8 ++++---- pkg/iac/adapters/terraform/google/iam/adapt_test.go | 8 ++++---- .../terraform/google/iam/project_iam_test.go | 3 +-- pkg/iac/adapters/terraform/google/kms/adapt_test.go | 9 ++++----- pkg/iac/adapters/terraform/google/sql/adapt_test.go | 9 ++++----- .../adapters/terraform/google/storage/adapt_test.go | 8 ++++---- .../terraform/nifcloud/computing/adapt_test.go | 4 ++-- .../terraform/nifcloud/computing/instance_test.go | 3 +-- .../nifcloud/computing/security_group_test.go | 3 +-- .../adapters/terraform/nifcloud/dns/adapt_test.go | 4 ++-- .../adapters/terraform/nifcloud/nas/adapt_test.go | 4 ++-- .../terraform/nifcloud/nas/nas_instance_test.go | 3 +-- .../nifcloud/nas/nas_security_group_test.go | 3 +-- .../terraform/nifcloud/network/adapt_test.go | 4 ++-- .../adapters/terraform/nifcloud/rdb/adapt_test.go | 4 ++-- .../terraform/nifcloud/rdb/db_instance_test.go | 3 +-- .../nifcloud/rdb/db_security_group_test.go | 3 +-- .../terraform/nifcloud/sslcertificate/adapt_test.go | 4 ++-- pkg/iac/adapters/terraform/openstack/adapt_test.go | 9 ++++----- .../adapters/terraform/openstack/networking_test.go | 4 ++-- pkg/iac/ignore/rule_test.go | 3 ++- pkg/iac/rego/convert/slice_test.go | 4 ++-- pkg/iac/rego/embed_test.go | 7 ++++--- pkg/iac/rego/load_test.go | 2 +- pkg/iac/rego/metadata_test.go | 5 +++-- pkg/iac/rego/scanner_test.go | 4 ++-- pkg/iac/rules/register_test.go | 5 +++-- pkg/iac/scan/result_test.go | 3 ++- .../scanners/azure/arm/parser/armjson/bench_test.go | 4 ++-- .../azure/arm/parser/armjson/decode_meta_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_array_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_boolean_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_complex_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_null_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_number_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_object_test.go | 4 ++-- .../azure/arm/parser/armjson/parse_string_test.go | 4 ++-- pkg/iac/scanners/azure/arm/parser/parser_test.go | 6 +++--- pkg/iac/scanners/azure/arm/parser/template_test.go | 5 +++-- pkg/iac/scanners/azure/resolver/resolver_test.go | 3 ++- pkg/iac/scanners/azure/value_test.go | 3 ++- .../scanners/cloudformation/parser/fn_and_test.go | 6 +++--- .../cloudformation/parser/fn_base64_test.go | 7 ++++--- .../cloudformation/parser/fn_condition_test.go | 3 ++- .../cloudformation/parser/fn_equals_test.go | 6 +++--- .../cloudformation/parser/fn_find_in_map_test.go | 4 ++-- .../cloudformation/parser/fn_get_attr_test.go | 4 ++-- .../scanners/cloudformation/parser/fn_if_test.go | 6 +++--- .../scanners/cloudformation/parser/fn_join_test.go | 6 +++--- .../cloudformation/parser/fn_length_test.go | 3 ++- .../scanners/cloudformation/parser/fn_not_test.go | 6 +++--- .../scanners/cloudformation/parser/fn_or_test.go | 6 +++--- .../scanners/cloudformation/parser/fn_ref_test.go | 6 +++--- .../scanners/cloudformation/parser/fn_split_test.go | 7 ++++--- .../scanners/cloudformation/parser/parser_test.go | 3 ++- .../cloudformation/parser/property_helpers_test.go | 3 ++- .../scanners/cloudformation/parser/resource_test.go | 3 ++- pkg/iac/scanners/cloudformation/scanner_test.go | 6 +++--- .../cloudformation/test/cf_scanning_test.go | 2 +- pkg/iac/scanners/dockerfile/scanner_test.go | 5 +++-- pkg/iac/scanners/helm/test/parser_test.go | 5 +++-- pkg/iac/scanners/helm/test/scanner_test.go | 5 +++-- pkg/iac/scanners/json/scanner_test.go | 5 +++-- pkg/iac/scanners/kubernetes/scanner_test.go | 5 +++-- pkg/iac/scanners/terraform/attribute_test.go | 3 ++- pkg/iac/scanners/terraform/count_test.go | 3 ++- pkg/iac/scanners/terraform/deterministic_test.go | 3 ++- .../scanners/terraform/executor/executor_test.go | 5 +++-- pkg/iac/scanners/terraform/fs_test.go | 3 ++- pkg/iac/scanners/terraform/ignore_test.go | 3 ++- pkg/iac/scanners/terraform/module_test.go | 6 +++--- pkg/iac/scanners/terraform/parser/load_vars_test.go | 6 +++--- pkg/iac/scanners/terraform/parser/modules_test.go | 3 ++- .../terraform/parser/parser_integration_test.go | 3 ++- pkg/iac/scanners/terraform/parser/parser_test.go | 7 ++++--- .../scanners/terraform/scanner_integration_test.go | 5 +++-- pkg/iac/scanners/terraform/scanner_test.go | 5 +++-- pkg/iac/scanners/terraform/setup_test.go | 3 ++- .../scanners/terraformplan/snapshot/scanner_test.go | 7 ++++--- .../scanners/terraformplan/tfjson/scanner_test.go | 5 +++-- .../terraformplan/tfjson/test/parser_test.go | 3 ++- .../terraformplan/tfjson/test/scanner_test.go | 4 ++-- pkg/iac/scanners/toml/scanner_test.go | 5 +++-- pkg/iac/scanners/yaml/scanner_test.go | 5 +++-- pkg/iac/state/merge_test.go | 8 +++----- pkg/iac/state/state_test.go | 6 ++---- pkg/iac/types/bool_test.go | 3 +-- pkg/iac/types/fskey_test.go | 1 - pkg/iac/types/string_test.go | 3 +-- pkg/k8s/scanner/scanner_test.go | 10 +++++----- pkg/k8s/writer_test.go | 3 +-- pkg/log/handler_test.go | 6 ++++-- pkg/plugin/index_test.go | 10 ++++++---- pkg/plugin/manager_test.go | 6 +++--- pkg/report/table/secret_test.go | 2 +- pkg/report/table/table_test.go | 2 +- pkg/result/filter_test.go | 4 ++-- pkg/sbom/cyclonedx/marshal_test.go | 6 +++--- pkg/sbom/cyclonedx/unmarshal_test.go | 8 ++++---- pkg/sbom/io/encode_test.go | 10 ++++++---- pkg/sbom/spdx/marshal_test.go | 6 +++--- pkg/sbom/spdx/unmarshal_test.go | 4 ++-- pkg/scanner/scan_test.go | 2 +- pkg/vex/vex_test.go | 5 ++--- 222 files changed, 633 insertions(+), 623 deletions(-) mode change 100755 => 100644 pkg/iac/types/bool_test.go mode change 100755 => 100644 pkg/iac/types/string_test.go diff --git a/.golangci.yaml b/.golangci.yaml index 7895c84580aa..e75f77576235 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -107,10 +107,8 @@ issues: - path: ".*_test.go$" linters: - bodyclose - - gci - gocritic - goconst - - gofmt - gosec - govet - ineffassign diff --git a/pkg/cloud/aws/commands/run_test.go b/pkg/cloud/aws/commands/run_test.go index 05c88560d1bf..58124cb4905a 100644 --- a/pkg/cloud/aws/commands/run_test.go +++ b/pkg/cloud/aws/commands/run_test.go @@ -8,12 +8,11 @@ import ( "testing" "time" - "github.com/aquasecurity/trivy/pkg/clock" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/compliance/spec" "github.com/aquasecurity/trivy/pkg/flag" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" diff --git a/pkg/cloud/report/service_test.go b/pkg/cloud/report/service_test.go index 12c998e23913..8e35bb0194e2 100644 --- a/pkg/cloud/report/service_test.go +++ b/pkg/cloud/report/service_test.go @@ -6,13 +6,12 @@ import ( "testing" "time" - "github.com/aquasecurity/trivy/pkg/clock" - "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/aquasecurity/trivy-db/pkg/types" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/flag" "github.com/aquasecurity/trivy/pkg/iac/scan" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" diff --git a/pkg/dependency/id_test.go b/pkg/dependency/id_test.go index 173d71c3d726..68e380e6c651 100644 --- a/pkg/dependency/id_test.go +++ b/pkg/dependency/id_test.go @@ -1,10 +1,12 @@ package dependency_test import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/dependency" "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/stretchr/testify/assert" - "testing" ) func TestID(t *testing.T) { diff --git a/pkg/dependency/parser/gradle/lockfile/parse_test.go b/pkg/dependency/parser/gradle/lockfile/parse_test.go index fa73ea81122e..2ffcc11b390c 100644 --- a/pkg/dependency/parser/gradle/lockfile/parse_test.go +++ b/pkg/dependency/parser/gradle/lockfile/parse_test.go @@ -5,8 +5,9 @@ import ( "sort" "testing" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/stretchr/testify/assert" + + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) func TestParser_Parse(t *testing.T) { diff --git a/pkg/dependency/parser/hex/mix/parse_test.go b/pkg/dependency/parser/hex/mix/parse_test.go index a46f35f8d158..38937b8e9fae 100644 --- a/pkg/dependency/parser/hex/mix/parse_test.go +++ b/pkg/dependency/parser/hex/mix/parse_test.go @@ -5,8 +5,9 @@ import ( "sort" "testing" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/stretchr/testify/assert" + + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) func TestParser_Parse(t *testing.T) { diff --git a/pkg/dependency/parser/java/jar/parse_test.go b/pkg/dependency/parser/java/jar/parse_test.go index 6813349e9754..ccf1adc9f73d 100644 --- a/pkg/dependency/parser/java/jar/parse_test.go +++ b/pkg/dependency/parser/java/jar/parse_test.go @@ -2,7 +2,6 @@ package jar_test import ( "encoding/json" - "github.com/aquasecurity/trivy/pkg/dependency/parser/java/jar/sonatype" "net/http" "net/http/httptest" "os" @@ -14,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/aquasecurity/trivy/pkg/dependency/parser/java/jar" + "github.com/aquasecurity/trivy/pkg/dependency/parser/java/jar/sonatype" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) diff --git a/pkg/dependency/parser/php/composer/parse_test.go b/pkg/dependency/parser/php/composer/parse_test.go index 726ac4676b37..58e19982720d 100644 --- a/pkg/dependency/parser/php/composer/parse_test.go +++ b/pkg/dependency/parser/php/composer/parse_test.go @@ -1,11 +1,13 @@ package composer import ( - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "os" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) var ( diff --git a/pkg/dependency/parser/swift/cocoapods/parse_test.go b/pkg/dependency/parser/swift/cocoapods/parse_test.go index f81b81929654..c6bf397529c4 100644 --- a/pkg/dependency/parser/swift/cocoapods/parse_test.go +++ b/pkg/dependency/parser/swift/cocoapods/parse_test.go @@ -4,10 +4,11 @@ import ( "os" "testing" - "github.com/aquasecurity/trivy/pkg/dependency/parser/swift/cocoapods" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/dependency/parser/swift/cocoapods" + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) func TestParse(t *testing.T) { diff --git a/pkg/dependency/parser/swift/swift/parse_test.go b/pkg/dependency/parser/swift/swift/parse_test.go index cd90d26fc6e4..777b8eeec508 100644 --- a/pkg/dependency/parser/swift/swift/parse_test.go +++ b/pkg/dependency/parser/swift/swift/parse_test.go @@ -1,10 +1,12 @@ package swift import ( - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/stretchr/testify/assert" "os" "testing" + + "github.com/stretchr/testify/assert" + + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) func TestParser_Parse(t *testing.T) { diff --git a/pkg/dependency/parser/utils/utils_test.go b/pkg/dependency/parser/utils/utils_test.go index ed5d84135c19..0610fee0ff38 100644 --- a/pkg/dependency/parser/utils/utils_test.go +++ b/pkg/dependency/parser/utils/utils_test.go @@ -1,9 +1,11 @@ package utils import ( - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" + + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" ) func TestUniqueLibraries(t *testing.T) { diff --git a/pkg/detector/ospkg/alma/alma_test.go b/pkg/detector/ospkg/alma/alma_test.go index cd7a318d8f10..cb81a1cd3d52 100644 --- a/pkg/detector/ospkg/alma/alma_test.go +++ b/pkg/detector/ospkg/alma/alma_test.go @@ -2,19 +2,20 @@ package alma_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/alma" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/alpine/alpine_test.go b/pkg/detector/ospkg/alpine/alpine_test.go index eba7258e1392..6bce43cc248e 100644 --- a/pkg/detector/ospkg/alpine/alpine_test.go +++ b/pkg/detector/ospkg/alpine/alpine_test.go @@ -6,6 +6,9 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" @@ -14,8 +17,6 @@ import ( "github.com/aquasecurity/trivy/pkg/detector/ospkg/alpine" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/amazon/amazon_test.go b/pkg/detector/ospkg/amazon/amazon_test.go index 83100e98c72c..c939e025893f 100644 --- a/pkg/detector/ospkg/amazon/amazon_test.go +++ b/pkg/detector/ospkg/amazon/amazon_test.go @@ -2,19 +2,20 @@ package amazon_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/amazon" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/debian/debian_test.go b/pkg/detector/ospkg/debian/debian_test.go index 2f5c2b3595ab..6382b97429a4 100644 --- a/pkg/detector/ospkg/debian/debian_test.go +++ b/pkg/detector/ospkg/debian/debian_test.go @@ -2,20 +2,21 @@ package debian_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "sort" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/debian" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/oracle/oracle_test.go b/pkg/detector/ospkg/oracle/oracle_test.go index 8dd3dfc8900f..0b7d00f661a5 100644 --- a/pkg/detector/ospkg/oracle/oracle_test.go +++ b/pkg/detector/ospkg/oracle/oracle_test.go @@ -2,18 +2,19 @@ package oracle import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_IsSupportedVersion(t *testing.T) { diff --git a/pkg/detector/ospkg/photon/photon_test.go b/pkg/detector/ospkg/photon/photon_test.go index a85957f6c516..4c48437e8bd6 100644 --- a/pkg/detector/ospkg/photon/photon_test.go +++ b/pkg/detector/ospkg/photon/photon_test.go @@ -2,19 +2,20 @@ package photon_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/photon" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/redhat/redhat_test.go b/pkg/detector/ospkg/redhat/redhat_test.go index fe24220490a8..17a6a8768554 100644 --- a/pkg/detector/ospkg/redhat/redhat_test.go +++ b/pkg/detector/ospkg/redhat/redhat_test.go @@ -2,20 +2,21 @@ package redhat_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "os" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/redhat" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestMain(m *testing.M) { diff --git a/pkg/detector/ospkg/rocky/rocky_test.go b/pkg/detector/ospkg/rocky/rocky_test.go index 91250aa73776..2cce3969ed87 100644 --- a/pkg/detector/ospkg/rocky/rocky_test.go +++ b/pkg/detector/ospkg/rocky/rocky_test.go @@ -2,19 +2,20 @@ package rocky_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/rocky" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/suse/suse_test.go b/pkg/detector/ospkg/suse/suse_test.go index eb3e7d9673b4..03689d7ba1e7 100644 --- a/pkg/detector/ospkg/suse/suse_test.go +++ b/pkg/detector/ospkg/suse/suse_test.go @@ -2,19 +2,20 @@ package suse_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/suse" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/detector/ospkg/ubuntu/ubuntu_test.go b/pkg/detector/ospkg/ubuntu/ubuntu_test.go index a95c48bb24ee..a63f034ed4af 100644 --- a/pkg/detector/ospkg/ubuntu/ubuntu_test.go +++ b/pkg/detector/ospkg/ubuntu/ubuntu_test.go @@ -2,20 +2,21 @@ package ubuntu_test import ( "context" - "github.com/aquasecurity/trivy/pkg/clock" "sort" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy-db/pkg/db" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/dbtest" "github.com/aquasecurity/trivy/pkg/detector/ospkg/ubuntu" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestScanner_Detect(t *testing.T) { diff --git a/pkg/fanal/analyzer/analyzer_test.go b/pkg/fanal/analyzer/analyzer_test.go index 1aa2eab607e6..671c1050837f 100644 --- a/pkg/fanal/analyzer/analyzer_test.go +++ b/pkg/fanal/analyzer/analyzer_test.go @@ -3,11 +3,11 @@ package analyzer_test import ( "context" "fmt" - "github.com/google/go-containerregistry/pkg/name" "os" "sync" "testing" + "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sync/semaphore" diff --git a/pkg/fanal/analyzer/language/conda/environment/environment_test.go b/pkg/fanal/analyzer/language/conda/environment/environment_test.go index c9610289584e..044585f14683 100644 --- a/pkg/fanal/analyzer/language/conda/environment/environment_test.go +++ b/pkg/fanal/analyzer/language/conda/environment/environment_test.go @@ -2,12 +2,14 @@ package environment import ( "context" - "github.com/aquasecurity/trivy/pkg/fanal/analyzer" - "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "os" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/fanal/analyzer" + "github.com/aquasecurity/trivy/pkg/fanal/types" ) func Test_environmentAnalyzer_Analyze(t *testing.T) { diff --git a/pkg/fanal/analyzer/language/java/gradle/pom_test.go b/pkg/fanal/analyzer/language/java/gradle/pom_test.go index 4ca85c647e2e..90591e96d66a 100644 --- a/pkg/fanal/analyzer/language/java/gradle/pom_test.go +++ b/pkg/fanal/analyzer/language/java/gradle/pom_test.go @@ -1,10 +1,11 @@ package gradle import ( - "github.com/stretchr/testify/require" "os" "path/filepath" "testing" + + "github.com/stretchr/testify/require" ) func Test_parsePom(t *testing.T) { diff --git a/pkg/fanal/analyzer/language/java/jar/jar_test.go b/pkg/fanal/analyzer/language/java/jar/jar_test.go index d1cf6ab1f491..4d8eb95ffe9f 100644 --- a/pkg/fanal/analyzer/language/java/jar/jar_test.go +++ b/pkg/fanal/analyzer/language/java/jar/jar_test.go @@ -2,13 +2,13 @@ package jar import ( "context" - "github.com/google/go-containerregistry/pkg/name" - "github.com/stretchr/testify/require" "os" "path/filepath" "testing" + "github.com/google/go-containerregistry/pkg/name" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/aquasecurity/trivy/pkg/fanal/analyzer" "github.com/aquasecurity/trivy/pkg/fanal/types" diff --git a/pkg/fanal/analyzer/language/julia/pkg/pkg_test.go b/pkg/fanal/analyzer/language/julia/pkg/pkg_test.go index 8e96e0574d93..c984c21281b2 100644 --- a/pkg/fanal/analyzer/language/julia/pkg/pkg_test.go +++ b/pkg/fanal/analyzer/language/julia/pkg/pkg_test.go @@ -5,10 +5,11 @@ import ( "os" "testing" - "github.com/aquasecurity/trivy/pkg/fanal/analyzer" - "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/fanal/analyzer" + "github.com/aquasecurity/trivy/pkg/fanal/types" ) func Test_juliaAnalyzer_Analyze(t *testing.T) { diff --git a/pkg/fanal/analyzer/pkg/rpm/rpm_test.go b/pkg/fanal/analyzer/pkg/rpm/rpm_test.go index 7c1ec8ca77c8..53141e1ad03d 100644 --- a/pkg/fanal/analyzer/pkg/rpm/rpm_test.go +++ b/pkg/fanal/analyzer/pkg/rpm/rpm_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "github.com/aquasecurity/trivy/pkg/fanal/analyzer" - "github.com/aquasecurity/trivy/pkg/fanal/types" rpmdb "github.com/knqyf263/go-rpmdb/pkg" "github.com/samber/lo" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/fanal/analyzer" + "github.com/aquasecurity/trivy/pkg/fanal/types" ) type mockRPMDB struct { diff --git a/pkg/fanal/analyzer/sbom/sbom_test.go b/pkg/fanal/analyzer/sbom/sbom_test.go index c1c09b24a5bc..cce12a7c4955 100644 --- a/pkg/fanal/analyzer/sbom/sbom_test.go +++ b/pkg/fanal/analyzer/sbom/sbom_test.go @@ -2,10 +2,10 @@ package sbom import ( "context" - "github.com/package-url/packageurl-go" "os" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/fanal/applier/applier_test.go b/pkg/fanal/applier/applier_test.go index 8ba2b3f1eb95..ac8915f2dad6 100644 --- a/pkg/fanal/applier/applier_test.go +++ b/pkg/fanal/applier/applier_test.go @@ -1,10 +1,10 @@ package applier_test import ( - "github.com/package-url/packageurl-go" "sort" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/fanal/artifact/image/remote_sbom_test.go b/pkg/fanal/artifact/image/remote_sbom_test.go index 2b58d2fdb8a3..1fd29fe2c69a 100644 --- a/pkg/fanal/artifact/image/remote_sbom_test.go +++ b/pkg/fanal/artifact/image/remote_sbom_test.go @@ -2,7 +2,6 @@ package image_test import ( "context" - "github.com/package-url/packageurl-go" "net/http" "net/http/httptest" "net/url" @@ -11,6 +10,7 @@ import ( v1 "github.com/google/go-containerregistry/pkg/v1" fakei "github.com/google/go-containerregistry/pkg/v1/fake" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/fanal/artifact/local/fs_test.go b/pkg/fanal/artifact/local/fs_test.go index 3bbb9d2c3b79..5b45107a8785 100644 --- a/pkg/fanal/artifact/local/fs_test.go +++ b/pkg/fanal/artifact/local/fs_test.go @@ -3,18 +3,19 @@ package local import ( "context" "errors" - "github.com/aquasecurity/trivy/pkg/fanal/walker" "os" "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/fanal/analyzer" "github.com/aquasecurity/trivy/pkg/fanal/artifact" "github.com/aquasecurity/trivy/pkg/fanal/cache" "github.com/aquasecurity/trivy/pkg/fanal/types" + "github.com/aquasecurity/trivy/pkg/fanal/walker" "github.com/aquasecurity/trivy/pkg/misconf" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config/all" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/python/pip" diff --git a/pkg/fanal/artifact/repo/git_test.go b/pkg/fanal/artifact/repo/git_test.go index 06dab92fb318..d451411c28f6 100644 --- a/pkg/fanal/artifact/repo/git_test.go +++ b/pkg/fanal/artifact/repo/git_test.go @@ -11,11 +11,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config/all" - _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/secret" "github.com/aquasecurity/trivy/pkg/fanal/artifact" "github.com/aquasecurity/trivy/pkg/fanal/cache" "github.com/aquasecurity/trivy/pkg/fanal/walker" + + _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config/all" + _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/secret" ) func setupGitServer() (*httptest.Server, error) { diff --git a/pkg/fanal/artifact/sbom/sbom_test.go b/pkg/fanal/artifact/sbom/sbom_test.go index d7af10196a1c..37ea39380b43 100644 --- a/pkg/fanal/artifact/sbom/sbom_test.go +++ b/pkg/fanal/artifact/sbom/sbom_test.go @@ -3,11 +3,11 @@ package sbom_test import ( "context" "errors" - "github.com/package-url/packageurl-go" "path/filepath" "strings" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/fanal/cache/key_test.go b/pkg/fanal/cache/key_test.go index f21910b275ae..b5c88c84e182 100644 --- a/pkg/fanal/cache/key_test.go +++ b/pkg/fanal/cache/key_test.go @@ -1,7 +1,6 @@ package cache import ( - "github.com/aquasecurity/trivy/pkg/fanal/walker" "testing" "github.com/stretchr/testify/assert" @@ -9,6 +8,7 @@ import ( "github.com/aquasecurity/trivy/pkg/fanal/analyzer" "github.com/aquasecurity/trivy/pkg/fanal/artifact" + "github.com/aquasecurity/trivy/pkg/fanal/walker" "github.com/aquasecurity/trivy/pkg/misconf" ) diff --git a/pkg/fanal/handler/unpackaged/unpackaged_test.go b/pkg/fanal/handler/unpackaged/unpackaged_test.go index be2ddd116151..e6edc62ae165 100644 --- a/pkg/fanal/handler/unpackaged/unpackaged_test.go +++ b/pkg/fanal/handler/unpackaged/unpackaged_test.go @@ -2,9 +2,9 @@ package unpackaged_test import ( "context" - "github.com/package-url/packageurl-go" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/fanal/secret/scanner_test.go b/pkg/fanal/secret/scanner_test.go index 0d23f9959e24..d152591cb2ca 100644 --- a/pkg/fanal/secret/scanner_test.go +++ b/pkg/fanal/secret/scanner_test.go @@ -6,11 +6,12 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/fanal/secret" "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestMain(m *testing.M) { diff --git a/pkg/fanal/walker/fs_test.go b/pkg/fanal/walker/fs_test.go index 7af5b52020f8..aac38a95d8de 100644 --- a/pkg/fanal/walker/fs_test.go +++ b/pkg/fanal/walker/fs_test.go @@ -2,7 +2,6 @@ package walker_test import ( "errors" - "golang.org/x/exp/slices" "io" "os" "path/filepath" @@ -12,6 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "golang.org/x/exp/slices" "github.com/aquasecurity/trivy/pkg/fanal/analyzer" "github.com/aquasecurity/trivy/pkg/fanal/walker" diff --git a/pkg/fanal/walker/walk_test.go b/pkg/fanal/walker/walk_test.go index 765f5c07d7b3..82f71c875b81 100644 --- a/pkg/fanal/walker/walk_test.go +++ b/pkg/fanal/walker/walk_test.go @@ -2,11 +2,12 @@ package walker_test import ( "fmt" - "github.com/aquasecurity/trivy/pkg/fanal/walker" "path/filepath" "testing" "github.com/stretchr/testify/assert" + + "github.com/aquasecurity/trivy/pkg/fanal/walker" ) func TestSkipFile(t *testing.T) { diff --git a/pkg/flag/db_flags_test.go b/pkg/flag/db_flags_test.go index 5d121033fd3b..8a9960f91c24 100644 --- a/pkg/flag/db_flags_test.go +++ b/pkg/flag/db_flags_test.go @@ -1,14 +1,15 @@ package flag_test import ( - "github.com/aquasecurity/trivy/pkg/log" - "github.com/google/go-containerregistry/pkg/name" "testing" - "github.com/aquasecurity/trivy/pkg/flag" + "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/flag" + "github.com/aquasecurity/trivy/pkg/log" ) func TestDBFlagGroup_ToOptions(t *testing.T) { diff --git a/pkg/flag/options_test.go b/pkg/flag/options_test.go index 7827b4303b7d..2c5d5d0a4348 100644 --- a/pkg/flag/options_test.go +++ b/pkg/flag/options_test.go @@ -2,17 +2,18 @@ package flag_test import ( "bytes" - "github.com/aquasecurity/trivy/pkg/flag" - "github.com/aquasecurity/trivy/pkg/log" - "github.com/aquasecurity/trivy/pkg/types" - "github.com/samber/lo" - "github.com/spf13/cobra" - "github.com/stretchr/testify/require" "log/slog" "strings" "testing" + "github.com/samber/lo" + "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/flag" + "github.com/aquasecurity/trivy/pkg/log" + "github.com/aquasecurity/trivy/pkg/types" ) func TestFlag_Parse(t *testing.T) { diff --git a/pkg/flag/remote_flags_test.go b/pkg/flag/remote_flags_test.go index d6a7a95387db..844831093ba8 100644 --- a/pkg/flag/remote_flags_test.go +++ b/pkg/flag/remote_flags_test.go @@ -1,14 +1,15 @@ package flag_test import ( - "github.com/aquasecurity/trivy/pkg/log" - "github.com/stretchr/testify/require" "net/http" "testing" - "github.com/aquasecurity/trivy/pkg/flag" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/flag" + "github.com/aquasecurity/trivy/pkg/log" ) func TestRemoteFlagGroup_ToOptions(t *testing.T) { diff --git a/pkg/flag/report_flags_test.go b/pkg/flag/report_flags_test.go index 37ba3c81b84f..fa8b423fef25 100644 --- a/pkg/flag/report_flags_test.go +++ b/pkg/flag/report_flags_test.go @@ -1,16 +1,17 @@ package flag_test import ( - "github.com/aquasecurity/trivy/pkg/log" "testing" + "github.com/spf13/viper" + "github.com/stretchr/testify/assert" + dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy/pkg/compliance/spec" "github.com/aquasecurity/trivy/pkg/flag" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" + "github.com/aquasecurity/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/types" - "github.com/spf13/viper" - "github.com/stretchr/testify/assert" ) func TestReportFlagGroup_ToOptions(t *testing.T) { diff --git a/pkg/flag/scan_flags_test.go b/pkg/flag/scan_flags_test.go index 2d5cb718b0d1..d3ad792ae948 100644 --- a/pkg/flag/scan_flags_test.go +++ b/pkg/flag/scan_flags_test.go @@ -1,9 +1,9 @@ package flag_test import ( - "github.com/spf13/viper" "testing" + "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/flag/vulnerability_flags_test.go b/pkg/flag/vulnerability_flags_test.go index 4f4490753aff..a1bcd90b3473 100644 --- a/pkg/flag/vulnerability_flags_test.go +++ b/pkg/flag/vulnerability_flags_test.go @@ -1,14 +1,15 @@ package flag_test import ( - "github.com/aquasecurity/trivy/pkg/log" - "github.com/stretchr/testify/require" "testing" - "github.com/aquasecurity/trivy/pkg/flag" - "github.com/aquasecurity/trivy/pkg/types" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/flag" + "github.com/aquasecurity/trivy/pkg/log" + "github.com/aquasecurity/trivy/pkg/types" ) func TestVulnerabilityFlagGroup_ToOptions(t *testing.T) { diff --git a/pkg/iac/adapters/arm/compute/adapt_test.go b/pkg/iac/adapters/arm/compute/adapt_test.go index 8763a0aac28a..819f79993e5e 100644 --- a/pkg/iac/adapters/arm/compute/adapt_test.go +++ b/pkg/iac/adapters/arm/compute/adapt_test.go @@ -3,11 +3,11 @@ package compute import ( "testing" - azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" - "github.com/aquasecurity/trivy/pkg/iac/types" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + + azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_AdaptLinuxVM(t *testing.T) { diff --git a/pkg/iac/adapters/arm/storage/adapt_test.go b/pkg/iac/adapters/arm/storage/adapt_test.go index 9d8d2f0f1cbb..ae2e497580bb 100644 --- a/pkg/iac/adapters/arm/storage/adapt_test.go +++ b/pkg/iac/adapters/arm/storage/adapt_test.go @@ -3,12 +3,11 @@ package storage import ( "testing" - azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" "github.com/aquasecurity/trivy/pkg/iac/types" - - "github.com/stretchr/testify/require" ) func Test_AdaptStorageDefaults(t *testing.T) { diff --git a/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go b/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go index cb3e4b6b4b8d..6bcd0a4952dd 100644 --- a/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go +++ b/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go @@ -3,11 +3,12 @@ package ecr import ( "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/liamg/iamgo" ) func TestAdapt(t *testing.T) { diff --git a/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go b/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go index 3e548dec0cf7..1ea6a099a698 100644 --- a/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go +++ b/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go @@ -3,10 +3,11 @@ package iam import ( "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/liamg/iamgo" ) func TestAdapt(t *testing.T) { diff --git a/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go b/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go index ec2fed201ea6..1d9586775044 100644 --- a/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go +++ b/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go @@ -3,11 +3,12 @@ package sam import ( "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/liamg/iamgo" ) func TestAdapt(t *testing.T) { diff --git a/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go b/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go index 8abeff2aca3e..5e7fe278fcad 100644 --- a/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go +++ b/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go @@ -3,11 +3,12 @@ package sqs import ( "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/liamg/iamgo" ) func TestAdapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/apigateway/adapt_test.go b/pkg/iac/adapters/terraform/aws/apigateway/adapt_test.go index 92d96f396e9c..65393ae82f82 100644 --- a/pkg/iac/adapters/terraform/aws/apigateway/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/apigateway/adapt_test.go @@ -3,14 +3,15 @@ package apigateway import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway" v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1" v2 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v2" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/athena/adapt_test.go b/pkg/iac/adapters/terraform/aws/athena/adapt_test.go index e734b024b274..274167e71599 100644 --- a/pkg/iac/adapters/terraform/aws/athena/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/athena/adapt_test.go @@ -3,14 +3,13 @@ package athena import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDatabase(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/cloudfront/adapt_test.go b/pkg/iac/adapters/terraform/aws/cloudfront/adapt_test.go index eade38048204..d20520cd4651 100644 --- a/pkg/iac/adapters/terraform/aws/cloudfront/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/cloudfront/adapt_test.go @@ -3,14 +3,13 @@ package cloudfront import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDistribution(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/cloudtrail/adapt_test.go b/pkg/iac/adapters/terraform/aws/cloudtrail/adapt_test.go index 9088b115752e..f79664d0b7de 100644 --- a/pkg/iac/adapters/terraform/aws/cloudtrail/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/cloudtrail/adapt_test.go @@ -3,14 +3,13 @@ package cloudtrail import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptTrail(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/cloudwatch/adapt_test.go b/pkg/iac/adapters/terraform/aws/cloudwatch/adapt_test.go index 5febcd592dfe..86a484aecce6 100644 --- a/pkg/iac/adapters/terraform/aws/cloudwatch/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/cloudwatch/adapt_test.go @@ -3,14 +3,13 @@ package cloudwatch import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptLogGroups(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/codebuild/adapt_test.go b/pkg/iac/adapters/terraform/aws/codebuild/adapt_test.go index 58aeca7df9d1..c53a509606dc 100644 --- a/pkg/iac/adapters/terraform/aws/codebuild/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/codebuild/adapt_test.go @@ -3,14 +3,13 @@ package codebuild import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/codebuild" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptProject(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/config/adapt_test.go b/pkg/iac/adapters/terraform/aws/config/adapt_test.go index 94917b430fbe..74cf720caa10 100644 --- a/pkg/iac/adapters/terraform/aws/config/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/config/adapt_test.go @@ -3,13 +3,12 @@ package config import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/config" - - "github.com/stretchr/testify/assert" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptConfigurationAggregrator(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/documentdb/adapt_test.go b/pkg/iac/adapters/terraform/aws/documentdb/adapt_test.go index db7dbd7937e8..76ea0a8e3103 100644 --- a/pkg/iac/adapters/terraform/aws/documentdb/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/documentdb/adapt_test.go @@ -3,14 +3,13 @@ package documentdb import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go b/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go index 3ebd86b70199..72f6e8ed4ac2 100644 --- a/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go @@ -3,14 +3,13 @@ package dynamodb import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ec2/adapt_test.go b/pkg/iac/adapters/terraform/aws/ec2/adapt_test.go index e539b3f827dc..665852321db4 100644 --- a/pkg/iac/adapters/terraform/aws/ec2/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/ec2/adapt_test.go @@ -3,14 +3,13 @@ package ec2 import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ec2/autoscaling_test.go b/pkg/iac/adapters/terraform/aws/ec2/autoscaling_test.go index a6437340aad4..25efdbe70993 100644 --- a/pkg/iac/adapters/terraform/aws/ec2/autoscaling_test.go +++ b/pkg/iac/adapters/terraform/aws/ec2/autoscaling_test.go @@ -3,14 +3,13 @@ package ec2 import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_AdaptAutoscaling(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ec2/subnet_test.go b/pkg/iac/adapters/terraform/aws/ec2/subnet_test.go index cbc080d939dc..c371ef4f504f 100644 --- a/pkg/iac/adapters/terraform/aws/ec2/subnet_test.go +++ b/pkg/iac/adapters/terraform/aws/ec2/subnet_test.go @@ -3,14 +3,13 @@ package ec2 import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptSubnet(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ec2/volume_test.go b/pkg/iac/adapters/terraform/aws/ec2/volume_test.go index e7d260eae3e4..c48955ca7d0b 100644 --- a/pkg/iac/adapters/terraform/aws/ec2/volume_test.go +++ b/pkg/iac/adapters/terraform/aws/ec2/volume_test.go @@ -3,14 +3,13 @@ package ec2 import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptVolume(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ec2/vpc_test.go b/pkg/iac/adapters/terraform/aws/ec2/vpc_test.go index ab372f8f1084..72005e5b8559 100644 --- a/pkg/iac/adapters/terraform/aws/ec2/vpc_test.go +++ b/pkg/iac/adapters/terraform/aws/ec2/vpc_test.go @@ -3,14 +3,13 @@ package ec2 import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_AdaptVPC(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go b/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go index 746adf8eacad..f2fb4d3dc9c9 100644 --- a/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go @@ -3,16 +3,15 @@ package ecr import ( "testing" + "github.com/liamg/iamgo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" - - "github.com/liamg/iamgo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptRepository(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ecs/adapt_test.go b/pkg/iac/adapters/terraform/aws/ecs/adapt_test.go index d7c0033cefba..c35bcc12d9b1 100644 --- a/pkg/iac/adapters/terraform/aws/ecs/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/ecs/adapt_test.go @@ -3,14 +3,13 @@ package ecs import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecs" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptClusterSettings(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/efs/adapt_test.go b/pkg/iac/adapters/terraform/aws/efs/adapt_test.go index b5516fe97771..481391c342af 100644 --- a/pkg/iac/adapters/terraform/aws/efs/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/efs/adapt_test.go @@ -3,14 +3,13 @@ package efs import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/efs" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptFileSystem(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/eks/adapt_test.go b/pkg/iac/adapters/terraform/aws/eks/adapt_test.go index 7b466d4a5e0c..bdbfc48d0d84 100644 --- a/pkg/iac/adapters/terraform/aws/eks/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/eks/adapt_test.go @@ -3,14 +3,13 @@ package eks import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/eks" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/elasticache/adapt_test.go b/pkg/iac/adapters/terraform/aws/elasticache/adapt_test.go index 62ee9a6bac08..4caf04afcd11 100644 --- a/pkg/iac/adapters/terraform/aws/elasticache/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/elasticache/adapt_test.go @@ -3,14 +3,13 @@ package elasticache import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticache" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/elasticsearch/adapt_test.go b/pkg/iac/adapters/terraform/aws/elasticsearch/adapt_test.go index 83e7f87d9ae5..8384b63fa561 100644 --- a/pkg/iac/adapters/terraform/aws/elasticsearch/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/elasticsearch/adapt_test.go @@ -3,14 +3,13 @@ package elasticsearch import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/elasticsearch" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDomain(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/elb/adapt_test.go b/pkg/iac/adapters/terraform/aws/elb/adapt_test.go index b938ce563106..f06682d402c7 100644 --- a/pkg/iac/adapters/terraform/aws/elb/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/elb/adapt_test.go @@ -3,14 +3,13 @@ package elb import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/elb" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/emr/adapt_test.go b/pkg/iac/adapters/terraform/aws/emr/adapt_test.go index 5b0e43f4186a..726c8862e0fb 100644 --- a/pkg/iac/adapters/terraform/aws/emr/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/emr/adapt_test.go @@ -3,13 +3,13 @@ package emr import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/emr" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptSecurityConfiguration(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/iam/adapt_test.go b/pkg/iac/adapters/terraform/aws/iam/adapt_test.go index 66387056736c..6da793915155 100644 --- a/pkg/iac/adapters/terraform/aws/iam/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/adapt_test.go @@ -3,9 +3,10 @@ package iam import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/iam/groups_test.go b/pkg/iac/adapters/terraform/aws/iam/groups_test.go index f522130b30d2..9ac6be72c46d 100644 --- a/pkg/iac/adapters/terraform/aws/iam/groups_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/groups_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptGroups(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/iam/passwords_test.go b/pkg/iac/adapters/terraform/aws/iam/passwords_test.go index ca94ce305147..11ca16c0dcdd 100644 --- a/pkg/iac/adapters/terraform/aws/iam/passwords_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/passwords_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptPasswordPolicy(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/iam/policies_test.go b/pkg/iac/adapters/terraform/aws/iam/policies_test.go index aa6b9f9b59f5..a1e989c06979 100644 --- a/pkg/iac/adapters/terraform/aws/iam/policies_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/policies_test.go @@ -3,12 +3,12 @@ package iam import ( "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" - "github.com/liamg/iamgo" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func defaultPolicyDocuemnt(offset bool) iam.Document { diff --git a/pkg/iac/adapters/terraform/aws/iam/roles_test.go b/pkg/iac/adapters/terraform/aws/iam/roles_test.go index 61dfc1facb08..93bc5a9e8168 100644 --- a/pkg/iac/adapters/terraform/aws/iam/roles_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/roles_test.go @@ -4,11 +4,12 @@ import ( "sort" "testing" + "github.com/liamg/iamgo" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/liamg/iamgo" ) func Test_adaptRoles(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/kinesis/adapt_test.go b/pkg/iac/adapters/terraform/aws/kinesis/adapt_test.go index c1138d2f7748..c0d1a50b53e9 100644 --- a/pkg/iac/adapters/terraform/aws/kinesis/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/kinesis/adapt_test.go @@ -3,14 +3,13 @@ package kinesis import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/kinesis" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptStream(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/kms/adapt_test.go b/pkg/iac/adapters/terraform/aws/kms/adapt_test.go index 721d0ee19d66..bc86f3366af9 100644 --- a/pkg/iac/adapters/terraform/aws/kms/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/kms/adapt_test.go @@ -3,14 +3,13 @@ package kms import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/kms" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptKey(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/lambda/adapt_test.go b/pkg/iac/adapters/terraform/aws/lambda/adapt_test.go index 8ec555c7d90f..c0e58104819d 100644 --- a/pkg/iac/adapters/terraform/aws/lambda/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/lambda/adapt_test.go @@ -3,13 +3,13 @@ package lambda import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/lambda" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/mq/adapt_test.go b/pkg/iac/adapters/terraform/aws/mq/adapt_test.go index fe8d77432b62..e581cf43be24 100644 --- a/pkg/iac/adapters/terraform/aws/mq/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/mq/adapt_test.go @@ -3,14 +3,13 @@ package mq import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/mq" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptBroker(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/msk/adapt_test.go b/pkg/iac/adapters/terraform/aws/msk/adapt_test.go index dae131487b4f..6157655dbfed 100644 --- a/pkg/iac/adapters/terraform/aws/msk/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/msk/adapt_test.go @@ -3,14 +3,13 @@ package msk import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/msk" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/neptune/adapt_test.go b/pkg/iac/adapters/terraform/aws/neptune/adapt_test.go index 5ad4f3de82ad..7e67e51e394c 100644 --- a/pkg/iac/adapters/terraform/aws/neptune/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/neptune/adapt_test.go @@ -3,14 +3,13 @@ package neptune import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/neptune" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/rds/adapt_test.go b/pkg/iac/adapters/terraform/aws/rds/adapt_test.go index 3776e4c4ad48..76f045faf288 100644 --- a/pkg/iac/adapters/terraform/aws/rds/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/rds/adapt_test.go @@ -3,13 +3,13 @@ package rds import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/redshift/adapt_test.go b/pkg/iac/adapters/terraform/aws/redshift/adapt_test.go index e52db1c2256b..6c07f83b3363 100644 --- a/pkg/iac/adapters/terraform/aws/redshift/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/redshift/adapt_test.go @@ -4,13 +4,13 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/redshift" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/s3/adapt_test.go b/pkg/iac/adapters/terraform/aws/s3/adapt_test.go index b17a00391b34..1cd1dec76270 100644 --- a/pkg/iac/adapters/terraform/aws/s3/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/s3/adapt_test.go @@ -3,15 +3,15 @@ package s3 import ( "testing" + "github.com/liamg/iamgo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3" - "github.com/liamg/iamgo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_PublicAccessBlock(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/s3/bucket_test.go b/pkg/iac/adapters/terraform/aws/s3/bucket_test.go index 84c0ddc60ecd..aeaca3d5a4c9 100644 --- a/pkg/iac/adapters/terraform/aws/s3/bucket_test.go +++ b/pkg/iac/adapters/terraform/aws/s3/bucket_test.go @@ -3,10 +3,10 @@ package s3 import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func Test_GetBuckets(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/sns/adapt_test.go b/pkg/iac/adapters/terraform/aws/sns/adapt_test.go index caae71b2dc17..377a918b67ae 100644 --- a/pkg/iac/adapters/terraform/aws/sns/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/sns/adapt_test.go @@ -3,14 +3,13 @@ package sns import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sns" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptTopic(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go b/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go index dc95257d258e..0a4726140456 100644 --- a/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go @@ -3,16 +3,15 @@ package sqs import ( "testing" + "github.com/liamg/iamgo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs" - - "github.com/liamg/iamgo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/ssm/adapt_test.go b/pkg/iac/adapters/terraform/aws/ssm/adapt_test.go index 67afec8a3941..c5cf726995fa 100644 --- a/pkg/iac/adapters/terraform/aws/ssm/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/ssm/adapt_test.go @@ -3,14 +3,13 @@ package ssm import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ssm" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/aws/workspaces/adapt_test.go b/pkg/iac/adapters/terraform/aws/workspaces/adapt_test.go index 457960128947..372124340c41 100644 --- a/pkg/iac/adapters/terraform/aws/workspaces/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/workspaces/adapt_test.go @@ -3,14 +3,13 @@ package workspaces import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/workspaces" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptWorkspace(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/appservice/adapt_test.go b/pkg/iac/adapters/terraform/azure/appservice/adapt_test.go index 94b6b7f13b77..28b468a3ba39 100644 --- a/pkg/iac/adapters/terraform/azure/appservice/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/appservice/adapt_test.go @@ -3,14 +3,13 @@ package appservice import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptService(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/authorization/adapt_test.go b/pkg/iac/adapters/terraform/azure/authorization/adapt_test.go index f1e211ec4f5f..3bd3b13fbdd5 100644 --- a/pkg/iac/adapters/terraform/azure/authorization/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/authorization/adapt_test.go @@ -3,14 +3,13 @@ package authorization import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/authorization" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptRoleDefinition(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/compute/adapt_test.go b/pkg/iac/adapters/terraform/azure/compute/adapt_test.go index 141b81ffecd6..9cafbc79aee5 100644 --- a/pkg/iac/adapters/terraform/azure/compute/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/compute/adapt_test.go @@ -3,14 +3,13 @@ package compute import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptManagedDisk(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/container/adapt_test.go b/pkg/iac/adapters/terraform/azure/container/adapt_test.go index 13d8c712a621..0bd5070c8395 100644 --- a/pkg/iac/adapters/terraform/azure/container/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/container/adapt_test.go @@ -3,14 +3,13 @@ package container import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/container" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptCluster(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/database/adapt_test.go b/pkg/iac/adapters/terraform/azure/database/adapt_test.go index 9616659b30e3..05dc61173d8e 100644 --- a/pkg/iac/adapters/terraform/azure/database/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/database/adapt_test.go @@ -3,13 +3,13 @@ package database import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/database" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/datafactory/adapt_test.go b/pkg/iac/adapters/terraform/azure/datafactory/adapt_test.go index cefe5709d42e..5a98977002d9 100644 --- a/pkg/iac/adapters/terraform/azure/datafactory/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/datafactory/adapt_test.go @@ -3,14 +3,13 @@ package datafactory import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/datafactory" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptFactory(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/datalake/adapt_test.go b/pkg/iac/adapters/terraform/azure/datalake/adapt_test.go index c1ca5410384f..c902787eb790 100644 --- a/pkg/iac/adapters/terraform/azure/datalake/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/datalake/adapt_test.go @@ -3,14 +3,13 @@ package datalake import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/datalake" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptStore(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/keyvault/adapt_test.go b/pkg/iac/adapters/terraform/azure/keyvault/adapt_test.go index b21d25b12c70..9c8f1ace0320 100644 --- a/pkg/iac/adapters/terraform/azure/keyvault/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/keyvault/adapt_test.go @@ -4,14 +4,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/keyvault" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/monitor/adapt_test.go b/pkg/iac/adapters/terraform/azure/monitor/adapt_test.go index a0cf262fca7c..d8b075a0d09c 100644 --- a/pkg/iac/adapters/terraform/azure/monitor/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/monitor/adapt_test.go @@ -3,14 +3,13 @@ package monitor import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/monitor" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptLogProfile(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/network/adapt_test.go b/pkg/iac/adapters/terraform/azure/network/adapt_test.go index a6abf380145c..15b966b06ffc 100644 --- a/pkg/iac/adapters/terraform/azure/network/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/network/adapt_test.go @@ -3,13 +3,13 @@ package network import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/network" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/securitycenter/adapt_test.go b/pkg/iac/adapters/terraform/azure/securitycenter/adapt_test.go index 3b61ebecf0b9..acd3760952c2 100644 --- a/pkg/iac/adapters/terraform/azure/securitycenter/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/securitycenter/adapt_test.go @@ -3,14 +3,13 @@ package securitycenter import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/securitycenter" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptContact(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/storage/adapt_test.go b/pkg/iac/adapters/terraform/azure/storage/adapt_test.go index 3b13c3c4df35..87ffb1a919f4 100644 --- a/pkg/iac/adapters/terraform/azure/storage/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/storage/adapt_test.go @@ -3,13 +3,13 @@ package storage import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/storage" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/azure/synapse/adapt_test.go b/pkg/iac/adapters/terraform/azure/synapse/adapt_test.go index 79062878e092..0b4cb3c0ea9e 100644 --- a/pkg/iac/adapters/terraform/azure/synapse/adapt_test.go +++ b/pkg/iac/adapters/terraform/azure/synapse/adapt_test.go @@ -3,14 +3,13 @@ package synapse import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/azure/synapse" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptWorkspace(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/cloudstack/compute/adapt_test.go b/pkg/iac/adapters/terraform/cloudstack/compute/adapt_test.go index 14576c13bbf8..d869947197ee 100644 --- a/pkg/iac/adapters/terraform/cloudstack/compute/adapt_test.go +++ b/pkg/iac/adapters/terraform/cloudstack/compute/adapt_test.go @@ -3,14 +3,13 @@ package compute import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/cloudstack/compute" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptInstance(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/digitalocean/compute/adapt_test.go b/pkg/iac/adapters/terraform/digitalocean/compute/adapt_test.go index e4c81deaaa9b..b92a1e1e352a 100644 --- a/pkg/iac/adapters/terraform/digitalocean/compute/adapt_test.go +++ b/pkg/iac/adapters/terraform/digitalocean/compute/adapt_test.go @@ -3,13 +3,13 @@ package compute import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/compute" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDroplets(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/digitalocean/spaces/adapt_test.go b/pkg/iac/adapters/terraform/digitalocean/spaces/adapt_test.go index bbe85a321505..cf3fc84e4ff7 100644 --- a/pkg/iac/adapters/terraform/digitalocean/spaces/adapt_test.go +++ b/pkg/iac/adapters/terraform/digitalocean/spaces/adapt_test.go @@ -3,14 +3,13 @@ package spaces import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/digitalocean/spaces" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptBuckets(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/github/branch_protections/adapt_test.go b/pkg/iac/adapters/terraform/github/branch_protections/adapt_test.go index 4317f84bde9e..bb5bfac0f71b 100644 --- a/pkg/iac/adapters/terraform/github/branch_protections/adapt_test.go +++ b/pkg/iac/adapters/terraform/github/branch_protections/adapt_test.go @@ -3,10 +3,10 @@ package branch_protections import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func Test_AdaptDefaults(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/github/repositories/adapt_test.go b/pkg/iac/adapters/terraform/github/repositories/adapt_test.go index 2199744bbde9..ea26c9978095 100644 --- a/pkg/iac/adapters/terraform/github/repositories/adapt_test.go +++ b/pkg/iac/adapters/terraform/github/repositories/adapt_test.go @@ -3,10 +3,10 @@ package repositories import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func Test_AdaptDefaults(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/github/secrets/adapt_test.go b/pkg/iac/adapters/terraform/github/secrets/adapt_test.go index 61f49de8220a..f1c28f2596a1 100644 --- a/pkg/iac/adapters/terraform/github/secrets/adapt_test.go +++ b/pkg/iac/adapters/terraform/github/secrets/adapt_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/github" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/bigquery/adapt_test.go b/pkg/iac/adapters/terraform/google/bigquery/adapt_test.go index 55d1b2ffa8c4..675fd9aa8422 100644 --- a/pkg/iac/adapters/terraform/google/bigquery/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/bigquery/adapt_test.go @@ -3,14 +3,13 @@ package bigquery import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/bigquery" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/adapt_test.go b/pkg/iac/adapters/terraform/google/compute/adapt_test.go index a30fa260281b..a90c4315364a 100644 --- a/pkg/iac/adapters/terraform/google/compute/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/compute/adapt_test.go @@ -3,9 +3,10 @@ package compute import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/disks_test.go b/pkg/iac/adapters/terraform/google/compute/disks_test.go index 0036e11a0163..81768758c544 100644 --- a/pkg/iac/adapters/terraform/google/compute/disks_test.go +++ b/pkg/iac/adapters/terraform/google/compute/disks_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/compute" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDisks(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/instances_test.go b/pkg/iac/adapters/terraform/google/compute/instances_test.go index 5f1105df742f..e37655b3d076 100644 --- a/pkg/iac/adapters/terraform/google/compute/instances_test.go +++ b/pkg/iac/adapters/terraform/google/compute/instances_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/compute" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptInstances(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/metadata_test.go b/pkg/iac/adapters/terraform/google/compute/metadata_test.go index 9a3b38abedac..00913b678721 100644 --- a/pkg/iac/adapters/terraform/google/compute/metadata_test.go +++ b/pkg/iac/adapters/terraform/google/compute/metadata_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/compute" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptProjectMetadata(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/networks_test.go b/pkg/iac/adapters/terraform/google/compute/networks_test.go index 1a40a597dcf3..32ad00bc5334 100644 --- a/pkg/iac/adapters/terraform/google/compute/networks_test.go +++ b/pkg/iac/adapters/terraform/google/compute/networks_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/compute" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptNetworks(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/compute/ssl_test.go b/pkg/iac/adapters/terraform/google/compute/ssl_test.go index 30cecdba34f3..aa0d5655b3a7 100644 --- a/pkg/iac/adapters/terraform/google/compute/ssl_test.go +++ b/pkg/iac/adapters/terraform/google/compute/ssl_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/compute" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptSSLPolicies(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/dns/adapt_test.go b/pkg/iac/adapters/terraform/google/dns/adapt_test.go index 60974fb01df1..489884afe79f 100644 --- a/pkg/iac/adapters/terraform/google/dns/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/dns/adapt_test.go @@ -3,14 +3,13 @@ package dns import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/dns" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/gke/adapt_test.go b/pkg/iac/adapters/terraform/google/gke/adapt_test.go index f45cdc24b2fb..1309288dc42d 100644 --- a/pkg/iac/adapters/terraform/google/gke/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/gke/adapt_test.go @@ -3,13 +3,13 @@ package gke import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/gke" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/iam/adapt_test.go b/pkg/iac/adapters/terraform/google/iam/adapt_test.go index 8297d83a5335..2a7cbf2640a0 100644 --- a/pkg/iac/adapters/terraform/google/iam/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/iam/adapt_test.go @@ -3,13 +3,13 @@ package iam import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/iam" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/iam/project_iam_test.go b/pkg/iac/adapters/terraform/google/iam/project_iam_test.go index fc2803c2dc4a..2ddeb9bbf3ca 100644 --- a/pkg/iac/adapters/terraform/google/iam/project_iam_test.go +++ b/pkg/iac/adapters/terraform/google/iam/project_iam_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/iam" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_AdaptBinding(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/kms/adapt_test.go b/pkg/iac/adapters/terraform/google/kms/adapt_test.go index c6025dc86f1e..7bc9a9646914 100644 --- a/pkg/iac/adapters/terraform/google/kms/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/kms/adapt_test.go @@ -3,14 +3,13 @@ package kms import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/kms" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptKeyRings(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/sql/adapt_test.go b/pkg/iac/adapters/terraform/google/sql/adapt_test.go index a31f649ffe99..29e89d6282b7 100644 --- a/pkg/iac/adapters/terraform/google/sql/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/sql/adapt_test.go @@ -3,14 +3,13 @@ package sql import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/sql" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/google/storage/adapt_test.go b/pkg/iac/adapters/terraform/google/storage/adapt_test.go index fe7a82e62f9c..0af0a99cb10a 100644 --- a/pkg/iac/adapters/terraform/google/storage/adapt_test.go +++ b/pkg/iac/adapters/terraform/google/storage/adapt_test.go @@ -3,14 +3,14 @@ package storage import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/google/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/google/storage" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Adapt(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/computing/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/computing/adapt_test.go index be6efb30493f..88af58c58674 100644 --- a/pkg/iac/adapters/terraform/nifcloud/computing/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/computing/adapt_test.go @@ -3,10 +3,10 @@ package computing import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/computing/instance_test.go b/pkg/iac/adapters/terraform/nifcloud/computing/instance_test.go index 8055681c1353..81d996cc7e62 100644 --- a/pkg/iac/adapters/terraform/nifcloud/computing/instance_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/computing/instance_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptInstances(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/computing/security_group_test.go b/pkg/iac/adapters/terraform/nifcloud/computing/security_group_test.go index 250f99a96fdc..d7e514831667 100644 --- a/pkg/iac/adapters/terraform/nifcloud/computing/security_group_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/computing/security_group_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/computing" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptSecurityGroups(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/dns/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/dns/adapt_test.go index 38ff119054bd..b3c0f535667b 100644 --- a/pkg/iac/adapters/terraform/nifcloud/dns/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/dns/adapt_test.go @@ -3,10 +3,10 @@ package dns import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/nas/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/nas/adapt_test.go index b43b874974b8..bbd18e71a7d2 100644 --- a/pkg/iac/adapters/terraform/nifcloud/nas/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/nas/adapt_test.go @@ -3,10 +3,10 @@ package nas import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/nas/nas_instance_test.go b/pkg/iac/adapters/terraform/nifcloud/nas/nas_instance_test.go index 29e52ea65037..f7a4965b1703 100644 --- a/pkg/iac/adapters/terraform/nifcloud/nas/nas_instance_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/nas/nas_instance_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptNASInstances(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/nas/nas_security_group_test.go b/pkg/iac/adapters/terraform/nifcloud/nas/nas_security_group_test.go index 786aec2fa6d6..a83ac31024ac 100644 --- a/pkg/iac/adapters/terraform/nifcloud/nas/nas_security_group_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/nas/nas_security_group_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/nas" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptNASSecurityGroups(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/network/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/network/adapt_test.go index 9a4277b28558..44af9f204343 100644 --- a/pkg/iac/adapters/terraform/nifcloud/network/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/network/adapt_test.go @@ -3,10 +3,10 @@ package network import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/rdb/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/rdb/adapt_test.go index 5360773bd505..4aeb48ce5b53 100644 --- a/pkg/iac/adapters/terraform/nifcloud/rdb/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/rdb/adapt_test.go @@ -3,10 +3,10 @@ package rdb import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/rdb/db_instance_test.go b/pkg/iac/adapters/terraform/nifcloud/rdb/db_instance_test.go index de09fe59e4e8..b6ffd7985a5b 100644 --- a/pkg/iac/adapters/terraform/nifcloud/rdb/db_instance_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/rdb/db_instance_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDBInstances(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/rdb/db_security_group_test.go b/pkg/iac/adapters/terraform/nifcloud/rdb/db_security_group_test.go index ab4fc34f1384..3833e8241101 100644 --- a/pkg/iac/adapters/terraform/nifcloud/rdb/db_security_group_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/rdb/db_security_group_test.go @@ -5,9 +5,8 @@ import ( "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/nifcloud/rdb" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_adaptDBSecurityGroups(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/nifcloud/sslcertificate/adapt_test.go b/pkg/iac/adapters/terraform/nifcloud/sslcertificate/adapt_test.go index 0c044cb049a9..0f045f1c2c52 100644 --- a/pkg/iac/adapters/terraform/nifcloud/sslcertificate/adapt_test.go +++ b/pkg/iac/adapters/terraform/nifcloud/sslcertificate/adapt_test.go @@ -3,10 +3,10 @@ package sslcertificate import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func TestLines(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/openstack/adapt_test.go b/pkg/iac/adapters/terraform/openstack/adapt_test.go index 0f04b570ff86..7baec6bb8413 100644 --- a/pkg/iac/adapters/terraform/openstack/adapt_test.go +++ b/pkg/iac/adapters/terraform/openstack/adapt_test.go @@ -3,14 +3,13 @@ package openstack import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/openstack" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func TestFields(t *testing.T) { diff --git a/pkg/iac/adapters/terraform/openstack/networking_test.go b/pkg/iac/adapters/terraform/openstack/networking_test.go index 8790dff42cf7..9fafa04bbfc1 100644 --- a/pkg/iac/adapters/terraform/openstack/networking_test.go +++ b/pkg/iac/adapters/terraform/openstack/networking_test.go @@ -3,10 +3,10 @@ package openstack import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" ) func Test_Networking(t *testing.T) { diff --git a/pkg/iac/ignore/rule_test.go b/pkg/iac/ignore/rule_test.go index 29c38bf76b5d..7cd4d382a410 100644 --- a/pkg/iac/ignore/rule_test.go +++ b/pkg/iac/ignore/rule_test.go @@ -3,9 +3,10 @@ package ignore_test import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/iac/ignore" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" ) func metadataWithLine(path string, line int) types.Metadata { diff --git a/pkg/iac/rego/convert/slice_test.go b/pkg/iac/rego/convert/slice_test.go index 5e071d0ed52a..ef0b6da6fa21 100644 --- a/pkg/iac/rego/convert/slice_test.go +++ b/pkg/iac/rego/convert/slice_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_SliceConversion(t *testing.T) { diff --git a/pkg/iac/rego/embed_test.go b/pkg/iac/rego/embed_test.go index 35fd4a667e80..15001119a934 100644 --- a/pkg/iac/rego/embed_test.go +++ b/pkg/iac/rego/embed_test.go @@ -3,12 +3,13 @@ package rego import ( "testing" - checks "github.com/aquasecurity/trivy-checks" - "github.com/aquasecurity/trivy/pkg/iac/rules" - "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/open-policy-agent/opa/ast" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + checks "github.com/aquasecurity/trivy-checks" + "github.com/aquasecurity/trivy/pkg/iac/rules" + "github.com/aquasecurity/trivy/pkg/iac/scan" ) func Test_EmbeddedLoading(t *testing.T) { diff --git a/pkg/iac/rego/load_test.go b/pkg/iac/rego/load_test.go index 1658fdefc467..638b4ea7846e 100644 --- a/pkg/iac/rego/load_test.go +++ b/pkg/iac/rego/load_test.go @@ -9,11 +9,11 @@ import ( "testing" "testing/fstest" - checks "github.com/aquasecurity/trivy-checks" "github.com/open-policy-agent/opa/ast" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + checks "github.com/aquasecurity/trivy-checks" "github.com/aquasecurity/trivy/pkg/iac/rego" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/aquasecurity/trivy/pkg/iac/types" diff --git a/pkg/iac/rego/metadata_test.go b/pkg/iac/rego/metadata_test.go index 423ddc1a20d7..06bb11c6bf85 100644 --- a/pkg/iac/rego/metadata_test.go +++ b/pkg/iac/rego/metadata_test.go @@ -3,10 +3,11 @@ package rego import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/framework" - "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/framework" + "github.com/aquasecurity/trivy/pkg/iac/scan" ) func Test_UpdateStaticMetadata(t *testing.T) { diff --git a/pkg/iac/rego/scanner_test.go b/pkg/iac/rego/scanner_test.go index ef0878822acb..c4c130b8fc95 100644 --- a/pkg/iac/rego/scanner_test.go +++ b/pkg/iac/rego/scanner_test.go @@ -10,13 +10,13 @@ import ( "testing" "testing/fstest" - "github.com/aquasecurity/trivy/pkg/iac/severity" - "github.com/aquasecurity/trivy/pkg/iac/types" "github.com/liamg/memoryfs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" + "github.com/aquasecurity/trivy/pkg/iac/severity" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func CreateFS(t *testing.T, files map[string]string) fs.FS { diff --git a/pkg/iac/rules/register_test.go b/pkg/iac/rules/register_test.go index 5f2ec0874535..9c6ca00985c9 100644 --- a/pkg/iac/rules/register_test.go +++ b/pkg/iac/rules/register_test.go @@ -4,10 +4,11 @@ import ( "fmt" "testing" - "github.com/aquasecurity/trivy/pkg/iac/framework" - "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/framework" + "github.com/aquasecurity/trivy/pkg/iac/scan" ) func Test_Reset(t *testing.T) { diff --git a/pkg/iac/scan/result_test.go b/pkg/iac/scan/result_test.go index d5b9a4a577f0..67da0d61be86 100644 --- a/pkg/iac/scan/result_test.go +++ b/pkg/iac/scan/result_test.go @@ -3,9 +3,10 @@ package scan_test import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" ) func Test_Occurrences(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/bench_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/bench_test.go index 12bc71eae899..4d08c8e3b9c6 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/bench_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/bench_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func BenchmarkUnmarshal_JFather(b *testing.B) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/decode_meta_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/decode_meta_test.go index 9924288497fe..29c1d4c5aa59 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/decode_meta_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/decode_meta_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) type TestParent struct { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go index 87169460cd0d..6f25eb4d5aad 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_array_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Array_Empty(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_boolean_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_boolean_test.go index 106d55f426f5..6abb9da200b7 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_boolean_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_boolean_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Boolean_True(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_complex_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_complex_test.go index 3584ebc97fa1..550f94a55794 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_complex_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_complex_test.go @@ -3,9 +3,9 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Complex(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_null_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_null_test.go index 4f6d109fdf4f..3455809b9874 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_null_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_null_test.go @@ -3,9 +3,9 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Null(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_number_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_number_test.go index 39226b090ede..f0f7532c15a4 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_number_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_number_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Number_IntToInt(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_object_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_object_test.go index f689ebd0fa26..1477f56f9231 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_object_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_object_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Object(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/armjson/parse_string_test.go b/pkg/iac/scanners/azure/arm/parser/armjson/parse_string_test.go index b2c546f479d2..ab630222b6c5 100644 --- a/pkg/iac/scanners/azure/arm/parser/armjson/parse_string_test.go +++ b/pkg/iac/scanners/azure/arm/parser/armjson/parse_string_test.go @@ -3,10 +3,10 @@ package armjson import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_String(t *testing.T) { diff --git a/pkg/iac/scanners/azure/arm/parser/parser_test.go b/pkg/iac/scanners/azure/arm/parser/parser_test.go index 759127ca0b00..3273c0dd6596 100644 --- a/pkg/iac/scanners/azure/arm/parser/parser_test.go +++ b/pkg/iac/scanners/azure/arm/parser/parser_test.go @@ -6,14 +6,14 @@ import ( "os" "testing" - azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" - "github.com/aquasecurity/trivy/pkg/iac/scanners/azure/resolver" - "github.com/aquasecurity/trivy/pkg/iac/types" "github.com/liamg/memoryfs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" + "github.com/aquasecurity/trivy/pkg/iac/scanners/azure/resolver" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func createMetadata(targetFS fs.FS, filename string, start, end int, ref string, parent *types.Metadata) types.Metadata { diff --git a/pkg/iac/scanners/azure/arm/parser/template_test.go b/pkg/iac/scanners/azure/arm/parser/template_test.go index 3c96c8cf588f..493cee263582 100644 --- a/pkg/iac/scanners/azure/arm/parser/template_test.go +++ b/pkg/iac/scanners/azure/arm/parser/template_test.go @@ -5,11 +5,12 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + types2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" "github.com/aquasecurity/trivy/pkg/iac/scanners/azure/arm/parser/armjson" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_JSONUnmarshal(t *testing.T) { diff --git a/pkg/iac/scanners/azure/resolver/resolver_test.go b/pkg/iac/scanners/azure/resolver/resolver_test.go index b4aabdce0a7f..9b9502c06c08 100644 --- a/pkg/iac/scanners/azure/resolver/resolver_test.go +++ b/pkg/iac/scanners/azure/resolver/resolver_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + azure2 "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/require" ) func Test_resolveFunc(t *testing.T) { diff --git a/pkg/iac/scanners/azure/value_test.go b/pkg/iac/scanners/azure/value_test.go index 646ddc0b0cd0..9392250b03d4 100644 --- a/pkg/iac/scanners/azure/value_test.go +++ b/pkg/iac/scanners/azure/value_test.go @@ -3,8 +3,9 @@ package azure import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/types" "github.com/stretchr/testify/assert" + + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_ValueAsInt(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_and_test.go b/pkg/iac/scanners/cloudformation/parser/fn_and_test.go index 2663270e99dc..5222decef06f 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_and_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_and_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_and_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_base64_test.go b/pkg/iac/scanners/cloudformation/parser/fn_base64_test.go index 7a30827f761c..7fdc77b30fa5 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_base64_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_base64_test.go @@ -1,12 +1,13 @@ package parser import ( - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_base64_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_condition_test.go b/pkg/iac/scanners/cloudformation/parser/fn_condition_test.go index 0bea529c280e..c5f0af721c36 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_condition_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_condition_test.go @@ -3,9 +3,10 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" ) func Test_resolve_condition_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_equals_test.go b/pkg/iac/scanners/cloudformation/parser/fn_equals_test.go index e3a806798393..0e550d162986 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_equals_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_equals_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_equals_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_find_in_map_test.go b/pkg/iac/scanners/cloudformation/parser/fn_find_in_map_test.go index 6063c39fc006..254c0b63c464 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_find_in_map_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_find_in_map_test.go @@ -1,10 +1,10 @@ package parser import ( + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "testing" ) func Test_resolve_find_in_map_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_get_attr_test.go b/pkg/iac/scanners/cloudformation/parser/fn_get_attr_test.go index ebd52da035b0..83e059c5c0f9 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_get_attr_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_get_attr_test.go @@ -1,10 +1,10 @@ package parser import ( + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "testing" ) func Test_resolve_get_attr_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_if_test.go b/pkg/iac/scanners/cloudformation/parser/fn_if_test.go index 0e5e41bbc963..4ecd5f9483c8 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_if_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_if_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_if_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_join_test.go b/pkg/iac/scanners/cloudformation/parser/fn_join_test.go index 8eca9ad5763b..628ade9a1acf 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_join_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_join_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_join_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_length_test.go b/pkg/iac/scanners/cloudformation/parser/fn_length_test.go index aa916ad0a972..402211bdcd98 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_length_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_length_test.go @@ -3,8 +3,9 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" ) func Test_ResolveLength_WhenPropIsArray(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_not_test.go b/pkg/iac/scanners/cloudformation/parser/fn_not_test.go index 44df6fa6d421..563964c32290 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_not_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_not_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_not_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_or_test.go b/pkg/iac/scanners/cloudformation/parser/fn_or_test.go index 18340031434b..7e0e1dcf0f0a 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_or_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_or_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_or_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_ref_test.go b/pkg/iac/scanners/cloudformation/parser/fn_ref_test.go index a535b30386e2..7f0e141b96a6 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_ref_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_ref_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_resolve_referenced_value(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/parser/fn_split_test.go b/pkg/iac/scanners/cloudformation/parser/fn_split_test.go index 59261ff57a20..33ca111c15ea 100644 --- a/pkg/iac/scanners/cloudformation/parser/fn_split_test.go +++ b/pkg/iac/scanners/cloudformation/parser/fn_split_test.go @@ -1,12 +1,13 @@ package parser import ( - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" - "github.com/aquasecurity/trivy/pkg/iac/types" + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" + "github.com/aquasecurity/trivy/pkg/iac/types" ) /* diff --git a/pkg/iac/scanners/cloudformation/parser/parser_test.go b/pkg/iac/scanners/cloudformation/parser/parser_test.go index 3a517552af57..fc8a087bdfec 100644 --- a/pkg/iac/scanners/cloudformation/parser/parser_test.go +++ b/pkg/iac/scanners/cloudformation/parser/parser_test.go @@ -7,9 +7,10 @@ import ( "strings" "testing" - "github.com/aquasecurity/trivy/internal/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/internal/testutil" ) func parseFile(t *testing.T, source string, name string) (FileContexts, error) { diff --git a/pkg/iac/scanners/cloudformation/parser/property_helpers_test.go b/pkg/iac/scanners/cloudformation/parser/property_helpers_test.go index 4b3779eac587..a537a3c1e9ab 100644 --- a/pkg/iac/scanners/cloudformation/parser/property_helpers_test.go +++ b/pkg/iac/scanners/cloudformation/parser/property_helpers_test.go @@ -3,9 +3,10 @@ package parser import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/stretchr/testify/assert" ) func newProp(inner PropertyInner) *Property { diff --git a/pkg/iac/scanners/cloudformation/parser/resource_test.go b/pkg/iac/scanners/cloudformation/parser/resource_test.go index 89d2448954e6..1b67fc1d773b 100644 --- a/pkg/iac/scanners/cloudformation/parser/resource_test.go +++ b/pkg/iac/scanners/cloudformation/parser/resource_test.go @@ -3,8 +3,9 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" ) func Test_GetProperty_PropIsFunction(t *testing.T) { diff --git a/pkg/iac/scanners/cloudformation/scanner_test.go b/pkg/iac/scanners/cloudformation/scanner_test.go index 3264609557ac..0319a862ab74 100644 --- a/pkg/iac/scanners/cloudformation/scanner_test.go +++ b/pkg/iac/scanners/cloudformation/scanner_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/aquasecurity/trivy/internal/testutil" - "github.com/aquasecurity/trivy/pkg/iac/framework" - "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" + "github.com/aquasecurity/trivy/pkg/iac/framework" + "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) diff --git a/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go b/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go index 3fd466e40ed8..4ab3009d4dab 100644 --- a/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go +++ b/pkg/iac/scanners/cloudformation/test/cf_scanning_test.go @@ -6,10 +6,10 @@ import ( "os" "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) diff --git a/pkg/iac/scanners/dockerfile/scanner_test.go b/pkg/iac/scanners/dockerfile/scanner_test.go index 4d4d88bcb675..310f104affaa 100644 --- a/pkg/iac/scanners/dockerfile/scanner_test.go +++ b/pkg/iac/scanners/dockerfile/scanner_test.go @@ -5,14 +5,15 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/framework" "github.com/aquasecurity/trivy/pkg/iac/rego" "github.com/aquasecurity/trivy/pkg/iac/rego/schemas" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) const DS006PolicyWithDockerfileSchema = `# METADATA diff --git a/pkg/iac/scanners/helm/test/parser_test.go b/pkg/iac/scanners/helm/test/parser_test.go index 762905c2abd4..0116e8b7670b 100644 --- a/pkg/iac/scanners/helm/test/parser_test.go +++ b/pkg/iac/scanners/helm/test/parser_test.go @@ -7,10 +7,11 @@ import ( "strings" "testing" - "github.com/aquasecurity/trivy/pkg/iac/detection" - "github.com/aquasecurity/trivy/pkg/iac/scanners/helm/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/detection" + "github.com/aquasecurity/trivy/pkg/iac/scanners/helm/parser" ) func Test_helm_parser(t *testing.T) { diff --git a/pkg/iac/scanners/helm/test/scanner_test.go b/pkg/iac/scanners/helm/test/scanner_test.go index a7228601b24d..45a426762439 100644 --- a/pkg/iac/scanners/helm/test/scanner_test.go +++ b/pkg/iac/scanners/helm/test/scanner_test.go @@ -10,10 +10,11 @@ import ( "strings" "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/helm" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/helm" + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) func Test_helm_scanner_with_archive(t *testing.T) { diff --git a/pkg/iac/scanners/json/scanner_test.go b/pkg/iac/scanners/json/scanner_test.go index 774d26612823..bd24a09e055c 100644 --- a/pkg/iac/scanners/json/scanner_test.go +++ b/pkg/iac/scanners/json/scanner_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/framework" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_BasicScan(t *testing.T) { diff --git a/pkg/iac/scanners/kubernetes/scanner_test.go b/pkg/iac/scanners/kubernetes/scanner_test.go index a5f3aaf90938..4745b442402d 100644 --- a/pkg/iac/scanners/kubernetes/scanner_test.go +++ b/pkg/iac/scanners/kubernetes/scanner_test.go @@ -6,12 +6,13 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/framework" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_BasicScan_YAML(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/attribute_test.go b/pkg/iac/scanners/terraform/attribute_test.go index e81486e938a2..5c97985d7146 100644 --- a/pkg/iac/scanners/terraform/attribute_test.go +++ b/pkg/iac/scanners/terraform/attribute_test.go @@ -3,8 +3,9 @@ package terraform import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/terraform" "github.com/stretchr/testify/assert" + + "github.com/aquasecurity/trivy/pkg/iac/terraform" ) func Test_AttributeStartsWith(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/count_test.go b/pkg/iac/scanners/terraform/count_test.go index 99e447196fa1..89aadbbf82c8 100644 --- a/pkg/iac/scanners/terraform/count_test.go +++ b/pkg/iac/scanners/terraform/count_test.go @@ -3,13 +3,14 @@ package terraform import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers" "github.com/aquasecurity/trivy/pkg/iac/rules" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/severity" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/assert" ) func Test_ResourcesWithCount(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/deterministic_test.go b/pkg/iac/scanners/terraform/deterministic_test.go index 258fe5bbbd16..ccf2b7123e0c 100644 --- a/pkg/iac/scanners/terraform/deterministic_test.go +++ b/pkg/iac/scanners/terraform/deterministic_test.go @@ -4,11 +4,12 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/rules" "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/executor" "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser" - "github.com/stretchr/testify/require" ) func Test_DeterministicResults(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/executor/executor_test.go b/pkg/iac/scanners/terraform/executor/executor_test.go index d33e5d999c38..e67763c4c09c 100644 --- a/pkg/iac/scanners/terraform/executor/executor_test.go +++ b/pkg/iac/scanners/terraform/executor/executor_test.go @@ -4,6 +4,9 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers" "github.com/aquasecurity/trivy/pkg/iac/rules" @@ -11,8 +14,6 @@ import ( "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser" "github.com/aquasecurity/trivy/pkg/iac/severity" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var panicRule = scan.Rule{ diff --git a/pkg/iac/scanners/terraform/fs_test.go b/pkg/iac/scanners/terraform/fs_test.go index 0089bc49a477..79b0844fe983 100644 --- a/pkg/iac/scanners/terraform/fs_test.go +++ b/pkg/iac/scanners/terraform/fs_test.go @@ -5,9 +5,10 @@ import ( "os" "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) func Test_OS_FS(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/ignore_test.go b/pkg/iac/scanners/terraform/ignore_test.go index ce0596f157a9..3b0a83428a50 100644 --- a/pkg/iac/scanners/terraform/ignore_test.go +++ b/pkg/iac/scanners/terraform/ignore_test.go @@ -5,12 +5,13 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/aquasecurity/trivy/pkg/iac/providers" "github.com/aquasecurity/trivy/pkg/iac/rules" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/severity" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/assert" ) var exampleRule = scan.Rule{ diff --git a/pkg/iac/scanners/terraform/module_test.go b/pkg/iac/scanners/terraform/module_test.go index d369ffefe44c..5469204e741f 100644 --- a/pkg/iac/scanners/terraform/module_test.go +++ b/pkg/iac/scanners/terraform/module_test.go @@ -7,6 +7,9 @@ import ( "os" "testing" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy-checks/checks/cloud/aws/iam" "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers" "github.com/aquasecurity/trivy/pkg/iac/rules" @@ -16,9 +19,6 @@ import ( "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser" "github.com/aquasecurity/trivy/pkg/iac/severity" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/require" - - "github.com/aquasecurity/trivy-checks/checks/cloud/aws/iam" ) var badRule = scan.Rule{ diff --git a/pkg/iac/scanners/terraform/parser/load_vars_test.go b/pkg/iac/scanners/terraform/parser/load_vars_test.go index a207a5383125..384ced396eba 100644 --- a/pkg/iac/scanners/terraform/parser/load_vars_test.go +++ b/pkg/iac/scanners/terraform/parser/load_vars_test.go @@ -3,11 +3,11 @@ package parser import ( "testing" - "github.com/aquasecurity/trivy/internal/testutil" - "github.com/zclconf/go-cty/cty" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/zclconf/go-cty/cty" + + "github.com/aquasecurity/trivy/internal/testutil" ) func Test_TFVarsFile(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/parser/modules_test.go b/pkg/iac/scanners/terraform/parser/modules_test.go index 142783160f01..404a1effcfb1 100644 --- a/pkg/iac/scanners/terraform/parser/modules_test.go +++ b/pkg/iac/scanners/terraform/parser/modules_test.go @@ -5,11 +5,12 @@ import ( "path" "testing" - "github.com/aquasecurity/trivy/internal/testutil" "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/exp/maps" + + "github.com/aquasecurity/trivy/internal/testutil" ) func TestFindRootModules(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/parser/parser_integration_test.go b/pkg/iac/scanners/terraform/parser/parser_integration_test.go index 58b7b3cfbed7..f73e9b85539c 100644 --- a/pkg/iac/scanners/terraform/parser/parser_integration_test.go +++ b/pkg/iac/scanners/terraform/parser/parser_integration_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/aquasecurity/trivy/internal/testutil" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/internal/testutil" ) func Test_DefaultRegistry(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/parser/parser_test.go b/pkg/iac/scanners/terraform/parser/parser_test.go index 4be1b463d7ce..97593509359f 100644 --- a/pkg/iac/scanners/terraform/parser/parser_test.go +++ b/pkg/iac/scanners/terraform/parser/parser_test.go @@ -7,12 +7,13 @@ import ( "sort" "testing" - "github.com/aquasecurity/trivy/internal/testutil" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/aquasecurity/trivy/pkg/iac/terraform" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zclconf/go-cty/cty" + + "github.com/aquasecurity/trivy/internal/testutil" + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" + "github.com/aquasecurity/trivy/pkg/iac/terraform" ) func Test_BasicParsing(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/scanner_integration_test.go b/pkg/iac/scanners/terraform/scanner_integration_test.go index 56c557e8be2d..6c60dd8a9f2c 100644 --- a/pkg/iac/scanners/terraform/scanner_integration_test.go +++ b/pkg/iac/scanners/terraform/scanner_integration_test.go @@ -6,10 +6,11 @@ import ( "fmt" "testing" - "github.com/aquasecurity/trivy/internal/testutil" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/internal/testutil" + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) func Test_ScanRemoteModule(t *testing.T) { diff --git a/pkg/iac/scanners/terraform/scanner_test.go b/pkg/iac/scanners/terraform/scanner_test.go index 047ceb972a2a..cfa7cd0d0775 100644 --- a/pkg/iac/scanners/terraform/scanner_test.go +++ b/pkg/iac/scanners/terraform/scanner_test.go @@ -7,6 +7,9 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/providers" "github.com/aquasecurity/trivy/pkg/iac/rules" @@ -14,8 +17,6 @@ import ( "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/aquasecurity/trivy/pkg/iac/severity" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var alwaysFailRule = scan.Rule{ diff --git a/pkg/iac/scanners/terraform/setup_test.go b/pkg/iac/scanners/terraform/setup_test.go index 84bf3fdcc338..06930e6ffda4 100644 --- a/pkg/iac/scanners/terraform/setup_test.go +++ b/pkg/iac/scanners/terraform/setup_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser" "github.com/aquasecurity/trivy/pkg/iac/terraform" - "github.com/stretchr/testify/require" ) func createModulesFromSource(t *testing.T, source string, ext string) terraform.Modules { diff --git a/pkg/iac/scanners/terraformplan/snapshot/scanner_test.go b/pkg/iac/scanners/terraformplan/snapshot/scanner_test.go index 474894339b17..9eca249c1f16 100644 --- a/pkg/iac/scanners/terraformplan/snapshot/scanner_test.go +++ b/pkg/iac/scanners/terraformplan/snapshot/scanner_test.go @@ -9,12 +9,13 @@ import ( "sort" "testing" - "github.com/aquasecurity/trivy/pkg/iac/scan" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - tfscanner "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform" "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scan" + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" + tfscanner "github.com/aquasecurity/trivy/pkg/iac/scanners/terraform" ) func initScanner(opts ...options.ScannerOption) *Scanner { diff --git a/pkg/iac/scanners/terraformplan/tfjson/scanner_test.go b/pkg/iac/scanners/terraformplan/tfjson/scanner_test.go index 664799f74036..8a878e206bb3 100644 --- a/pkg/iac/scanners/terraformplan/tfjson/scanner_test.go +++ b/pkg/iac/scanners/terraformplan/tfjson/scanner_test.go @@ -7,10 +7,11 @@ import ( "os" "testing" - "github.com/aquasecurity/trivy/internal/testutil" - "github.com/aquasecurity/trivy/pkg/iac/scanners/options" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/internal/testutil" + "github.com/aquasecurity/trivy/pkg/iac/scanners/options" ) func Test_TerraformScanner(t *testing.T) { diff --git a/pkg/iac/scanners/terraformplan/tfjson/test/parser_test.go b/pkg/iac/scanners/terraformplan/tfjson/test/parser_test.go index 97b9ba4fcf7b..85a63c6227ef 100644 --- a/pkg/iac/scanners/terraformplan/tfjson/test/parser_test.go +++ b/pkg/iac/scanners/terraformplan/tfjson/test/parser_test.go @@ -3,9 +3,10 @@ package json import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/scanners/terraformplan/tfjson/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/iac/scanners/terraformplan/tfjson/parser" ) func Test_Parse_Plan_File(t *testing.T) { diff --git a/pkg/iac/scanners/terraformplan/tfjson/test/scanner_test.go b/pkg/iac/scanners/terraformplan/tfjson/test/scanner_test.go index 2feb3d2fae9b..5b684dc77ed0 100644 --- a/pkg/iac/scanners/terraformplan/tfjson/test/scanner_test.go +++ b/pkg/iac/scanners/terraformplan/tfjson/test/scanner_test.go @@ -5,12 +5,12 @@ import ( "testing" "testing/fstest" - "github.com/aquasecurity/trivy/pkg/iac/scan" - "github.com/aquasecurity/trivy/pkg/iac/scanners/terraformplan/tfjson" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" + "github.com/aquasecurity/trivy/pkg/iac/scanners/terraformplan/tfjson" ) func Test_Scanning_Plan(t *testing.T) { diff --git a/pkg/iac/scanners/toml/scanner_test.go b/pkg/iac/scanners/toml/scanner_test.go index c3217587cd55..15583428d1da 100644 --- a/pkg/iac/scanners/toml/scanner_test.go +++ b/pkg/iac/scanners/toml/scanner_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/framework" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_BasicScan(t *testing.T) { diff --git a/pkg/iac/scanners/yaml/scanner_test.go b/pkg/iac/scanners/yaml/scanner_test.go index f4554997cf5a..a9d124be6858 100644 --- a/pkg/iac/scanners/yaml/scanner_test.go +++ b/pkg/iac/scanners/yaml/scanner_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/framework" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/scanners/options" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_BasicScan(t *testing.T) { diff --git a/pkg/iac/state/merge_test.go b/pkg/iac/state/merge_test.go index ff8da78a5ac2..baf3959f3890 100644 --- a/pkg/iac/state/merge_test.go +++ b/pkg/iac/state/merge_test.go @@ -3,14 +3,12 @@ package state import ( "testing" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" - - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" + "github.com/stretchr/testify/assert" "github.com/aquasecurity/trivy/pkg/iac/providers/aws" + "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/rds" - - "github.com/stretchr/testify/assert" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_Merging(t *testing.T) { diff --git a/pkg/iac/state/state_test.go b/pkg/iac/state/state_test.go index 0b3f3235f6bb..89169693b8c9 100644 --- a/pkg/iac/state/state_test.go +++ b/pkg/iac/state/state_test.go @@ -4,14 +4,12 @@ import ( "encoding/json" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" - "github.com/aquasecurity/trivy/pkg/iac/providers/aws" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3" - - "github.com/stretchr/testify/assert" + iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) func Test_RegoConversion(t *testing.T) { diff --git a/pkg/iac/types/bool_test.go b/pkg/iac/types/bool_test.go old mode 100755 new mode 100644 index ebd65329086d..a63a95eb7a63 --- a/pkg/iac/types/bool_test.go +++ b/pkg/iac/types/bool_test.go @@ -4,9 +4,8 @@ import ( "encoding/json" "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) var fakeMetadata = NewMetadata(NewRange("main.tf", 123, 123, "", nil), "") diff --git a/pkg/iac/types/fskey_test.go b/pkg/iac/types/fskey_test.go index 1b3e6cf42aca..37be8fce4f0d 100644 --- a/pkg/iac/types/fskey_test.go +++ b/pkg/iac/types/fskey_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/liamg/memoryfs" - "github.com/stretchr/testify/assert" ) diff --git a/pkg/iac/types/string_test.go b/pkg/iac/types/string_test.go old mode 100755 new mode 100644 index 1f135874bf18..a923d193d85e --- a/pkg/iac/types/string_test.go +++ b/pkg/iac/types/string_test.go @@ -4,9 +4,8 @@ import ( "encoding/json" "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func Test_StringValueEqualTo(t *testing.T) { diff --git a/pkg/k8s/scanner/scanner_test.go b/pkg/k8s/scanner/scanner_test.go index 69429a6f4d48..ce9224f8e289 100644 --- a/pkg/k8s/scanner/scanner_test.go +++ b/pkg/k8s/scanner/scanner_test.go @@ -2,21 +2,21 @@ package scanner import ( "context" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" - "github.com/aquasecurity/trivy/pkg/sbom/core" - "github.com/aquasecurity/trivy/pkg/uuid" - "github.com/stretchr/testify/require" - "golang.org/x/exp/maps" "sort" "testing" "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "golang.org/x/exp/maps" "github.com/aquasecurity/trivy-kubernetes/pkg/artifacts" cmd "github.com/aquasecurity/trivy/pkg/commands/artifact" + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/flag" "github.com/aquasecurity/trivy/pkg/purl" + "github.com/aquasecurity/trivy/pkg/sbom/core" + "github.com/aquasecurity/trivy/pkg/uuid" ) func TestScanner_Scan(t *testing.T) { diff --git a/pkg/k8s/writer_test.go b/pkg/k8s/writer_test.go index 1b5b6af93c9c..0b2253d9ac24 100644 --- a/pkg/k8s/writer_test.go +++ b/pkg/k8s/writer_test.go @@ -7,9 +7,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy/pkg/k8s/report" diff --git a/pkg/log/handler_test.go b/pkg/log/handler_test.go index 4d106535b8d8..a122e46f5880 100644 --- a/pkg/log/handler_test.go +++ b/pkg/log/handler_test.go @@ -5,14 +5,16 @@ import ( "context" "errors" "fmt" - "github.com/aquasecurity/trivy/pkg/log" - "github.com/stretchr/testify/assert" "log/slog" "os" "strings" "testing" "testing/slogtest" "time" + + "github.com/stretchr/testify/assert" + + "github.com/aquasecurity/trivy/pkg/log" ) func TestColorHandler(t *testing.T) { diff --git a/pkg/plugin/index_test.go b/pkg/plugin/index_test.go index 028c46a10ca4..7e5621d5ca1c 100644 --- a/pkg/plugin/index_test.go +++ b/pkg/plugin/index_test.go @@ -3,15 +3,17 @@ package plugin_test import ( "bytes" "context" - "github.com/aquasecurity/trivy/pkg/plugin" - "github.com/aquasecurity/trivy/pkg/utils/fsutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "net/http" "net/http/httptest" "os" "path/filepath" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/aquasecurity/trivy/pkg/plugin" + "github.com/aquasecurity/trivy/pkg/utils/fsutils" ) func TestManager_Update(t *testing.T) { diff --git a/pkg/plugin/manager_test.go b/pkg/plugin/manager_test.go index 19b80ee01c0b..083e9ba26e2a 100644 --- a/pkg/plugin/manager_test.go +++ b/pkg/plugin/manager_test.go @@ -6,9 +6,6 @@ import ( "bytes" "context" "fmt" - "github.com/aquasecurity/trivy/pkg/clock" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" - v1 "github.com/google/go-containerregistry/pkg/v1" "log/slog" "os" "path/filepath" @@ -16,9 +13,12 @@ import ( "testing" "time" + v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/clock" + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/plugin" ) diff --git a/pkg/report/table/secret_test.go b/pkg/report/table/secret_test.go index 92011f8d17ff..8eb59af18476 100644 --- a/pkg/report/table/secret_test.go +++ b/pkg/report/table/secret_test.go @@ -1,7 +1,6 @@ package table_test import ( - "github.com/aquasecurity/trivy/pkg/types" "strings" "testing" @@ -10,6 +9,7 @@ import ( dbTypes "github.com/aquasecurity/trivy-db/pkg/types" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/report/table" + "github.com/aquasecurity/trivy/pkg/types" ) func TestSecretRenderer(t *testing.T) { diff --git a/pkg/report/table/table_test.go b/pkg/report/table/table_test.go index 6b357a6d08dc..c9ab1a1f1b48 100644 --- a/pkg/report/table/table_test.go +++ b/pkg/report/table/table_test.go @@ -2,12 +2,12 @@ package table_test import ( "bytes" - ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "testing" "github.com/stretchr/testify/assert" dbTypes "github.com/aquasecurity/trivy-db/pkg/types" + ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/report/table" "github.com/aquasecurity/trivy/pkg/types" ) diff --git a/pkg/result/filter_test.go b/pkg/result/filter_test.go index 740caa6693d0..4041ec735a0d 100644 --- a/pkg/result/filter_test.go +++ b/pkg/result/filter_test.go @@ -2,10 +2,10 @@ package result_test import ( "context" - "github.com/package-url/packageurl-go" "testing" "time" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -671,7 +671,7 @@ func TestFilter(t *testing.T) { secret1, }, ModifiedFindings: []types.ModifiedFinding{ - { + { Type: types.FindingTypeSecret, Status: types.FindingStatusIgnored, Statement: "Filtered by Rego", diff --git a/pkg/sbom/cyclonedx/marshal_test.go b/pkg/sbom/cyclonedx/marshal_test.go index d3d104b28347..d86cbfd1a218 100644 --- a/pkg/sbom/cyclonedx/marshal_test.go +++ b/pkg/sbom/cyclonedx/marshal_test.go @@ -2,14 +2,12 @@ package cyclonedx_test import ( "context" - "github.com/aquasecurity/trivy/pkg/fanal/artifact" - "github.com/aquasecurity/trivy/pkg/sbom/core" - "github.com/package-url/packageurl-go" "testing" "time" cdx "github.com/CycloneDX/cyclonedx-go" v1 "github.com/google/go-containerregistry/pkg/v1" + "github.com/package-url/packageurl-go" "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -17,8 +15,10 @@ import ( dtypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/clock" + "github.com/aquasecurity/trivy/pkg/fanal/artifact" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/report" + "github.com/aquasecurity/trivy/pkg/sbom/core" "github.com/aquasecurity/trivy/pkg/sbom/cyclonedx" "github.com/aquasecurity/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/uuid" diff --git a/pkg/sbom/cyclonedx/unmarshal_test.go b/pkg/sbom/cyclonedx/unmarshal_test.go index 9988d21c75ed..834e886c46dd 100644 --- a/pkg/sbom/cyclonedx/unmarshal_test.go +++ b/pkg/sbom/cyclonedx/unmarshal_test.go @@ -2,18 +2,18 @@ package cyclonedx_test import ( "encoding/json" - "github.com/aquasecurity/trivy/pkg/purl" - sbomio "github.com/aquasecurity/trivy/pkg/sbom/io" - "github.com/aquasecurity/trivy/pkg/types" - "github.com/package-url/packageurl-go" "os" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" + "github.com/aquasecurity/trivy/pkg/purl" "github.com/aquasecurity/trivy/pkg/sbom/cyclonedx" + sbomio "github.com/aquasecurity/trivy/pkg/sbom/io" + "github.com/aquasecurity/trivy/pkg/types" ) func TestUnmarshaler_Unmarshal(t *testing.T) { diff --git a/pkg/sbom/io/encode_test.go b/pkg/sbom/io/encode_test.go index e26dd83848e8..43c0d022556b 100644 --- a/pkg/sbom/io/encode_test.go +++ b/pkg/sbom/io/encode_test.go @@ -1,6 +1,12 @@ package io_test import ( + "testing" + + "github.com/package-url/packageurl-go" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + dtypes "github.com/aquasecurity/trivy-db/pkg/types" "github.com/aquasecurity/trivy/pkg/fanal/artifact" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" @@ -8,10 +14,6 @@ import ( sbomio "github.com/aquasecurity/trivy/pkg/sbom/io" "github.com/aquasecurity/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/uuid" - "github.com/package-url/packageurl-go" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "testing" ) func TestEncoder_Encode(t *testing.T) { diff --git a/pkg/sbom/spdx/marshal_test.go b/pkg/sbom/spdx/marshal_test.go index ee4c10949148..02585ceaa418 100644 --- a/pkg/sbom/spdx/marshal_test.go +++ b/pkg/sbom/spdx/marshal_test.go @@ -2,23 +2,23 @@ package spdx_test import ( "context" - "github.com/aquasecurity/trivy/pkg/fanal/artifact" - "github.com/aquasecurity/trivy/pkg/sbom/core" - "github.com/package-url/packageurl-go" "hash/fnv" "testing" "time" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/mitchellh/hashstructure/v2" + "github.com/package-url/packageurl-go" "github.com/spdx/tools-golang/spdx" "github.com/spdx/tools-golang/spdx/v2/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/aquasecurity/trivy/pkg/clock" + "github.com/aquasecurity/trivy/pkg/fanal/artifact" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/report" + "github.com/aquasecurity/trivy/pkg/sbom/core" tspdx "github.com/aquasecurity/trivy/pkg/sbom/spdx" "github.com/aquasecurity/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/uuid" diff --git a/pkg/sbom/spdx/unmarshal_test.go b/pkg/sbom/spdx/unmarshal_test.go index 4348618e0f4d..c68d9f32e654 100644 --- a/pkg/sbom/spdx/unmarshal_test.go +++ b/pkg/sbom/spdx/unmarshal_test.go @@ -2,16 +2,16 @@ package spdx_test import ( "encoding/json" - sbomio "github.com/aquasecurity/trivy/pkg/sbom/io" - "github.com/package-url/packageurl-go" "os" "sort" "testing" + "github.com/package-url/packageurl-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" + sbomio "github.com/aquasecurity/trivy/pkg/sbom/io" "github.com/aquasecurity/trivy/pkg/sbom/spdx" "github.com/aquasecurity/trivy/pkg/types" ) diff --git a/pkg/scanner/scan_test.go b/pkg/scanner/scan_test.go index eaa0a6028e69..287935ddd41f 100644 --- a/pkg/scanner/scan_test.go +++ b/pkg/scanner/scan_test.go @@ -3,13 +3,13 @@ package scanner import ( "context" "errors" - "github.com/aquasecurity/trivy/pkg/clock" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/clock" "github.com/aquasecurity/trivy/pkg/fanal/artifact" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/types" diff --git a/pkg/vex/vex_test.go b/pkg/vex/vex_test.go index ad385b63596e..87b4cd83fe85 100644 --- a/pkg/vex/vex_test.go +++ b/pkg/vex/vex_test.go @@ -1,18 +1,17 @@ package vex_test import ( - "github.com/aquasecurity/trivy/pkg/fanal/artifact" - "github.com/aquasecurity/trivy/pkg/sbom/core" "os" "testing" "github.com/package-url/packageurl-go" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/trivy/pkg/fanal/artifact" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" + "github.com/aquasecurity/trivy/pkg/sbom/core" "github.com/aquasecurity/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/vex" )