Skip to content

Commit ab173d3

Browse files
authored
chore: discard logs by default (#138)
Logs should be instanced. The caller can define where the logs go. Updated trivy to include this merge: aquasecurity/trivy#8738
1 parent e6a60ff commit ab173d3

File tree

3 files changed

+146
-129
lines changed

3 files changed

+146
-129
lines changed

go.mod

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,54 @@ require (
2020
github.com/jedib0t/go-pretty/v6 v6.6.7
2121
github.com/quasilyte/go-ruleguard/dsl v0.3.22
2222
github.com/stretchr/testify v1.10.0
23-
github.com/zclconf/go-cty v1.16.2
23+
github.com/zclconf/go-cty v1.16.3
2424
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
2525
)
2626

2727
require (
28-
cel.dev/expr v0.19.0 // indirect
29-
cloud.google.com/go v0.116.0 // indirect
30-
cloud.google.com/go/auth v0.14.0 // indirect
31-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
28+
cel.dev/expr v0.20.0 // indirect
29+
cloud.google.com/go v0.118.3 // indirect
30+
cloud.google.com/go/auth v0.15.0 // indirect
31+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3232
cloud.google.com/go/compute/metadata v0.6.0 // indirect
33-
cloud.google.com/go/iam v1.2.2 // indirect
34-
cloud.google.com/go/monitoring v1.21.2 // indirect
35-
cloud.google.com/go/storage v1.49.0 // indirect
36-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
37-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
38-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
33+
cloud.google.com/go/iam v1.4.1 // indirect
34+
cloud.google.com/go/monitoring v1.24.0 // indirect
35+
cloud.google.com/go/storage v1.50.0 // indirect
36+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
37+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
38+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
3939
github.com/ProtonMail/go-crypto v1.1.6 // indirect
4040
github.com/agext/levenshtein v1.2.3 // indirect
4141
github.com/apparentlymart/go-cidr v1.1.0 // indirect
4242
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4343
github.com/aquasecurity/go-version v0.0.1 // indirect
44-
github.com/aws/aws-sdk-go v1.55.6 // indirect
44+
github.com/aws/aws-sdk-go v1.55.7 // indirect
4545
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
4646
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4747
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
48-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4948
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5049
github.com/charmbracelet/lipgloss v0.8.0 // indirect
51-
github.com/cloudflare/circl v1.6.0 // indirect
52-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
50+
github.com/cloudflare/circl v1.6.1 // indirect
51+
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
5352
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect
5453
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5554
github.com/dlclark/regexp2 v1.11.4 // indirect
5655
github.com/dop251/goja v0.0.0-20241024094426-79f3a7efcdbd // indirect
57-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
58-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
56+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
57+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
5958
github.com/fatih/color v1.18.0 // indirect
6059
github.com/fatih/structtag v1.2.0 // indirect
6160
github.com/felixge/httpsnoop v1.0.4 // indirect
61+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
6262
github.com/go-logr/logr v1.4.2 // indirect
6363
github.com/go-logr/stdr v1.2.2 // indirect
6464
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
65-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6665
github.com/golang/protobuf v1.5.4 // indirect
6766
github.com/google/go-cmp v0.7.0 // indirect
6867
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
6968
github.com/google/s2a-go v0.1.9 // indirect
7069
github.com/google/uuid v1.6.0 // indirect
71-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
70+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
7271
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
7372
github.com/hashicorp/errwrap v1.1.0 // indirect
7473
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -82,7 +81,7 @@ require (
8281
github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect
8382
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
8483
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
85-
github.com/klauspost/compress v1.17.11 // indirect
84+
github.com/klauspost/compress v1.18.0 // indirect
8685
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
8786
github.com/mattn/go-colorable v0.1.14 // indirect
8887
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -101,45 +100,46 @@ require (
101100
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
102101
github.com/rivo/uniseg v0.4.7 // indirect
103102
github.com/robfig/cron/v3 v3.0.1 // indirect
104-
github.com/samber/lo v1.49.1 // indirect
103+
github.com/samber/lo v1.50.0 // indirect
105104
github.com/spf13/pflag v1.0.6 // indirect
105+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
106106
github.com/ulikunitz/xz v0.5.12 // indirect
107107
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
108108
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
109109
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
110110
github.com/zclconf/go-cty-yaml v1.1.0 // indirect
111-
go.opencensus.io v0.24.0 // indirect
111+
github.com/zeebo/errs v1.4.0 // indirect
112112
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
113-
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
113+
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
115+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
116116
go.opentelemetry.io/otel v1.35.0 // indirect
117117
go.opentelemetry.io/otel/metric v1.35.0 // indirect
118-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
119-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
118+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
119+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
120120
go.opentelemetry.io/otel/trace v1.35.0 // indirect
121121
golang.org/x/crypto v0.38.0 // indirect
122-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
122+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
123123
golang.org/x/mod v0.24.0 // indirect
124124
golang.org/x/net v0.40.0 // indirect
125-
golang.org/x/oauth2 v0.26.0 // indirect
125+
golang.org/x/oauth2 v0.28.0 // indirect
126126
golang.org/x/sync v0.14.0 // indirect
127127
golang.org/x/sys v0.33.0 // indirect
128128
golang.org/x/term v0.32.0 // indirect
129129
golang.org/x/text v0.25.0 // indirect
130-
golang.org/x/time v0.10.0 // indirect
130+
golang.org/x/time v0.11.0 // indirect
131131
golang.org/x/tools v0.33.0 // indirect
132-
google.golang.org/api v0.218.0 // indirect
132+
google.golang.org/api v0.228.0 // indirect
133133
google.golang.org/appengine v1.6.8 // indirect
134-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
135-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
136-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
137-
google.golang.org/grpc v1.70.0 // indirect
138-
google.golang.org/protobuf v1.36.5 // indirect
134+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
135+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
137+
google.golang.org/grpc v1.72.0 // indirect
138+
google.golang.org/protobuf v1.36.6 // indirect
139139
gopkg.in/yaml.v3 v3.0.1 // indirect
140140
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
141141
)
142142

143143
// Trivy has some issues that we're floating patches for, and will hopefully
144144
// be upstreamed eventually.
145-
replace github.com/aquasecurity/trivy => github.com/coder/trivy v0.0.0-20250409153844-e6b004bc465a
145+
replace github.com/aquasecurity/trivy => github.com/coder/trivy v0.0.0-20250527170238-9416a59d7019

0 commit comments

Comments
 (0)