Skip to content

Commit 31bed53

Browse files
committed
chore(deps): update coder/coder to v2.24.4
- Update github.com/coder/coder/v2 from v2.23.0 to v2.24.4 - Update tailscale replace directive to v1.1.1-0.20250729141742-067f1e5d9716 - Update AGENTS.md to emphasize always starting from latest main - All tests pass
1 parent 988b038 commit 31bed53

File tree

3 files changed

+145
-201
lines changed

3 files changed

+145
-201
lines changed

AGENTS.md

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,37 @@
44

55
This document helps AI coding agents work effectively with the envbox project. Read this first before making changes.
66

7-
## ⚠️ CRITICAL: Never Push to Main
7+
## ⚠️ CRITICAL: Always Start From Latest Main
88

9-
**ALWAYS work on a feature branch and push to your remote branch. NEVER push directly to main.**
9+
**ALWAYS pull latest main and create a feature branch. NEVER push directly to main.**
1010

11-
When making changes:
12-
1. Create a feature branch: `git checkout -b your-branch-name`
13-
2. Make your changes and commit them
14-
3. Push to YOUR branch: `git push origin your-branch-name`
15-
4. Create a Pull Request for review
11+
### Starting Any New Task
1612

17-
**DO NOT** run `git push origin main` - this pushes directly to main and bypasses code review.
13+
Before starting any work, **ALWAYS** do this:
14+
15+
```bash
16+
# 1. Get latest main
17+
git checkout main
18+
git pull origin main
19+
20+
# 2. Create feature branch from latest main
21+
git checkout -b your-branch-name
22+
23+
# 3. Make your changes and commit them
24+
# ... do your work ...
25+
git add .
26+
git commit -m "your message"
27+
28+
# 4. Push to YOUR branch (not main!)
29+
git push origin your-branch-name
30+
31+
# 5. Create a Pull Request for review
32+
```
33+
34+
**DO NOT:**
35+
- ❌ Start work without pulling latest main first
36+
- ❌ Run `git push origin main` - this pushes directly to main and bypasses code review
37+
- ❌ Create branches from stale/outdated main branches
1838

1939
## What is envbox?
2040

go.mod

Lines changed: 33 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.24.10
44

55
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
66
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
7-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20250422090654-5090e715905e
7+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20250729141742-067f1e5d9716
88

99
replace github.com/gliderlabs/ssh => github.com/coder/ssh v0.0.0-20231128192721-70855dedb788
1010

