Skip to content

Commit c07d684

Browse files
authored
fix: update coder/trivy dependency and fix nested locals (#197)
1 parent e145ba3 commit c07d684

5 files changed

Lines changed: 360 additions & 1736 deletions

File tree

go.mod

Lines changed: 80 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/coder/preview
22

3-
go 1.24.4
4-
5-
toolchain go1.24.6
3+
go 1.25.6
64

75
require (
86
cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6
@@ -12,31 +10,31 @@ require (
1210
github.com/coder/websocket v1.8.13
1311
github.com/go-chi/chi v4.1.2+incompatible
1412
github.com/hashicorp/go-cty v1.5.0
15-
github.com/hashicorp/go-version v1.7.0
13+
github.com/hashicorp/go-version v1.8.0
1614
github.com/hashicorp/hc-install v0.9.2
1715
github.com/hashicorp/hcl/v2 v2.24.0
18-
github.com/hashicorp/terraform-exec v0.23.0
19-
github.com/hashicorp/terraform-json v0.25.0
16+
github.com/hashicorp/terraform-exec v0.24.0
17+
github.com/hashicorp/terraform-json v0.27.1
2018
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
2119
github.com/jedib0t/go-pretty/v6 v6.6.7
22-
github.com/quasilyte/go-ruleguard/dsl v0.3.22
23-
github.com/stretchr/testify v1.11.0
24-
github.com/zclconf/go-cty v1.16.3
20+
github.com/quasilyte/go-ruleguard/dsl v0.3.23
21+
github.com/stretchr/testify v1.11.1
22+
github.com/zclconf/go-cty v1.17.0
2523
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
2624
)
2725

2826
require (
2927
cel.dev/expr v0.24.0 // indirect
30-
cloud.google.com/go v0.118.3 // indirect
31-
cloud.google.com/go/auth v0.15.0 // indirect
28+
cloud.google.com/go v0.121.6 // indirect
29+
cloud.google.com/go/auth v0.18.0 // indirect
3230
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
33-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
34-
cloud.google.com/go/iam v1.4.1 // indirect
35-
cloud.google.com/go/monitoring v1.24.0 // indirect
36-
cloud.google.com/go/storage v1.50.0 // indirect
37-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
38-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
39-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
31+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
32+
cloud.google.com/go/iam v1.5.3 // indirect
33+
cloud.google.com/go/monitoring v1.24.3 // indirect
34+
cloud.google.com/go/storage v1.57.1 // indirect
35+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
36+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
37+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
4038
github.com/ProtonMail/go-crypto v1.3.0 // indirect
4139
github.com/agext/levenshtein v1.2.3 // indirect
4240
github.com/alecthomas/chroma v0.10.0 // indirect
@@ -45,45 +43,62 @@ require (
4543
github.com/aquasecurity/go-version v0.0.1 // indirect
4644
github.com/aquasecurity/iamgo v0.0.10 // indirect
4745
github.com/aquasecurity/jfather v0.0.8 // indirect
48-
github.com/aquasecurity/trivy-checks v1.11.3-0.20250604022615-9a7efa7c9169 // indirect
49-
github.com/aws/aws-sdk-go v1.55.7 // indirect
46+
github.com/aquasecurity/trivy-checks v1.12.2-0.20251219190323-79d27547baf5 // indirect
47+
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
48+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
49+
github.com/aws/aws-sdk-go-v2/config v1.32.5 // indirect
50+
github.com/aws/aws-sdk-go-v2/credentials v1.19.5 // indirect
51+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
55+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.14 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.5 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.14 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/s3 v1.92.0 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
65+
github.com/aws/smithy-go v1.24.0 // indirect
5066
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
5167
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
52-
github.com/bmatcuk/doublestar/v4 v4.9.0 // indirect
68+
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
5369
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5470
github.com/charmbracelet/lipgloss v0.8.0 // indirect
55-
github.com/cloudflare/circl v1.6.1 // indirect
56-
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
71+
github.com/cloudflare/circl v1.6.3 // indirect
72+
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
5773
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect
5874
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5975
github.com/dlclark/regexp2 v1.11.4 // indirect
60-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
76+
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
6177
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
6278
github.com/fatih/color v1.18.0 // indirect
6379
github.com/felixge/httpsnoop v1.0.4 // indirect
64-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
80+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6581
github.com/go-logr/logr v1.4.3 // indirect
6682
github.com/go-logr/stdr v1.2.2 // indirect
6783
github.com/golang/protobuf v1.5.4 // indirect
6884
github.com/google/go-cmp v0.7.0 // indirect
69-
github.com/google/go-containerregistry v0.20.6 // indirect
85+
github.com/google/go-containerregistry v0.20.7 // indirect
7086
github.com/google/s2a-go v0.1.9 // indirect
7187
github.com/google/uuid v1.6.0 // indirect
72-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
73-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
88+
github.com/googleapis/enterprise-certificate-proxy v0.3.9 // indirect
89+
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
90+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect
7491
github.com/hashicorp/errwrap v1.1.0 // indirect
7592
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
76-
github.com/hashicorp/go-getter v1.7.8 // indirect
93+
github.com/hashicorp/go-getter v1.8.3 // indirect
7794
github.com/hashicorp/go-hclog v1.6.3 // indirect
7895
github.com/hashicorp/go-multierror v1.1.1 // indirect
7996
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
80-
github.com/hashicorp/go-safetemp v1.0.0 // indirect
8197
github.com/hashicorp/go-uuid v1.0.3 // indirect
8298
github.com/hashicorp/logutils v1.0.0 // indirect
8399
github.com/hashicorp/terraform-plugin-go v0.27.0 // indirect
84100
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
85-
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
86-
github.com/klauspost/compress v1.18.0 // indirect
101+
github.com/klauspost/compress v1.18.1 // indirect
87102
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
88103
github.com/mattn/go-colorable v0.1.14 // indirect
89104
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -92,7 +107,7 @@ require (
92107
github.com/mitchellh/go-homedir v1.1.0 // indirect
93108
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
94109
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
95-
github.com/mitchellh/mapstructure v1.5.0 // indirect
110+
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
96111
github.com/mitchellh/reflectwalk v1.0.2 // indirect
97112
github.com/muesli/reflow v0.3.0 // indirect
98113
github.com/muesli/termenv v0.15.2 // indirect
@@ -103,46 +118,45 @@ require (
103118
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104119
github.com/rivo/uniseg v0.4.7 // indirect
105120
github.com/robfig/cron/v3 v3.0.1 // indirect
106-
github.com/samber/lo v1.51.0 // indirect
107-
github.com/spf13/pflag v1.0.7 // indirect
108-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
109-
github.com/ulikunitz/xz v0.5.12 // indirect
121+
github.com/samber/lo v1.52.0 // indirect
122+
github.com/spf13/pflag v1.0.10 // indirect
123+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
124+
github.com/ulikunitz/xz v0.5.15 // indirect
110125
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
111126
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
112127
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
113128
github.com/zclconf/go-cty-yaml v1.1.0 // indirect
114-
github.com/zeebo/errs v1.4.0 // indirect
115-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
116-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
117-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
118-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
119-
go.opentelemetry.io/otel v1.36.0 // indirect
120-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
121-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
122-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
123-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
124-
golang.org/x/crypto v0.40.0 // indirect
125-
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
126-
golang.org/x/mod v0.26.0 // indirect
127-
golang.org/x/net v0.42.0 // indirect
128-
golang.org/x/oauth2 v0.30.0 // indirect
129-
golang.org/x/sync v0.16.0 // indirect
130-
golang.org/x/sys v0.34.0 // indirect
131-
golang.org/x/term v0.33.0 // indirect
132-
golang.org/x/text v0.27.0 // indirect
133-
golang.org/x/time v0.12.0 // indirect
134-
golang.org/x/tools v0.34.1-0.20250610205101-c26dd3ba555e // indirect
135-
google.golang.org/api v0.228.0 // indirect
129+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
130+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
131+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
132+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
133+
go.opentelemetry.io/otel v1.40.0 // indirect
134+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
135+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
136+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
137+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
138+
golang.org/x/crypto v0.46.0 // indirect
139+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
140+
golang.org/x/mod v0.31.0 // indirect
141+
golang.org/x/net v0.48.0 // indirect
142+
golang.org/x/oauth2 v0.34.0 // indirect
143+
golang.org/x/sync v0.19.0 // indirect
144+
golang.org/x/sys v0.40.0 // indirect
145+
golang.org/x/term v0.38.0 // indirect
146+
golang.org/x/text v0.32.0 // indirect
147+
golang.org/x/time v0.14.0 // indirect
148+
golang.org/x/tools v0.40.0 // indirect
149+
google.golang.org/api v0.260.0 // indirect
136150
google.golang.org/appengine v1.6.8 // indirect
137-
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
138-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
139-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
140-
google.golang.org/grpc v1.72.2 // indirect
141-
google.golang.org/protobuf v1.36.6 // indirect
151+
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
152+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
153+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
154+
google.golang.org/grpc v1.78.0 // indirect
155+
google.golang.org/protobuf v1.36.11 // indirect
142156
gopkg.in/yaml.v3 v3.0.1 // indirect
143-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
157+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
144158
)
145159

146160
// Trivy has some issues that we're floating patches for, and will hopefully
147161
// be upstreamed eventually.
148-
replace github.com/aquasecurity/trivy => github.com/coder/trivy v0.0.0-20250807211036-0bb0acd620a8
162+
replace github.com/aquasecurity/trivy => github.com/coder/trivy v0.0.0-20260309164037-c413f5a2f511

0 commit comments

Comments
 (0)