From cc66d6d00f1216662af7e75824562fff5761aac9 Mon Sep 17 00:00:00 2001 From: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:07:45 +0600 Subject: [PATCH] chore(deps): use aqua forks for `github.com/liamg/jfather` and `github.com/liamg/iamgo` (#8289) --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/dependency/parser/c/conan/parse.go | 2 +- pkg/dependency/parser/dotnet/core_deps/parse.go | 2 +- pkg/dependency/parser/nodejs/npm/parse.go | 2 +- pkg/dependency/parser/nuget/lock/parse.go | 2 +- pkg/dependency/parser/php/composer/parse.go | 2 +- pkg/dependency/parser/python/pipenv/parse.go | 2 +- pkg/dependency/parser/sbt/lockfile/parse.go | 2 +- pkg/dependency/parser/swift/swift/parse.go | 2 +- pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go | 3 +-- pkg/iac/adapters/cloudformation/aws/ecr/repository.go | 3 +-- pkg/iac/adapters/cloudformation/aws/iam/iam_test.go | 3 +-- pkg/iac/adapters/cloudformation/aws/iam/policy.go | 3 +-- pkg/iac/adapters/cloudformation/aws/s3/bucket.go | 2 +- pkg/iac/adapters/cloudformation/aws/s3/s3_test.go | 3 +-- pkg/iac/adapters/cloudformation/aws/sam/function.go | 3 +-- pkg/iac/adapters/cloudformation/aws/sam/sam_test.go | 3 +-- pkg/iac/adapters/cloudformation/aws/sam/state_machines.go | 3 +-- pkg/iac/adapters/cloudformation/aws/sqs/queue.go | 3 +-- pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go | 3 +-- pkg/iac/adapters/terraform/aws/ecr/adapt.go | 3 +-- pkg/iac/adapters/terraform/aws/ecr/adapt_test.go | 2 +- pkg/iac/adapters/terraform/aws/iam/convert.go | 3 +-- pkg/iac/adapters/terraform/aws/iam/policies.go | 3 +-- pkg/iac/adapters/terraform/aws/iam/policies_test.go | 3 +-- pkg/iac/adapters/terraform/aws/iam/roles_test.go | 3 +-- pkg/iac/adapters/terraform/aws/s3/adapt_test.go | 2 +- pkg/iac/adapters/terraform/aws/sqs/adapt.go | 2 +- pkg/iac/adapters/terraform/aws/sqs/adapt_test.go | 2 +- pkg/iac/providers/aws/iam/iam.go | 3 +-- pkg/iac/scanners/cloudformation/parser/parameter.go | 2 +- pkg/iac/scanners/cloudformation/parser/parser.go | 2 +- pkg/iac/scanners/cloudformation/parser/property.go | 2 +- pkg/iac/scanners/cloudformation/parser/resource.go | 2 +- pkg/iac/scanners/cloudformation/parser/util.go | 2 +- 36 files changed, 40 insertions(+), 56 deletions(-) diff --git a/go.mod b/go.mod index feb7a1abc0..cb15ddf375 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,8 @@ require ( github.com/aquasecurity/go-npm-version v0.0.0-20201110091526-0b796d180798 github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46 github.com/aquasecurity/go-version v0.0.1 + github.com/aquasecurity/iamgo v0.0.10 + github.com/aquasecurity/jfather v0.0.8 github.com/aquasecurity/table v1.8.0 github.com/aquasecurity/testdocker v0.0.0-20240730042311-4642e94c7fc8 github.com/aquasecurity/tml v0.6.1 @@ -72,8 +74,6 @@ require ( github.com/knqyf263/go-rpmdb v0.1.1 github.com/knqyf263/nested v0.0.1 github.com/kylelemons/godebug v1.1.0 - github.com/liamg/iamgo v0.0.9 - github.com/liamg/jfather v0.0.7 github.com/liamg/memoryfs v1.6.0 github.com/magefile/mage v1.15.0 github.com/masahiro331/go-disk v0.0.0-20240625071113-56c933208fee diff --git a/go.sum b/go.sum index e8225b9e3d..7d4b42f533 100644 --- a/go.sum +++ b/go.sum @@ -794,6 +794,10 @@ github.com/aquasecurity/go-version v0.0.0-20201107203531-5e48ac5d022a/go.mod h1: github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492/go.mod h1:9Beu8XsUNNfzml7WBf3QmyPToP1wm1Gj/Vc5UJKqTzU= github.com/aquasecurity/go-version v0.0.1 h1:4cNl516agK0TCn5F7mmYN+xVs1E3S45LkgZk3cbaW2E= github.com/aquasecurity/go-version v0.0.1/go.mod h1:s1UU6/v2hctXcOa3OLwfj5d9yoXHa3ahf+ipSwEvGT0= +github.com/aquasecurity/iamgo v0.0.10 h1:t/HG/MI1eSephztDc+Rzh/YfgEa+NqgYRSfr6pHdSCQ= +github.com/aquasecurity/iamgo v0.0.10/go.mod h1:GI9IQJL2a+C+V2+i3vcwnNKuIJXZ+HAfqxZytwy+cPk= +github.com/aquasecurity/jfather v0.0.8 h1:tUjPoLGdlkJU0qE7dSzd1MHk2nQFNPR0ZfF+6shaExE= +github.com/aquasecurity/jfather v0.0.8/go.mod h1:Ag+L/KuR/f8vn8okUi8Wc1d7u8yOpi2QTaGX10h71oY= github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7tv0= github.com/aquasecurity/table v1.8.0/go.mod h1:eqOmvjjB7AhXFgFqpJUEE/ietg7RrMSJZXyTN8E/wZw= github.com/aquasecurity/testdocker v0.0.0-20240730042311-4642e94c7fc8 h1:b43UVqYjz7qDqK+cVOtF2Lk6CxjytYItP6Pgf3wGsNE= @@ -1505,10 +1509,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ= github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk= -github.com/liamg/iamgo v0.0.9 h1:tADGm3xVotyRJmuKKaH4+zsBn7LOcvgdpuF3WsSKW3c= -github.com/liamg/iamgo v0.0.9/go.mod h1:Kk6ZxBF/GQqG9nnaUjIi6jf+WXNpeOTyhwc6gnguaZQ= -github.com/liamg/jfather v0.0.7 h1:Xf78zS263yfT+xr2VSo6+kyAy4ROlCacRqJG7s5jt4k= -github.com/liamg/jfather v0.0.7/go.mod h1:xXBGiBoiZ6tmHhfy5Jzw8sugzajwYdi6VosIpB3/cPM= github.com/liamg/memoryfs v1.6.0 h1:jAFec2HI1PgMTem5gR7UT8zi9u4BfG5jorCRlLH06W8= github.com/liamg/memoryfs v1.6.0/go.mod h1:z7mfqXFQS8eSeBBsFjYLlxYRMRyiPktytvYCYTb3BSk= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= diff --git a/pkg/dependency/parser/c/conan/parse.go b/pkg/dependency/parser/c/conan/parse.go index 14da9358fb..cb277692bb 100644 --- a/pkg/dependency/parser/c/conan/parse.go +++ b/pkg/dependency/parser/c/conan/parse.go @@ -5,10 +5,10 @@ import ( "slices" "strings" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" diff --git a/pkg/dependency/parser/dotnet/core_deps/parse.go b/pkg/dependency/parser/dotnet/core_deps/parse.go index 7fc8d3df5d..b7cdfe4c1b 100644 --- a/pkg/dependency/parser/dotnet/core_deps/parse.go +++ b/pkg/dependency/parser/dotnet/core_deps/parse.go @@ -6,10 +6,10 @@ import ( "strings" "sync" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" diff --git a/pkg/dependency/parser/nodejs/npm/parse.go b/pkg/dependency/parser/nodejs/npm/parse.go index eae16752ce..1e3a5b8344 100644 --- a/pkg/dependency/parser/nodejs/npm/parse.go +++ b/pkg/dependency/parser/nodejs/npm/parse.go @@ -9,10 +9,10 @@ import ( "sort" "strings" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" "github.com/aquasecurity/trivy/pkg/dependency/parser/utils" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" diff --git a/pkg/dependency/parser/nuget/lock/parse.go b/pkg/dependency/parser/nuget/lock/parse.go index 812a045158..3e9bd8b2ba 100644 --- a/pkg/dependency/parser/nuget/lock/parse.go +++ b/pkg/dependency/parser/nuget/lock/parse.go @@ -3,10 +3,10 @@ package lock import ( "io" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" "github.com/aquasecurity/trivy/pkg/dependency/parser/utils" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" diff --git a/pkg/dependency/parser/php/composer/parse.go b/pkg/dependency/parser/php/composer/parse.go index af99ceaf8b..01cdf328ae 100644 --- a/pkg/dependency/parser/php/composer/parse.go +++ b/pkg/dependency/parser/php/composer/parse.go @@ -5,10 +5,10 @@ import ( "sort" "strings" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/licensing" diff --git a/pkg/dependency/parser/python/pipenv/parse.go b/pkg/dependency/parser/python/pipenv/parse.go index 8fbb70132c..6538b43cc2 100644 --- a/pkg/dependency/parser/python/pipenv/parse.go +++ b/pkg/dependency/parser/python/pipenv/parse.go @@ -4,9 +4,9 @@ import ( "io" "strings" - "github.com/liamg/jfather" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" xio "github.com/aquasecurity/trivy/pkg/x/io" ) diff --git a/pkg/dependency/parser/sbt/lockfile/parse.go b/pkg/dependency/parser/sbt/lockfile/parse.go index 3b5b186590..040a490c83 100644 --- a/pkg/dependency/parser/sbt/lockfile/parse.go +++ b/pkg/dependency/parser/sbt/lockfile/parse.go @@ -5,9 +5,9 @@ import ( "slices" "sort" - "github.com/liamg/jfather" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" xio "github.com/aquasecurity/trivy/pkg/x/io" diff --git a/pkg/dependency/parser/swift/swift/parse.go b/pkg/dependency/parser/swift/swift/parse.go index aefa2a066f..7ebfb84c89 100644 --- a/pkg/dependency/parser/swift/swift/parse.go +++ b/pkg/dependency/parser/swift/swift/parse.go @@ -5,10 +5,10 @@ import ( "sort" "strings" - "github.com/liamg/jfather" "github.com/samber/lo" "golang.org/x/xerrors" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/dependency" ftypes "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/log" diff --git a/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go b/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go index 6bcd0a4952..bf411dddbf 100644 --- a/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go +++ b/pkg/iac/adapters/cloudformation/aws/ecr/ecr_test.go @@ -3,8 +3,7 @@ package ecr import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/cloudformation/aws/ecr/repository.go b/pkg/iac/adapters/cloudformation/aws/ecr/repository.go index 0bb8e6c626..e0491c121b 100644 --- a/pkg/iac/adapters/cloudformation/aws/ecr/repository.go +++ b/pkg/iac/adapters/cloudformation/aws/ecr/repository.go @@ -3,8 +3,7 @@ package ecr import ( "errors" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" diff --git a/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go b/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go index 1ea6a099a6..7f68e2c6ae 100644 --- a/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go +++ b/pkg/iac/adapters/cloudformation/aws/iam/iam_test.go @@ -3,8 +3,7 @@ package iam import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/cloudformation/aws/iam/policy.go b/pkg/iac/adapters/cloudformation/aws/iam/policy.go index f83771f882..d787dac253 100644 --- a/pkg/iac/adapters/cloudformation/aws/iam/policy.go +++ b/pkg/iac/adapters/cloudformation/aws/iam/policy.go @@ -1,8 +1,7 @@ package iam import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" diff --git a/pkg/iac/adapters/cloudformation/aws/s3/bucket.go b/pkg/iac/adapters/cloudformation/aws/s3/bucket.go index ec56894dbe..957278a93a 100644 --- a/pkg/iac/adapters/cloudformation/aws/s3/bucket.go +++ b/pkg/iac/adapters/cloudformation/aws/s3/bucket.go @@ -7,8 +7,8 @@ import ( "strings" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/liamg/iamgo" + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/s3" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" diff --git a/pkg/iac/adapters/cloudformation/aws/s3/s3_test.go b/pkg/iac/adapters/cloudformation/aws/s3/s3_test.go index 707aae028f..87ca88a974 100644 --- a/pkg/iac/adapters/cloudformation/aws/s3/s3_test.go +++ b/pkg/iac/adapters/cloudformation/aws/s3/s3_test.go @@ -3,8 +3,7 @@ package s3 import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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/s3" diff --git a/pkg/iac/adapters/cloudformation/aws/sam/function.go b/pkg/iac/adapters/cloudformation/aws/sam/function.go index 161b078bf6..2bfc488e1a 100644 --- a/pkg/iac/adapters/cloudformation/aws/sam/function.go +++ b/pkg/iac/adapters/cloudformation/aws/sam/function.go @@ -1,8 +1,7 @@ package sam import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" diff --git a/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go b/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go index 1d95867750..9bd8ab6bd6 100644 --- a/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go +++ b/pkg/iac/adapters/cloudformation/aws/sam/sam_test.go @@ -3,8 +3,7 @@ package sam import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/cloudformation/aws/sam/state_machines.go b/pkg/iac/adapters/cloudformation/aws/sam/state_machines.go index 2a57afd2bd..5b1be5618e 100644 --- a/pkg/iac/adapters/cloudformation/aws/sam/state_machines.go +++ b/pkg/iac/adapters/cloudformation/aws/sam/state_machines.go @@ -1,8 +1,7 @@ package sam import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sam" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" diff --git a/pkg/iac/adapters/cloudformation/aws/sqs/queue.go b/pkg/iac/adapters/cloudformation/aws/sqs/queue.go index a2e647083f..a260fa00e0 100644 --- a/pkg/iac/adapters/cloudformation/aws/sqs/queue.go +++ b/pkg/iac/adapters/cloudformation/aws/sqs/queue.go @@ -3,8 +3,7 @@ package sqs import ( "errors" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser" diff --git a/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go b/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go index 5e7fe278fc..634eddea9a 100644 --- a/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go +++ b/pkg/iac/adapters/cloudformation/aws/sqs/sqs_test.go @@ -3,8 +3,7 @@ package sqs import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/terraform/aws/ecr/adapt.go b/pkg/iac/adapters/terraform/aws/ecr/adapt.go index 57d5686dc7..90a66ba098 100644 --- a/pkg/iac/adapters/terraform/aws/ecr/adapt.go +++ b/pkg/iac/adapters/terraform/aws/ecr/adapt.go @@ -1,8 +1,7 @@ package ecr import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr" iamp "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" diff --git a/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go b/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go index f2fb4d3dc9..71904d8932 100644 --- a/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/ecr/adapt_test.go @@ -3,10 +3,10 @@ package ecr import ( "testing" - "github.com/liamg/iamgo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/internal/testutil" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/tftestutil" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/ecr" diff --git a/pkg/iac/adapters/terraform/aws/iam/convert.go b/pkg/iac/adapters/terraform/aws/iam/convert.go index 3a61791e5f..dcc61cd6bc 100644 --- a/pkg/iac/adapters/terraform/aws/iam/convert.go +++ b/pkg/iac/adapters/terraform/aws/iam/convert.go @@ -3,8 +3,7 @@ package iam import ( "strings" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/scan" "github.com/aquasecurity/trivy/pkg/iac/terraform" diff --git a/pkg/iac/adapters/terraform/aws/iam/policies.go b/pkg/iac/adapters/terraform/aws/iam/policies.go index 94b132eddf..7b662d3e5d 100644 --- a/pkg/iac/adapters/terraform/aws/iam/policies.go +++ b/pkg/iac/adapters/terraform/aws/iam/policies.go @@ -1,8 +1,7 @@ package iam import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/terraform" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" diff --git a/pkg/iac/adapters/terraform/aws/iam/policies_test.go b/pkg/iac/adapters/terraform/aws/iam/policies_test.go index a1e989c069..94cc412fc5 100644 --- a/pkg/iac/adapters/terraform/aws/iam/policies_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/policies_test.go @@ -3,8 +3,7 @@ package iam import ( "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/terraform/aws/iam/roles_test.go b/pkg/iac/adapters/terraform/aws/iam/roles_test.go index 93bc5a9e81..803faf6bfb 100644 --- a/pkg/iac/adapters/terraform/aws/iam/roles_test.go +++ b/pkg/iac/adapters/terraform/aws/iam/roles_test.go @@ -4,8 +4,7 @@ import ( "sort" "testing" - "github.com/liamg/iamgo" - + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/terraform/aws/s3/adapt_test.go b/pkg/iac/adapters/terraform/aws/s3/adapt_test.go index ea12206f31..b64b1e8d43 100644 --- a/pkg/iac/adapters/terraform/aws/s3/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/s3/adapt_test.go @@ -3,10 +3,10 @@ package s3 import ( "testing" - "github.com/liamg/iamgo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/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" diff --git a/pkg/iac/adapters/terraform/aws/sqs/adapt.go b/pkg/iac/adapters/terraform/aws/sqs/adapt.go index 432bda06ed..1e40138b47 100644 --- a/pkg/iac/adapters/terraform/aws/sqs/adapt.go +++ b/pkg/iac/adapters/terraform/aws/sqs/adapt.go @@ -2,8 +2,8 @@ package sqs import ( "github.com/google/uuid" - "github.com/liamg/iamgo" + "github.com/aquasecurity/iamgo" "github.com/aquasecurity/trivy/pkg/iac/adapters/terraform/aws/iam" iamp "github.com/aquasecurity/trivy/pkg/iac/providers/aws/iam" "github.com/aquasecurity/trivy/pkg/iac/providers/aws/sqs" diff --git a/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go b/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go index 0a47261404..c9e08a1df8 100644 --- a/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go +++ b/pkg/iac/adapters/terraform/aws/sqs/adapt_test.go @@ -3,10 +3,10 @@ package sqs import ( "testing" - "github.com/liamg/iamgo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/aquasecurity/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" diff --git a/pkg/iac/providers/aws/iam/iam.go b/pkg/iac/providers/aws/iam/iam.go index 7bec336a89..9a90a857c9 100644 --- a/pkg/iac/providers/aws/iam/iam.go +++ b/pkg/iac/providers/aws/iam/iam.go @@ -1,8 +1,7 @@ package iam import ( - "github.com/liamg/iamgo" - + "github.com/aquasecurity/iamgo" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) diff --git a/pkg/iac/scanners/cloudformation/parser/parameter.go b/pkg/iac/scanners/cloudformation/parser/parameter.go index 5581ea5ab8..4cfdfd1705 100644 --- a/pkg/iac/scanners/cloudformation/parser/parameter.go +++ b/pkg/iac/scanners/cloudformation/parser/parameter.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/liamg/jfather" "gopkg.in/yaml.v3" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" ) diff --git a/pkg/iac/scanners/cloudformation/parser/parser.go b/pkg/iac/scanners/cloudformation/parser/parser.go index 24d85ba4bb..eda88408ec 100644 --- a/pkg/iac/scanners/cloudformation/parser/parser.go +++ b/pkg/iac/scanners/cloudformation/parser/parser.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/liamg/jfather" "gopkg.in/yaml.v3" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/iac/ignore" "github.com/aquasecurity/trivy/pkg/log" ) diff --git a/pkg/iac/scanners/cloudformation/parser/property.go b/pkg/iac/scanners/cloudformation/parser/property.go index 4748126e08..606b9d28b3 100644 --- a/pkg/iac/scanners/cloudformation/parser/property.go +++ b/pkg/iac/scanners/cloudformation/parser/property.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/liamg/jfather" "gopkg.in/yaml.v3" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) diff --git a/pkg/iac/scanners/cloudformation/parser/resource.go b/pkg/iac/scanners/cloudformation/parser/resource.go index ed4b2834d5..b5910c144b 100644 --- a/pkg/iac/scanners/cloudformation/parser/resource.go +++ b/pkg/iac/scanners/cloudformation/parser/resource.go @@ -4,9 +4,9 @@ import ( "io/fs" "strings" - "github.com/liamg/jfather" "gopkg.in/yaml.v3" + "github.com/aquasecurity/jfather" iacTypes "github.com/aquasecurity/trivy/pkg/iac/types" ) diff --git a/pkg/iac/scanners/cloudformation/parser/util.go b/pkg/iac/scanners/cloudformation/parser/util.go index 5ee61de17b..c6babcb7a8 100644 --- a/pkg/iac/scanners/cloudformation/parser/util.go +++ b/pkg/iac/scanners/cloudformation/parser/util.go @@ -3,9 +3,9 @@ package parser import ( "strconv" - "github.com/liamg/jfather" "gopkg.in/yaml.v3" + "github.com/aquasecurity/jfather" "github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/cftypes" "github.com/aquasecurity/trivy/pkg/iac/scanners/kubernetes/parser" )