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: fileset, toset, dep updates #195

Merged
merged 20 commits into from
Apr 24, 2024
Merged

fix: fileset, toset, dep updates #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a9f711f
fix: fileset, toset, dep updates
fwereade Apr 22, 2024
df639c4
lint
fwereade Apr 22, 2024
ea3b2c5
handle windows(?)
fwereade Apr 22, 2024
00e2e76
windows use VolumeName root
fwereade Apr 22, 2024
4d3a06b
debug test for windows
fwereade Apr 22, 2024
a91b052
handle bare list/map var types
fwereade Apr 22, 2024
452bd9a
updated trivy branch
fwereade Apr 22, 2024
2e113bf
add nested module test case
fwereade Apr 22, 2024
a70c089
unwanted files
fwereade Apr 22, 2024
4058f20
windows: only test the bits that work
fwereade Apr 22, 2024
1183fb4
fix easy windows fileset cases
fwereade Apr 22, 2024
3d8d3ef
toslash path and pattern
fwereade Apr 22, 2024
718a5bc
re-enable outside-root fileset test on windows
fwereade Apr 22, 2024
9779bf9
pull in trivy fix
fwereade Apr 22, 2024
117cfb8
to/from slash in FS impl
fwereade Apr 22, 2024
5bda862
updated trivy
fwereade Apr 23, 2024
fd255f9
back to the previous trivy
fwereade Apr 23, 2024
0fc69d4
ugh, just skip windows func tests
fwereade Apr 23, 2024
1284739
latest trivy branch
fwereade Apr 24, 2024
99e657f
unnecessary ToSlash
fwereade Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gotfparse/cmd/tfdump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"os"
"path/filepath"

"github.com/aquasecurity/defsec/pkg/scanners/terraform/parser"
"github.com/aquasecurity/defsec/pkg/terraform"
"github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser"
"github.com/aquasecurity/trivy/pkg/iac/terraform"
"github.com/zclconf/go-cty/cty"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ func dumpBlock(m *terraform.Module, b *terraform.Block) map[string]interface{} {
object := make(map[string]interface{})
object["__full_name__"] = b.FullName()
object["__id__"] = b.ID()
object["__is_count_expanded"] = b.IsCountExpanded()
object["__is_expanded"] = b.IsExpanded()
object["__is_empty__"] = b.IsEmpty()
object["__in_module__"] = b.InModule()
object["__is_nil__"] = b.IsNil()
Expand Down
47 changes: 27 additions & 20 deletions gotfparse/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,77 @@
module github.com/cloud-custodian/tfparse/gotfparse

go 1.18
go 1.22

toolchain go1.22.1

require (
github.com/Jeffail/gabs/v2 v2.7.0
github.com/aquasecurity/defsec v0.93.1
github.com/aquasecurity/trivy v0.50.1
github.com/hashicorp/hcl/v2 v2.19.1
github.com/zclconf/go-cty v1.14.1
)

require (
cloud.google.com/go v0.111.0 // indirect
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/aws/aws-sdk-go v1.49.16 // indirect
github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492 // indirect
github.com/aws/aws-sdk-go v1.49.21 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.3 // indirect
github.com/hashicorp/go-getter v1.7.4 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/samber/lo v1.39.0 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/zclconf/go-cty-yaml v1.0.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.155.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

replace github.com/aquasecurity/defsec v0.93.1 => github.com/cloud-custodian/defsec v0.93.2-0.20240322122006-69f7f1796542
replace github.com/aquasecurity/trivy v0.50.1 => github.com/cloud-custodian/trivy v0.0.0-20240424083515-3f81c1ae3a4b
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged cloud-custodian/trivy#1 so this hash could be updated, but as discussed separately that's not a critical change

Loading