Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix tests #6

Merged
merged 6 commits into from
Sep 19, 2023
Merged

fix tests #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
496eae9
fix tests
simar7 Sep 15, 2023
0a38715
fix references
simar7 Sep 18, 2023
0aa9444
fix RegisteredRule issues
simar7 Sep 18, 2023
30a23e6
fix: use RegisteredRule from trivy-policies
nikpivkin Sep 19, 2023
c8beec6
comment out test
simar7 Sep 19, 2023
d7eac3d
fix lint
simar7 Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 5 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nikpivkin/trivy-iac
module github.com/aquasecurity/trivy-iac

go 1.19

Expand All @@ -7,7 +7,8 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/apparentlymart/go-cidr v1.1.0
github.com/aquasecurity/defsec v0.92.0
github.com/aquasecurity/defsec v0.92.1-0.20230918174123-78adefe70b50
github.com/aquasecurity/trivy-policies v0.0.6-0.20230918204638-b8dab51e5a8e
github.com/aws/aws-sdk-go v1.44.245 // indirect
github.com/aws/smithy-go v1.13.5
github.com/bmatcuk/doublestar/v4 v4.6.0
Expand All @@ -21,9 +22,8 @@ require (
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/buildkit v0.11.6
github.com/olekukonko/tablewriter v0.0.5
github.com/open-policy-agent/opa v0.56.0
github.com/open-policy-agent/opa v0.56.0 // indirect
github.com/owenrumney/squealer v1.2.1 // indirect
github.com/simar7/trivy-misconf-rules v0.0.4
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/stretchr/testify v1.8.4
Expand Down Expand Up @@ -66,7 +66,7 @@ require (
github.com/cloudflare/circl v1.3.3 // indirect
github.com/containerd/containerd v1.7.4 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/docker/cli v24.0.5+incompatible // indirect
Expand Down Expand Up @@ -219,7 +219,3 @@ require (
replace github.com/elgohr/go-localstack => github.com/aquasecurity/go-localstack v0.0.0-20220706080605-1ec0e9b8753c

replace oras.land/oras-go => oras.land/oras-go v1.2.4-0.20230801060855-932dd06d38af

replace github.com/simar7/trivy-misconf-rules => github.com/nikpivkin/trivy-misconf-rules v0.0.0-20230907122513-803f46cef021

replace github.com/aquasecurity/defsec => github.com/aquasecurity/defsec v0.92.1-0.20230905012348-ae6078ba0df9
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4t
github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
github.com/aquasecurity/defsec v0.92.1-0.20230905012348-ae6078ba0df9 h1:bB32QdxDTfqZ5oYT+HB3Txqh7jF1Fo2H0xEGDU9BvLo=
github.com/aquasecurity/defsec v0.92.1-0.20230905012348-ae6078ba0df9/go.mod h1:uZIC1NjU5R49619WvZOlhWRpCEf/7KD3Lm8nDKRjq+o=
github.com/aquasecurity/defsec v0.92.1-0.20230918174123-78adefe70b50 h1:W9HkJuhsThNaQg3DX8VVlFA9lnA6SjKUU0CLmFO5Dos=
github.com/aquasecurity/defsec v0.92.1-0.20230918174123-78adefe70b50/go.mod h1:BiRuveI3ATEzIwyg6SUeU7MHuPFczAmYmFmdYQLdSSU=
github.com/aquasecurity/trivy-policies v0.0.6-0.20230918204638-b8dab51e5a8e h1:MnNIVcsNdLsF0gD+Rng04a/G5CbJ8pWsMMDyyBBSz4s=
github.com/aquasecurity/trivy-policies v0.0.6-0.20230918204638-b8dab51e5a8e/go.mod h1:rnMbnfUDCaT+pU1sgin/mVi8m+FO+kktmgD34sGMKR0=
github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
Expand Down Expand Up @@ -315,8 +317,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -757,8 +759,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w=
github.com/nelsam/hel/v2 v2.3.3/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nikpivkin/trivy-misconf-rules v0.0.0-20230907122513-803f46cef021 h1:ni7IXdB/4JYknDAW1OQne6cn2+5JTEM6au/r9+s+ZTM=
github.com/nikpivkin/trivy-misconf-rules v0.0.0-20230907122513-803f46cef021/go.mod h1:7T4/1/NPHsQgE47w5CaYuCm/zj+UwRv+sI9QyFZk7Lc=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
Expand Down
28 changes: 14 additions & 14 deletions internal/adapters/arm/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ package arm
import (
"context"

"github.com/nikpivkin/trivy-iac/internal/adapters/arm/appservice"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/authorization"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/compute"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/container"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/database"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/datafactory"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/datalake"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/keyvault"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/monitor"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/network"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/securitycenter"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/storage"
"github.com/nikpivkin/trivy-iac/internal/adapters/arm/synapse"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/appservice"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/authorization"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/compute"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/container"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/database"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/datafactory"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/datalake"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/keyvault"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/monitor"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/network"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/securitycenter"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/storage"
"github.com/aquasecurity/trivy-iac/internal/adapters/arm/synapse"

"github.com/aquasecurity/defsec/pkg/providers/azure"
"github.com/aquasecurity/defsec/pkg/state"
scanner "github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
scanner "github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

// Adapt ...
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/appservice/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package appservice
import (
"github.com/aquasecurity/defsec/pkg/providers/azure/appservice"
defsecTypes "github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) appservice.AppService {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/authorization/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package authorization

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/authorization"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) authorization.Authorization {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/compute/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package compute
import (
"github.com/aquasecurity/defsec/pkg/providers/azure/compute"
defsecTypes "github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) compute.Compute {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/compute/adapt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"

"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/container/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package container

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/container"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) container.Container {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/database/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package database

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/database"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) database.Database {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/database/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package database

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/database"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func addFirewallRule(resource azure.Resource) []database.FirewallRule {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/database/maria.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package database

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/database"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func adaptMariaDBServers(deployment azure.Deployment) (mariaDbServers []database.MariaDBServer) {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/database/mssql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package database
import (
"github.com/aquasecurity/defsec/pkg/providers/azure/database"
defsecTypes "github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func adaptMSSQLServers(deployment azure.Deployment) (msSQlServers []database.MSSQLServer) {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/database/postgresql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/aquasecurity/defsec/pkg/providers/azure/database"
defsecTypes "github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func adaptPostgreSQLServers(deployment azure.Deployment) (databases []database.PostgreSQLServer) {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/datafactory/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package datafactory

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/datafactory"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) datafactory.DataFactory {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/datalake/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package datalake

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/datalake"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) datalake.DataLake {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/keyvault/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package keyvault

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/keyvault"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) keyvault.KeyVault {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/monitor/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package monitor
import (
"github.com/aquasecurity/defsec/pkg/providers/azure/monitor"
"github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) monitor.Monitor {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/network/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/aquasecurity/defsec/pkg/providers/azure/network"
defsecTypes "github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) network.Network {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/securitycenter/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package securitycenter

import (
"github.com/aquasecurity/defsec/pkg/providers/azure/securitycenter"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) securitycenter.SecurityCenter {
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/storage/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"

"github.com/aquasecurity/defsec/pkg/providers/azure/storage"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"

"github.com/aquasecurity/defsec/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/storage/adapt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storage
import (
"testing"

"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"

"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/arm/synapse/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package synapse
import (
"github.com/aquasecurity/defsec/pkg/providers/azure/synapse"
"github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/azure"
"github.com/aquasecurity/trivy-iac/pkg/scanners/azure"
)

func Adapt(deployment azure.Deployment) synapse.Synapse {
Expand Down
4 changes: 2 additions & 2 deletions internal/adapters/cloudformation/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package cloudformation

import (
"github.com/aquasecurity/defsec/pkg/state"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws"
"github.com/nikpivkin/trivy-iac/pkg/scanners/cloudformation/parser"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws"
"github.com/aquasecurity/trivy-iac/pkg/scanners/cloudformation/parser"
)

// Adapt ...
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/cloudformation/aws/accessanalyzer/accessanalyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package accessanalyzer

import (
"github.com/aquasecurity/defsec/pkg/providers/aws/accessanalyzer"
"github.com/nikpivkin/trivy-iac/pkg/scanners/cloudformation/parser"
"github.com/aquasecurity/trivy-iac/pkg/scanners/cloudformation/parser"
)

// Adapt ...
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/cloudformation/aws/accessanalyzer/analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package accessanalyzer
import (
"github.com/aquasecurity/defsec/pkg/providers/aws/accessanalyzer"
"github.com/aquasecurity/defsec/pkg/types"
"github.com/nikpivkin/trivy-iac/pkg/scanners/cloudformation/parser"
"github.com/aquasecurity/trivy-iac/pkg/scanners/cloudformation/parser"
)

func getAccessAnalyzer(ctx parser.FileContext) (analyzers []accessanalyzer.Analyzer) {
Expand Down
64 changes: 32 additions & 32 deletions internal/adapters/cloudformation/aws/adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@ package aws

import (
"github.com/aquasecurity/defsec/pkg/providers/aws"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/apigateway"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/athena"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/cloudfront"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/cloudtrail"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/cloudwatch"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/codebuild"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/config"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/documentdb"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/dynamodb"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/ec2"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/ecr"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/ecs"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/efs"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/eks"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/elasticache"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/elasticsearch"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/elb"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/iam"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/kinesis"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/lambda"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/mq"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/msk"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/neptune"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/rds"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/redshift"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/s3"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/sam"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/sns"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/sqs"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/ssm"
"github.com/nikpivkin/trivy-iac/internal/adapters/cloudformation/aws/workspaces"
"github.com/nikpivkin/trivy-iac/pkg/scanners/cloudformation/parser"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/apigateway"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/athena"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/cloudfront"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/cloudtrail"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/cloudwatch"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/codebuild"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/config"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/documentdb"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/dynamodb"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/ec2"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/ecr"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/ecs"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/efs"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/eks"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/elasticache"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/elasticsearch"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/elb"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/iam"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/kinesis"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/lambda"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/mq"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/msk"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/neptune"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/rds"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/redshift"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/s3"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/sam"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/sns"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/sqs"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/ssm"
"github.com/aquasecurity/trivy-iac/internal/adapters/cloudformation/aws/workspaces"
"github.com/aquasecurity/trivy-iac/pkg/scanners/cloudformation/parser"
)

// Adapt ...
Expand Down
2 changes: 1 addition & 1 deletion internal/adapters/cloudformation/aws/apigateway/apigateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/aquasecurity/defsec/pkg/providers/aws/apigateway"
v1 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v1"
v2 "github.com/aquasecurity/defsec/pkg/providers/aws/apigateway/v2"
"github.com/nikpivkin/trivy-iac/pkg/scanners/cloudformation/parser"
"github.com/aquasecurity/trivy-iac/pkg/scanners/cloudformation/parser"
)

// Adapt ...
Expand Down
Loading