mv test/testutil/util.go under internal/

pkg/iac/adapters/cloudformation/aws/config/adapt_test.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/config"
 	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func TestAdapt(t *testing.T) {

pkg/iac/adapters/cloudformation/aws/ec2/adapt_test.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func TestAdapt(t *testing.T) {

pkg/iac/adapters/cloudformation/aws/elb/adapt_test.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
 	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func TestAdapt(t *testing.T) {

pkg/iac/adapters/cloudformation/aws/rds/adapt_test.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/rds"
 	"github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func TestAdapt(t *testing.T) {

pkg/iac/adapters/terraform/aws/apigateway/adapt_test.go

@@ -7,8 +7,8 @@ import (
 	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
 	v2 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v2"
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/apigateway/apiv1_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptAPIMethodsV1(t *testing.T) {

pkg/iac/adapters/terraform/aws/apigateway/apiv2_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	v2 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v2"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptAPIsV2(t *testing.T) {

pkg/iac/adapters/terraform/aws/apigateway/namesv1_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptDomainNamesV1(t *testing.T) {

pkg/iac/adapters/terraform/aws/apigateway/namesv2_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	v2 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v2"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptDomainNamesV2(t *testing.T) {

pkg/iac/adapters/terraform/aws/athena/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/athena"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/cloudfront/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudfront"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/cloudtrail/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudtrail"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/cloudwatch/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/cloudwatch"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/codebuild/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/codebuild"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/config/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/config"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/iac/adapters/terraform/aws/documentdb/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/documentdb"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/dynamodb/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/dynamodb"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/ec2/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/ec2/autoscaling_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/ec2/subnet_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/ec2/volume_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/ec2/vpc_test.go

@@ -4,14 +4,13 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_AdaptVPC(t *testing.T) {

pkg/iac/adapters/terraform/aws/ecr/adapt_test.go

@@ -4,12 +4,12 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
 	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/liamg/iamgo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/iac/adapters/terraform/aws/ecs/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/ecs"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/efs/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/efs"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/eks/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/eks"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/elasticache/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticache"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/elasticsearch/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/elasticsearch"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/elb/adapt_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/elb"
 
-	"github.com/aquasecurity/trivy/test/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/iac/adapters/terraform/aws/emr/adapt_test.go

@@ -4,13 +4,12 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/emr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptSecurityConfiguration(t *testing.T) {

pkg/iac/adapters/terraform/aws/iam/groups_test.go

@@ -4,11 +4,10 @@ import (
 	"testing"
 
 	defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil"
 
 	"github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-
-	"github.com/aquasecurity/trivy/test/testutil"
 )
 
 func Test_adaptGroups(t *testing.T) {