1111
require (
1212
cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb
13-
github.com/coder/coder/v2 v2.23.0
13+
github.com/coder/coder/v2 v2.24.4
1414
github.com/coder/retry v1.5.1
1515
github.com/cpuguy83/dockercfg v0.3.1
1616
github.com/docker/docker v28.1.1+incompatible
@@ -30,42 +30,41 @@ require (
3030
golang.org/x/sys v0.33.0
3131
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
3232
k8s.io/mount-utils v0.26.2
33-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
33+
k8s.io/utils v0.0.0-20241210054802-24370beab758
3434
storj.io/drpc v0.0.33
3535
)
3636

3737
require (
38-
cloud.google.com/go v0.120.0 // indirect
39-
cloud.google.com/go/auth v0.16.1 // indirect
4038
cloud.google.com/go/compute/metadata v0.7.0 // indirect
4139
dario.cat/mergo v1.0.1 // indirect
4240
filippo.io/edwards25519 v1.1.0 // indirect
4341
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
44-
github.com/DataDog/appsec-internal-go v1.9.0 // indirect
45-
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect
46-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect
47-
github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect
48-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.64.0-rc.1 // indirect
49-
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-rc.1 // indirect
50-
github.com/DataDog/datadog-agent/pkg/util/log v0.64.0-rc.1 // indirect
51-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.64.0-rc.1 // indirect
52-
github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1 // indirect
42+
github.com/DataDog/appsec-internal-go v1.11.2 // indirect
43+
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.2 // indirect
44+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.2 // indirect
45+
github.com/DataDog/datadog-agent/pkg/proto v0.64.2 // indirect
46+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.64.2 // indirect
47+
github.com/DataDog/datadog-agent/pkg/trace v0.64.2 // indirect
48+
github.com/DataDog/datadog-agent/pkg/util/log v0.64.2 // indirect
49+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.64.2 // indirect
50+
github.com/DataDog/datadog-agent/pkg/version v0.64.2 // indirect
5351
github.com/DataDog/datadog-go/v5 v5.6.0 // indirect
54-
github.com/DataDog/go-libddwaf/v3 v3.5.3 // indirect
55-
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 // indirect
56-
github.com/DataDog/go-sqllexer v0.1.0 // indirect
52+
github.com/DataDog/dd-trace-go/v2 v2.0.0 // indirect
53+
github.com/DataDog/go-libddwaf/v3 v3.5.4 // indirect
54+
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250319104955-81009b9bad14 // indirect
55+
github.com/DataDog/go-sqllexer v0.1.3 // indirect
5756
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
5857
github.com/DataDog/gostackparse v0.7.0 // indirect
5958
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.26.0 // indirect
6059
github.com/DataDog/sketches-go v1.4.7 // indirect
60+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
6161
github.com/Microsoft/go-winio v0.6.2 // indirect
6262
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
6363
github.com/agext/levenshtein v1.2.3 // indirect
6464
github.com/agnivade/levenshtein v1.2.1 // indirect
6565
github.com/akutz/memconn v0.1.0 // indirect
6666
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
6767
github.com/ammario/tlru v0.4.0 // indirect
68-
github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3 // indirect
6968
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
7069
github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c // indirect
7170
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
@@ -93,9 +92,9 @@ require (
9392
github.com/charmbracelet/x/term v0.2.1 // indirect
9493
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
9594
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect
96-
github.com/coder/quartz v0.2.1-0.20250527113331-b71761ce32df // indirect
95+
github.com/coder/quartz v0.2.1 // indirect
9796
github.com/coder/serpent v0.10.0 // indirect
98-
github.com/coder/terraform-provider-coder/v2 v2.5.2 // indirect
97+
github.com/coder/terraform-provider-coder/v2 v2.8.0 // indirect
9998
github.com/coder/websocket v1.8.13 // indirect
10099
github.com/containerd/continuity v0.4.5 // indirect
101100
github.com/coreos/go-iptables v0.6.0 // indirect
@@ -107,7 +106,7 @@ require (
107106
github.com/docker/go-units v0.5.0 // indirect
108107
github.com/dustin/go-humanize v1.0.1 // indirect
109108
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
110-
github.com/ebitengine/purego v0.8.2 // indirect
109+
github.com/ebitengine/purego v0.8.3 // indirect
111110
github.com/fatih/color v1.18.0 // indirect
112111
github.com/felixge/httpsnoop v1.0.4 // indirect
113112
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -130,21 +129,14 @@ require (
130129
github.com/google/btree v1.1.3 // indirect
131130
github.com/google/go-cmp v0.7.0 // indirect
132131
github.com/google/nftables v0.2.0 // indirect
133-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
134-
github.com/google/s2a-go v0.1.9 // indirect
132+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
135133
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
136-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
137-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
138134
github.com/gorilla/mux v1.8.1 // indirect
139-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
140135
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
141136
github.com/hashicorp/errwrap v1.1.0 // indirect
142137
github.com/hashicorp/go-cty v1.5.0 // indirect
143138
github.com/hashicorp/go-hclog v1.6.3 // indirect
144139
github.com/hashicorp/go-multierror v1.1.1 // indirect
145-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
146-
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
147-
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
148140
github.com/hashicorp/go-uuid v1.0.3 // indirect
149141
github.com/hashicorp/go-version v1.7.0 // indirect
150142
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
@@ -163,10 +155,9 @@ require (
163155
github.com/json-iterator/go v1.1.12 // indirect
164156
github.com/klauspost/compress v1.18.0 // indirect
165157
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
166-
github.com/kylecarbs/aisdk-go v0.0.8 // indirect
167158
github.com/leodido/go-urn v1.4.0 // indirect
168159
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
169-
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
160+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
170161
github.com/mattn/go-colorable v0.1.14 // indirect
171162
github.com/mattn/go-isatty v0.0.20 // indirect
172163
github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -182,7 +173,7 @@ require (
182173
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
183174
github.com/mitchellh/reflectwalk v1.0.2 // indirect
184175
github.com/moby/docker-image-spec v1.3.1 // indirect
185-
github.com/moby/moby v28.1.1+incompatible // indirect
176+
github.com/moby/moby v28.2.2+incompatible // indirect
186177
github.com/moby/sys/atomicwriter v0.1.0 // indirect
187178
github.com/moby/sys/mountinfo v0.7.1 // indirect
188179
github.com/moby/sys/user v0.4.0 // indirect
@@ -192,7 +183,6 @@ require (
192183
github.com/muesli/termenv v0.16.0 // indirect
193184
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
194185
github.com/open-policy-agent/opa v1.4.2 // indirect
195-
github.com/openai/openai-go v0.1.0-beta.10 // indirect
196186
github.com/opencontainers/go-digest v1.0.0 // indirect
197187
github.com/opencontainers/runc v1.2.8 // indirect
198188
github.com/outcaste-io/ristretto v0.2.3 // indirect
@@ -213,9 +203,8 @@ require (
213203
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
214204
github.com/rivo/uniseg v0.4.7 // indirect
215205
github.com/robfig/cron/v3 v3.0.1 // indirect
216-
github.com/ryanuber/go-glob v1.0.0 // indirect
217206
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
218-
github.com/shirou/gopsutil/v4 v4.25.2 // indirect
207+
github.com/shirou/gopsutil/v4 v4.25.4 // indirect
219208
github.com/sirupsen/logrus v1.9.3 // indirect
220209
github.com/spaolacci/murmur3 v1.1.0 // indirect
221210
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect
@@ -226,13 +215,9 @@ require (
226215
github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 // indirect
227216
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
228217
github.com/tcnksm/go-httpstat v0.2.0 // indirect
229-
github.com/tidwall/gjson v1.18.0 // indirect
230-
github.com/tidwall/match v1.1.1 // indirect
231-
github.com/tidwall/pretty v1.2.1 // indirect
232-
github.com/tidwall/sjson v1.2.5 // indirect
233218
github.com/tinylib/msgp v1.2.5 // indirect
234-
github.com/tklauser/go-sysconf v0.3.14 // indirect
235-
github.com/tklauser/numcpus v0.8.0 // indirect
219+
github.com/tklauser/go-sysconf v0.3.15 // indirect
220+
github.com/tklauser/numcpus v0.10.0 // indirect
236221
github.com/u-root/uio v0.0.0-20240209044354-b3d14b93376a // indirect
237222
github.com/valyala/fasthttp v1.62.0 // indirect
238223
github.com/vishvananda/netns v0.0.4 // indirect
@@ -250,10 +235,10 @@ require (
250235
github.com/zeebo/errs v1.4.0 // indirect
251236
go.nhat.io/otelsql v0.15.0 // indirect
252237
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
253-
go.opentelemetry.io/collector/component v0.120.0 // indirect
254-
go.opentelemetry.io/collector/pdata v1.26.0 // indirect
255-
go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect
256-
go.opentelemetry.io/collector/semconv v0.120.0 // indirect
238+
go.opentelemetry.io/collector/component v1.27.0 // indirect
239+
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
240+
go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect
241+
go.opentelemetry.io/collector/semconv v0.123.0 // indirect
257242
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
258243
go.opentelemetry.io/otel v1.35.0 // indirect
259244
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
@@ -277,12 +262,11 @@ require (
277262
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
278263
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
279264
google.golang.org/appengine v1.6.8 // indirect
280-
google.golang.org/genai v0.7.0 // indirect
281-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
265+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
282266
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
283-
google.golang.org/grpc v1.72.1 // indirect
267+
google.golang.org/grpc v1.73.0 // indirect
284268
google.golang.org/protobuf v1.36.6 // indirect
285-
gopkg.in/DataDog/dd-trace-go.v1 v1.73.0 // indirect
269+
gopkg.in/DataDog/dd-trace-go.v1 v1.74.0 // indirect
286270
gopkg.in/ini.v1 v1.67.0 // indirect
287271
gopkg.in/yaml.v3 v3.0.1 // indirect
288272
gvisor.dev/gvisor v0.0.0-20240509041132-65b30f7869dc // indirect

0 commit comments

Comments
 (0)