fix lints

aquasecurity · Dec 2, 2023 · 254e96b · 254e96b
1 parent acd94ff
commit 254e96b
Show file tree

Hide file tree

Showing 135 changed files with 264 additions and 277 deletions.
diff --git a/internal/adapters/arm/adapt.go b/internal/adapters/arm/adapt.go
@@ -3,6 +3,8 @@ package arm
 import (
  "context"
 
+ "github.com/aquasecurity/defsec/pkg/providers/azure"
+ "github.com/aquasecurity/defsec/pkg/state"
  "github.com/aquasecurity/trivy/internal/adapters/arm/appservice"
  "github.com/aquasecurity/trivy/internal/adapters/arm/authorization"
  "github.com/aquasecurity/trivy/internal/adapters/arm/compute"
@@ -16,9 +18,6 @@ import (
  "github.com/aquasecurity/trivy/internal/adapters/arm/securitycenter"
  "github.com/aquasecurity/trivy/internal/adapters/arm/storage"
  "github.com/aquasecurity/trivy/internal/adapters/arm/synapse"
-
- "github.com/aquasecurity/defsec/pkg/providers/azure"
- "github.com/aquasecurity/defsec/pkg/state"
  scanner "github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
 )
 

diff --git a/internal/adapters/arm/storage/adapt.go b/internal/adapters/arm/storage/adapt.go
@@ -4,9 +4,8 @@ import (
  "strings"
 
  "github.com/aquasecurity/defsec/pkg/providers/azure/storage"
- "github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
-
  "github.com/aquasecurity/defsec/pkg/types"
+ "github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
 )
 
 func Adapt(deployment azure.Deployment) storage.Storage {

diff --git a/internal/adapters/cloudformation/aws/accessanalyzer/accessanalyzer.go b/internal/adapters/cloudformation/aws/accessanalyzer/accessanalyzer.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts accessanalyzer resources
 func Adapt(cfFile parser.FileContext) accessanalyzer.AccessAnalyzer {
  return accessanalyzer.AccessAnalyzer{
  Analyzers: getAccessAnalyzer(cfFile),

diff --git a/internal/adapters/cloudformation/aws/apigateway/apigateway.go b/internal/adapters/cloudformation/aws/apigateway/apigateway.go
@@ -7,7 +7,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts apigateway resources
 func Adapt(cfFile parser.FileContext) apigateway.APIGateway {
  return apigateway.APIGateway{
  V1: v1.APIGateway{

diff --git a/internal/adapters/cloudformation/aws/athena/athena.go b/internal/adapters/cloudformation/aws/athena/athena.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts athena resources
 func Adapt(cfFile parser.FileContext) athena.Athena {
  return athena.Athena{
  Databases: nil,

diff --git a/internal/adapters/cloudformation/aws/cloudfront/cloudfront.go b/internal/adapters/cloudformation/aws/cloudfront/cloudfront.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts cloudfront resources
 func Adapt(cfFile parser.FileContext) cloudfront.Cloudfront {
  return cloudfront.Cloudfront{
  Distributions: getDistributions(cfFile),

diff --git a/internal/adapters/cloudformation/aws/cloudtrail/cloudtrail.go b/internal/adapters/cloudformation/aws/cloudtrail/cloudtrail.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts cloudtrail resources
 func Adapt(cfFile parser.FileContext) cloudtrail.CloudTrail {
  return cloudtrail.CloudTrail{
  Trails: getCloudTrails(cfFile),

diff --git a/internal/adapters/cloudformation/aws/cloudwatch/cloudwatch.go b/internal/adapters/cloudformation/aws/cloudwatch/cloudwatch.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts cloudwatch resources
 func Adapt(cfFile parser.FileContext) cloudwatch.CloudWatch {
  return cloudwatch.CloudWatch{
  LogGroups: getLogGroups(cfFile),

diff --git a/internal/adapters/cloudformation/aws/codebuild/codebuild.go b/internal/adapters/cloudformation/aws/codebuild/codebuild.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts codebuild resources
 func Adapt(cfFile parser.FileContext) codebuild.CodeBuild {
  return codebuild.CodeBuild{
  Projects: getProjects(cfFile),

diff --git a/internal/adapters/cloudformation/aws/config/config.go b/internal/adapters/cloudformation/aws/config/config.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts config resources
 func Adapt(cfFile parser.FileContext) config.Config {
  return config.Config{
  ConfigurationAggregrator: getConfigurationAggregator(cfFile),

diff --git a/internal/adapters/cloudformation/aws/documentdb/documentdb.go b/internal/adapters/cloudformation/aws/documentdb/documentdb.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts documentdb resources
 func Adapt(cfFile parser.FileContext) documentdb.DocumentDB {
  return documentdb.DocumentDB{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/dynamodb/dynamodb.go b/internal/adapters/cloudformation/aws/dynamodb/dynamodb.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts dynamodb resources
 func Adapt(cfFile parser.FileContext) dynamodb.DynamoDB {
  return dynamodb.DynamoDB{
  DAXClusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/ec2/nacl.go b/internal/adapters/cloudformation/aws/ec2/nacl.go
@@ -3,10 +3,8 @@ package ec2
 import (
  "strconv"
 
- defsecTypes "github.com/aquasecurity/defsec/pkg/types"
-
  "github.com/aquasecurity/defsec/pkg/providers/aws/ec2"
-
+ defsecTypes "github.com/aquasecurity/defsec/pkg/types"
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 

diff --git a/internal/adapters/cloudformation/aws/ecr/ecr.go b/internal/adapters/cloudformation/aws/ecr/ecr.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts ecr resources
 func Adapt(cfFile parser.FileContext) ecr.ECR {
  return ecr.ECR{
  Repositories: getRepositories(cfFile),

diff --git a/internal/adapters/cloudformation/aws/ecr/repository.go b/internal/adapters/cloudformation/aws/ecr/repository.go
@@ -3,14 +3,12 @@ package ecr
 import (
  "fmt"
 
- defsecTypes "github.com/aquasecurity/defsec/pkg/types"
-
- "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
+ "github.com/liamg/iamgo"
 
  "github.com/aquasecurity/defsec/pkg/providers/aws/ecr"
  "github.com/aquasecurity/defsec/pkg/providers/aws/iam"
-
- "github.com/liamg/iamgo"
+ defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+ "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
 func getRepositories(ctx parser.FileContext) (repositories []ecr.Repository) {

diff --git a/internal/adapters/cloudformation/aws/ecs/ecs.go b/internal/adapters/cloudformation/aws/ecs/ecs.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts ecs resources
 func Adapt(cfFile parser.FileContext) ecs.ECS {
  return ecs.ECS{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/efs/efs.go b/internal/adapters/cloudformation/aws/efs/efs.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts efs resources
 func Adapt(cfFile parser.FileContext) efs.EFS {
  return efs.EFS{
  FileSystems: getFileSystems(cfFile),

diff --git a/internal/adapters/cloudformation/aws/eks/eks.go b/internal/adapters/cloudformation/aws/eks/eks.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts eks resources
 func Adapt(cfFile parser.FileContext) eks.EKS {
  return eks.EKS{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/elasticache/elasticache.go b/internal/adapters/cloudformation/aws/elasticache/elasticache.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts elasticache resources
 func Adapt(cfFile parser.FileContext) elasticache.ElastiCache {
  return elasticache.ElastiCache{
  Clusters: getClusterGroups(cfFile),

diff --git a/internal/adapters/cloudformation/aws/elasticsearch/elasticsearch.go b/internal/adapters/cloudformation/aws/elasticsearch/elasticsearch.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts elasticsearch resources
 func Adapt(cfFile parser.FileContext) elasticsearch.Elasticsearch {
  return elasticsearch.Elasticsearch{
  Domains: getDomains(cfFile),

diff --git a/internal/adapters/cloudformation/aws/elb/elb.go b/internal/adapters/cloudformation/aws/elb/elb.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts elb resources
 func Adapt(cfFile parser.FileContext) elb.ELB {
  return elb.ELB{
  LoadBalancers: getLoadBalancers(cfFile),

diff --git a/internal/adapters/cloudformation/aws/iam/iam.go b/internal/adapters/cloudformation/aws/iam/iam.go
@@ -6,7 +6,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts iam resources
 func Adapt(cfFile parser.FileContext) iam.IAM {
  return iam.IAM{
  PasswordPolicy: iam.PasswordPolicy{

diff --git a/internal/adapters/cloudformation/aws/iam/policy.go b/internal/adapters/cloudformation/aws/iam/policy.go
@@ -1,10 +1,11 @@
 package iam
 
 import (
+ "github.com/liamg/iamgo"
+
  "github.com/aquasecurity/defsec/pkg/providers/aws/iam"
  defsecTypes "github.com/aquasecurity/defsec/pkg/types"
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
- "github.com/liamg/iamgo"
 )
 
 func getPolicies(ctx parser.FileContext) (policies []iam.Policy) {

diff --git a/internal/adapters/cloudformation/aws/kinesis/kinesis.go b/internal/adapters/cloudformation/aws/kinesis/kinesis.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts kinesis resources
 func Adapt(cfFile parser.FileContext) kinesis.Kinesis {
  return kinesis.Kinesis{
  Streams: getStreams(cfFile),

diff --git a/internal/adapters/cloudformation/aws/lambda/lambda.go b/internal/adapters/cloudformation/aws/lambda/lambda.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts lambda resources
 func Adapt(cfFile parser.FileContext) lambda.Lambda {
  return lambda.Lambda{
  Functions: getFunctions(cfFile),

diff --git a/internal/adapters/cloudformation/aws/mq/mq.go b/internal/adapters/cloudformation/aws/mq/mq.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts mq resources
 func Adapt(cfFile parser.FileContext) mq.MQ {
  return mq.MQ{
  Brokers: getBrokers(cfFile),

diff --git a/internal/adapters/cloudformation/aws/msk/msk.go b/internal/adapters/cloudformation/aws/msk/msk.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts msk resources
 func Adapt(cfFile parser.FileContext) msk.MSK {
  return msk.MSK{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/neptune/neptune.go b/internal/adapters/cloudformation/aws/neptune/neptune.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts neptune resources
 func Adapt(cfFile parser.FileContext) neptune.Neptune {
  return neptune.Neptune{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/rds/rds.go b/internal/adapters/cloudformation/aws/rds/rds.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts rds resources
 func Adapt(cfFile parser.FileContext) rds.RDS {
  clusters, orphans := getClustersAndInstances(cfFile)
  return rds.RDS{

diff --git a/internal/adapters/cloudformation/aws/redshift/redshift.go b/internal/adapters/cloudformation/aws/redshift/redshift.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts redshift resources
 func Adapt(cfFile parser.FileContext) redshift.Redshift {
  return redshift.Redshift{
  Clusters: getClusters(cfFile),

diff --git a/internal/adapters/cloudformation/aws/s3/bucket.go b/internal/adapters/cloudformation/aws/s3/bucket.go
@@ -4,9 +4,8 @@ import (
  "regexp"
  "strings"
 
- defsecTypes "github.com/aquasecurity/defsec/pkg/types"
-
  "github.com/aquasecurity/defsec/pkg/providers/aws/s3"
+ defsecTypes "github.com/aquasecurity/defsec/pkg/types"
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 

diff --git a/internal/adapters/cloudformation/aws/s3/s3.go b/internal/adapters/cloudformation/aws/s3/s3.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts s3 resources
 func Adapt(cfFile parser.FileContext) s3.S3 {
  return s3.S3{
  Buckets: getBuckets(cfFile),

diff --git a/internal/adapters/cloudformation/aws/sam/function.go b/internal/adapters/cloudformation/aws/sam/function.go
@@ -1,11 +1,12 @@
 package sam
 
 import (
+ "github.com/liamg/iamgo"
+
  "github.com/aquasecurity/defsec/pkg/providers/aws/iam"
  "github.com/aquasecurity/defsec/pkg/providers/aws/sam"
  defsecTypes "github.com/aquasecurity/defsec/pkg/types"
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
- "github.com/liamg/iamgo"
 )
 
 func getFunctions(cfFile parser.FileContext) (functions []sam.Function) {

diff --git a/internal/adapters/cloudformation/aws/sam/sam.go b/internal/adapters/cloudformation/aws/sam/sam.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts sam resources
 func Adapt(cfFile parser.FileContext) sam.SAM {
  return sam.SAM{
  APIs: getApis(cfFile),

diff --git a/internal/adapters/cloudformation/aws/sam/state_machines.go b/internal/adapters/cloudformation/aws/sam/state_machines.go
@@ -1,11 +1,12 @@
 package sam
 
 import (
+ "github.com/liamg/iamgo"
+
  "github.com/aquasecurity/defsec/pkg/providers/aws/iam"
  "github.com/aquasecurity/defsec/pkg/providers/aws/sam"
  defsecTypes "github.com/aquasecurity/defsec/pkg/types"
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
- "github.com/liamg/iamgo"
 )
 
 func getStateMachines(cfFile parser.FileContext) (stateMachines []sam.StateMachine) {

diff --git a/internal/adapters/cloudformation/aws/sns/sns.go b/internal/adapters/cloudformation/aws/sns/sns.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts sns resources
 func Adapt(cfFile parser.FileContext) sns.SNS {
  return sns.SNS{
  Topics: getTopics(cfFile),

diff --git a/internal/adapters/cloudformation/aws/sqs/queue.go b/internal/adapters/cloudformation/aws/sqs/queue.go
@@ -3,14 +3,12 @@ package sqs
 import (
  "fmt"
 
- defsecTypes "github.com/aquasecurity/defsec/pkg/types"
-
- "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
+ "github.com/liamg/iamgo"
 
  "github.com/aquasecurity/defsec/pkg/providers/aws/iam"
  "github.com/aquasecurity/defsec/pkg/providers/aws/sqs"
-
- "github.com/liamg/iamgo"
+ defsecTypes "github.com/aquasecurity/defsec/pkg/types"
+ "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
 func getQueues(ctx parser.FileContext) (queues []sqs.Queue) {

diff --git a/internal/adapters/cloudformation/aws/sqs/sqs.go b/internal/adapters/cloudformation/aws/sqs/sqs.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts sqs resources
 func Adapt(cfFile parser.FileContext) sqs.SQS {
  return sqs.SQS{
  Queues: getQueues(cfFile),

diff --git a/internal/adapters/cloudformation/aws/ssm/ssm.go b/internal/adapters/cloudformation/aws/ssm/ssm.go
@@ -5,7 +5,7 @@ import (
  "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser"
 )
 
-// Adapt ...
+// Adapt adapts ssm resources
 func Adapt(cfFile parser.FileContext) ssm.SSM {
  return ssm.SSM{
  Secrets: getSecrets(cfFile),