chore: add gci linter (#271)

Signed-off-by: Nikita Pivkin <[email protected]>
aquasecurity · Nov 26, 2024 · 574f9f8 · 574f9f8
1 parent 791d9a9
commit 574f9f8
Show file tree

Hide file tree

Showing 63 changed files with 218 additions and 207 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,7 @@ linters:
     - goimports
     - gocritic
     - gosec
+    - gci
 
 linters-settings:
   cyclop:
@@ -27,6 +28,13 @@ linters-settings:
     checks:
       - all
       - '-SA1019' # TODO
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/aquasecurity/)
+      - blank
+      - dot
 
 issues:
   exclude-rules:

diff --git a/internal/adapters/cloud/aws/accessanalyzer/adapt.go b/internal/adapters/cloud/aws/accessanalyzer/adapt.go
@@ -3,15 +3,15 @@ package api_gateway
 import (
 	"fmt"
 
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/accessanalyzer"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	"github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	api "github.com/aws/aws-sdk-go-v2/service/accessanalyzer"
 	aatypes "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types"
 
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/accessanalyzer"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/api-gateway/adapt.go b/internal/adapters/cloud/aws/api-gateway/adapt.go
@@ -1,10 +1,11 @@
 package api_gateway
 
 import (
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
 	apiv1 "github.com/aws/aws-sdk-go-v2/service/apigateway"
 	apiv2 "github.com/aws/aws-sdk-go-v2/service/apigatewayv2"
+
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/api-gateway/apis_v1.go b/internal/adapters/cloud/aws/api-gateway/apis_v1.go
@@ -3,12 +3,12 @@ package api_gateway
 import (
 	"fmt"
 
-	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/apigateway"
 	agTypes "github.com/aws/aws-sdk-go-v2/service/apigateway/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getAPIsV1() ([]v1.API, error) {

diff --git a/internal/adapters/cloud/aws/api-gateway/apis_v2.go b/internal/adapters/cloud/aws/api-gateway/apis_v2.go
@@ -3,12 +3,12 @@ package api_gateway
 import (
 	"fmt"
 
-	v2 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v2"
-	"github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/apigatewayv2"
 	agTypes "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	v2 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v2"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getAPIsV2() ([]v2.API, error) {

diff --git a/internal/adapters/cloud/aws/api-gateway/domains_v1.go b/internal/adapters/cloud/aws/api-gateway/domains_v1.go
@@ -3,12 +3,12 @@ package api_gateway
 import (
 	"fmt"
 
-	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
-	"github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/apigateway"
 	agTypes "github.com/aws/aws-sdk-go-v2/service/apigateway/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	v1 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v1"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getDomainNamesv1() ([]v1.DomainName, error) {

diff --git a/internal/adapters/cloud/aws/api-gateway/domains_v2.go b/internal/adapters/cloud/aws/api-gateway/domains_v2.go
@@ -3,12 +3,12 @@ package api_gateway
 import (
 	"fmt"
 
-	v2 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v2"
-	"github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/apigatewayv2"
 	agTypes "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	v2 "github.com/aquasecurity/trivy/pkg/iac/providers/aws/apigateway/v2"
+	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getDomainNamesV2() ([]v2.DomainName, error) {

diff --git a/internal/adapters/cloud/aws/athena/adapt.go b/internal/adapters/cloud/aws/athena/adapt.go
@@ -3,14 +3,14 @@ package athena
 import (
 	"fmt"
 
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/athena"
 	"github.com/aws/aws-sdk-go-v2/service/athena/types"
 
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/athena"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/cloudfront/adapt.go b/internal/adapters/cloud/aws/cloudfront/adapt.go
@@ -1,14 +1,14 @@
 package cloudfront
 
 import (
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/cloudfront"
 	"github.com/aws/aws-sdk-go-v2/service/cloudfront/types"
 
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudfront"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/cloudtrail/adapt.go b/internal/adapters/cloud/aws/cloudtrail/adapt.go
@@ -1,14 +1,14 @@
 package cloudtrail
 
 import (
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/cloudtrail"
 	"github.com/aws/aws-sdk-go-v2/service/cloudtrail/types"
 
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudtrail"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/cloudwatch/adapt.go b/internal/adapters/cloud/aws/cloudwatch/adapt.go
@@ -1,16 +1,16 @@
 package cloudwatch
 
 import (
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	cwApi "github.com/aws/aws-sdk-go-v2/service/cloudwatch"
 	cwTypes "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
 	api "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
 
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/cloudwatch"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/codebuild/adapt.go b/internal/adapters/cloud/aws/codebuild/adapt.go
@@ -1,13 +1,13 @@
 package codebuild
 
 import (
+	api "github.com/aws/aws-sdk-go-v2/service/codebuild"
+
 	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
+	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
 	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/codebuild"
 	"github.com/aquasecurity/trivy/pkg/iac/state"
 	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
-	api "github.com/aws/aws-sdk-go-v2/service/codebuild"
-
-	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/documentdb/adapt.go b/internal/adapters/cloud/aws/documentdb/adapt.go
@@ -1,15 +1,15 @@
 package documentdb
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	api "github.com/aws/aws-sdk-go-v2/service/docdb"
 	docdbTypes "github.com/aws/aws-sdk-go-v2/service/docdb/types"
 
 	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
 	"github.com/aquasecurity/trivy-aws/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/documentdb"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/dynamodb/dynamodb.go b/internal/adapters/cloud/aws/dynamodb/dynamodb.go
@@ -1,24 +1,24 @@
 package dynamodb
 
 import (
-	aws2 "github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	dynamodbApi "github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	dynamodbTypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 
+	awsAdapter "github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/dynamodb"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {
-	*aws2.RootAdapter
+	*awsAdapter.RootAdapter
 	client *dynamodbApi.Client
 }
 
 func init() {
-	aws2.RegisterServiceAdapter(&adapter{})
+	awsAdapter.RegisterServiceAdapter(&adapter{})
 }
 
 func (a *adapter) Name() string {
@@ -29,7 +29,7 @@ func (a *adapter) Provider() string {
 	return "aws"
 }
 
-func (a *adapter) Adapt(root *aws2.RootAdapter, state *state.State) error {
+func (a *adapter) Adapt(root *awsAdapter.RootAdapter, state *state.State) error {
 	a.RootAdapter = root
 	a.client = dynamodbApi.NewFromConfig(root.SessionConfig())
 	var err error

diff --git a/internal/adapters/cloud/aws/ec2/autoscaling.go b/internal/adapters/cloud/aws/ec2/autoscaling.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"fmt"
 
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	ec2api "github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getLaunchTemplates() ([]ec2.LaunchTemplate, error) {

diff --git a/internal/adapters/cloud/aws/ec2/ec2.go b/internal/adapters/cloud/aws/ec2/ec2.go
@@ -2,20 +2,18 @@ package ec2
 
 import (
 	"fmt"
-
 	"strings"
 
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
-
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
 	ec2api "github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
 	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
 	"github.com/aquasecurity/trivy-aws/pkg/types"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 type adapter struct {

diff --git a/internal/adapters/cloud/aws/ec2/ec2_test.go b/internal/adapters/cloud/aws/ec2/ec2_test.go
@@ -3,14 +3,15 @@ package ec2
 import (
 	"testing"
 
-	aws2 "github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
-	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws/test"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	ec2api "github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	awsAdapter "github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
+	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws/test"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 type volumeDetails struct {
@@ -113,7 +114,7 @@ func Test_EC2RootVolumeEncrypted(t *testing.T) {
 	}
 }
 
-func bootstrapEC2Instance(t *testing.T, ra *aws2.RootAdapter, spec instanceDetails) *string {
+func bootstrapEC2Instance(t *testing.T, ra *awsAdapter.RootAdapter, spec instanceDetails) *string {
 
 	api := ec2api.NewFromConfig(ra.SessionConfig())
 
@@ -150,7 +151,7 @@ func bootstrapVolume(blockMappings []ec2Types.BlockDeviceMapping, deviceName str
 	return blockMappings
 }
 
-func removeInstance(t *testing.T, ra *aws2.RootAdapter, instanceID *string) {
+func removeInstance(t *testing.T, ra *awsAdapter.RootAdapter, instanceID *string) {
 
 	api := ec2api.NewFromConfig(ra.SessionConfig())
 

diff --git a/internal/adapters/cloud/aws/ec2/volume.go b/internal/adapters/cloud/aws/ec2/volume.go
@@ -3,12 +3,12 @@ package ec2
 import (
 	"fmt"
 
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	ec2api "github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getVolumes() ([]ec2.Volume, error) {

diff --git a/internal/adapters/cloud/aws/ec2/vpc.go b/internal/adapters/cloud/aws/ec2/vpc.go
@@ -1,13 +1,13 @@
 package ec2
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
-	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	ec2api "github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
 	"github.com/aquasecurity/trivy-aws/pkg/concurrency"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	trivyTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 
 func (a *adapter) getSecurityGroups() (securityGroups []ec2.SecurityGroup, err error) {

diff --git a/internal/adapters/cloud/aws/ec2/vpc_test.go b/internal/adapters/cloud/aws/ec2/vpc_test.go
@@ -3,8 +3,6 @@ package ec2
 import (
 	"testing"
 
-	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
-	"github.com/aquasecurity/trivy/pkg/iac/state"
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	vpcApi "github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -15,6 +13,8 @@ import (
 
 	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws"
 	"github.com/aquasecurity/trivy-aws/internal/adapters/cloud/aws/test"
+	"github.com/aquasecurity/trivy/pkg/iac/providers/aws/ec2"
+	"github.com/aquasecurity/trivy/pkg/iac/state"
 )
 
 type rule struct {