Skip to content

Commit 2e0de96

Browse files
committed
A-1270 part 1: move zstash into agent repo
1 parent 657b240 commit 2e0de96

38 files changed

Lines changed: 7150 additions & 10 deletions

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ require (
3131
github.com/buildkite/interpolate v0.1.5
3232
github.com/buildkite/roko v1.4.0
3333
github.com/buildkite/shellwords v1.0.1
34-
github.com/buildkite/zstash v0.8.0
3534
github.com/creack/pty v1.1.24
3635
github.com/denisbrodbeck/machineid v1.0.1
3736
github.com/dustin/go-humanize v1.0.1
@@ -51,7 +50,9 @@ require (
5150
github.com/prometheus/client_golang v1.23.2
5251
github.com/puzpuzpuz/xsync/v2 v2.5.1
5352
github.com/qri-io/jsonschema v0.2.1
53+
github.com/stretchr/testify v1.11.1
5454
github.com/urfave/cli v1.22.17
55+
github.com/wolfeidau/quickzip v1.0.2
5556
go.opentelemetry.io/contrib/propagators/aws v1.43.0
5657
go.opentelemetry.io/contrib/propagators/b3 v1.43.0
5758
go.opentelemetry.io/contrib/propagators/jaeger v1.43.0
@@ -185,14 +186,12 @@ require (
185186
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
186187
github.com/segmentio/asm v1.2.1 // indirect
187188
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
188-
github.com/stretchr/testify v1.11.1 // indirect
189189
github.com/tinylib/msgp v1.6.3 // indirect
190190
github.com/tklauser/go-sysconf v0.3.16 // indirect
191191
github.com/tklauser/numcpus v0.11.0 // indirect
192192
github.com/trailofbits/go-mutexasserts v0.0.0-20250514102930-c1f3d2e37561 // indirect
193193
github.com/urfave/cli/v3 v3.8.0 // indirect
194194
github.com/vektah/gqlparser/v2 v2.5.32 // indirect
195-
github.com/wolfeidau/quickzip v1.0.2 // indirect
196195
github.com/yusufpapurcu/wmi v1.2.4 // indirect
197196
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
198197
go.opentelemetry.io/collector/component v1.55.0 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ github.com/buildkite/shellwords v1.0.1 h1:88OjMbEBf+EliVB0tizXJynpAM2CKOvYwepg5n
166166
github.com/buildkite/shellwords v1.0.1/go.mod h1:so0eQnTxgbo58CTYX+4BCx5UuMzvRha9dcKdCKl6NV4=
167167
github.com/buildkite/test-engine-client/v2 v2.5.1 h1:2Bx+UxKxsbyVB4pixuUMeevvoATrfYO7DKUpg3iI3jc=
168168
github.com/buildkite/test-engine-client/v2 v2.5.1/go.mod h1:JA61MSQxGU9GYx0CyED17ex83RSzcKI3LR3RVyuaH7M=
169-
github.com/buildkite/zstash v0.8.0 h1:z8hBGGKIaN/UX0MZh51P8s28mWaDBkgD3uMoOu6Q96g=
170-
github.com/buildkite/zstash v0.8.0/go.mod h1:60v4pl8PnsVA6b09MC47aTR8Z1QNJoeQqOGp2jkEww8=
171169
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
172170
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
173171
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=

internal/cache/cache.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"strings"
99
"sync"
1010

11+
"github.com/buildkite/agent/v3/internal/zstash"
12+
"github.com/buildkite/agent/v3/internal/zstash/api"
13+
"github.com/buildkite/agent/v3/internal/zstash/cache"
1114
"github.com/buildkite/agent/v3/logger"
1215
"github.com/buildkite/agent/v3/version"
13-
"github.com/buildkite/zstash"
14-
"github.com/buildkite/zstash/api"
15-
"github.com/buildkite/zstash/cache"
1616
"github.com/dustin/go-humanize"
1717
"gopkg.in/yaml.v3"
1818
)

internal/cache/cache_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strings"
1111
"testing"
1212

13+
"github.com/buildkite/agent/v3/internal/zstash"
14+
"github.com/buildkite/agent/v3/internal/zstash/cache"
1315
"github.com/buildkite/agent/v3/logger"
14-
"github.com/buildkite/zstash"
15-
"github.com/buildkite/zstash/cache"
1616
"github.com/google/go-cmp/cmp"
1717
)
1818

0 commit comments

Comments
 (0)