Skip to content

Commit 25ed084

Browse files
martinbailliemartinbaillie
committed
Bump toolchain and dependencies
Signed-off-by: Martin Baillie <[email protected]>
1 parent 5ce15ec commit 25ed084

File tree

4 files changed

+174
-120
lines changed

4 files changed

+174
-120
lines changed

‎flake.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 67 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
inherit name;
6060
src = gitignore.lib.gitignoreSource ./.;
6161
env.CGO_ENABLED = 0;
62-
vendorHash = "sha256-Xebjfaz3XKHIMJkgiounNkYTacdqwSXRBooJutwgms4=";
62+
vendorHash = "sha256-YELxGfVh2XVt7DXeISZg7/uf9B+/zEa43TTCTVHON4g=";
6363
flags = [ "-trimpath" ];
6464
ldflags = [
6565
"-s"
@@ -97,7 +97,7 @@
9797
bashInteractive
9898
coreutils
9999
gnugrep
100-
go
100+
go_1_25
101101
golangci-lint
102102
goreleaser
103103
syft
@@ -122,98 +122,86 @@
122122
}
123123
{
124124
name = "todo";
125-
command =
126-
prjRoot
127-
+ ''
128-
${gnugrep}/bin/grep --exclude=flake.nix \
129-
--exclude-dir=.direnv --color=auto --text \
130-
-InRo -E ' TODO.*' .
131-
'';
125+
command = prjRoot + ''
126+
${gnugrep}/bin/grep --exclude=flake.nix \
127+
--exclude-dir=.direnv --color=auto --text \
128+
-InRo -E ' TODO.*' .
129+
'';
132130
help = "show project TODO items";
133131
}
134132
{
135133
name = "clean";
136-
command =
137-
prjRoot
138-
+ ''
139-
echo >&2 "==> Cleaning"
140-
rm -rf test result
141-
'';
134+
command = prjRoot + ''
135+
echo >&2 "==> Cleaning"
136+
rm -rf test result
137+
'';
142138
help = "clean transient files";
143139
}
144140
{
145141
name = "tidy";
146-
command =
147-
prjRoot
148-
+ ''
149-
echo >&2 "==> Tidying modules"
150-
go mod tidy
151-
'';
142+
command = prjRoot + ''
143+
echo >&2 "==> Tidying modules"
144+
go mod tidy
145+
'';
152146
help = "clean transient files";
153147
}
154148
{
155149
name = "lint";
156-
command =
157-
prjRoot
158-
+ ''
159-
echo >&2 "==> Linting"
160-
if [ -v CI ]; then
161-
mkdir -p test
162-
${golangci-lint}/bin/golangci-lint run \
163-
--output.checkstyle.path stdout | tee test/checkstyle.xml
164-
else
165-
${golangci-lint}/bin/golangci-lint run --fast-only
166-
fi
167-
'';
150+
command = prjRoot + ''
151+
echo >&2 "==> Linting"
152+
if [ -v CI ]; then
153+
mkdir -p test
154+
${golangci-lint}/bin/golangci-lint run \
155+
--output.checkstyle.path stdout | tee test/checkstyle.xml
156+
else
157+
${golangci-lint}/bin/golangci-lint run --fast-only
158+
fi
159+
'';
168160
help = "lint the project (heavyweight when CI=true)";
169161
}
170162
{
171163
name = "unit";
172-
command =
173-
prjRoot
174-
+ ''
175-
[[ $# -eq 0 ]] && set -- "./..."
176-
echo >&2 "==> Unit testing"
177-
[ -v DEBUG ] && fmt=standard-verbose || fmt=short-verbose
178-
mkdir -p test
179-
if [ -v CI ]; then
180-
${gotestsum}/bin/gotestsum \
181-
--format $fmt --junitfile test/junit.xml -- -race \
182-
-coverprofile=test/coverage.out -covermode=atomic $@
183-
else
184-
${gotestsum}/bin/gotestsum \
185-
--format $fmt --junitfile test/junit.xml -- $@
186-
fi
187-
'';
164+
command = prjRoot + ''
165+
[[ $# -eq 0 ]] && set -- "./..."
166+
echo >&2 "==> Unit testing"
167+
[ -v DEBUG ] && fmt=standard-verbose || fmt=short-verbose
168+
mkdir -p test
169+
if [ -v CI ]; then
170+
${gotestsum}/bin/gotestsum \
171+
--format $fmt --junitfile test/junit.xml -- -race \
172+
-coverprofile=test/coverage.out -covermode=atomic $@
173+
else
174+
${gotestsum}/bin/gotestsum \
175+
--format $fmt --junitfile test/junit.xml -- $@
176+
fi
177+
'';
188178
help = "unit test the project";
189179
}
190180
{
191181
name = "integration-server";
192-
command =
193-
prjRoot
194-
+ ''
195-
echo >&2 "==> Integration server"
196-
[ -v DEBUG ] && lvl=trace || lvl=error
197-
[ ! -f "result/bin/vault-plugin-secrets-github" ] && build
198-
pkill -F test/vault.pid 2>/dev/null || true
199-
mkdir -p test
200-
sleep 2
201-
(
202-
trap 'rm -f test/vault.pid' EXIT
203-
${vault-bin}/bin/vault server \
204-
-dev \
205-
-dev-plugin-dir=$(${coreutils}/bin/realpath result/bin) \
206-
-dev-root-token-id=root \
207-
-log-level=$lvl
208-
) &
209-
echo $! > test/vault.pid
210-
sleep 2
211-
${vault-bin}/bin/vault write sys/plugins/catalog/${name} \
212-
sha_256=$(${coreutils}/bin/sha256sum result/bin/${name} |
213-
cut -d' ' -f1) command=${name}
214-
${vault-bin}/bin/vault secrets enable \
215-
-path=github -plugin-name=${name} plugin
216-
'';
182+
command = prjRoot + ''
183+
echo >&2 "==> Integration server"
184+
[ -v DEBUG ] && lvl=trace || lvl=error
185+
[ ! -f "result/bin/vault-plugin-secrets-github" ] && build
186+
pkill -F test/vault.pid 2>/dev/null || true
187+
mkdir -p test
188+
sleep 2
189+
(
190+
trap 'rm -f test/vault.pid' EXIT
191+
${vault-bin}/bin/vault server \
192+
-dev \
193+
-dev-plugin-dir=$(${coreutils}/bin/realpath result/bin) \
194+
-dev-root-token-id=root \
195+
-log-level=$lvl
196+
) &
197+
echo $! > test/vault.pid
198+
sleep 2
199+
${vault-bin}/bin/vault write sys/plugins/catalog/${name} \
200+
sha_256=$(${coreutils}/bin/sha256sum result/bin/${name} |
201+
cut -d' ' -f1) command=${name}
202+
${vault-bin}/bin/vault secrets enable \
203+
-path=github -plugin-name=${name} plugin
204+
'';
217205
help = "run a background Vault with the plugin enabled";
218206
}
219207
{
@@ -229,13 +217,11 @@
229217
#
230218
# NOTE: this will automatically skip racyness tests to avoid
231219
# GitHub API rate limiting.
232-
command =
233-
prjRoot
234-
+ ''
235-
echo >&2 "==> Integration testing"
236-
[ ! -f "test/vault.pid" ] && integration-server
237-
unit -count 1 -tags integration ./...
238-
'';
220+
command = prjRoot + ''
221+
echo >&2 "==> Integration testing"
222+
[ ! -f "test/vault.pid" ] && integration-server
223+
unit -count 1 -tags integration ./...
224+
'';
239225
help = "unit and integration test the project";
240226
}
241227
];

‎go.mod‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module github.com/martinbaillie/vault-plugin-secrets-github/v2
22

3-
go 1.24.5
3+
go 1.25.0
44

55
require (
66
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0
77
github.com/hashicorp/go-hclog v1.6.3
8-
github.com/hashicorp/vault/api v1.20.0
9-
github.com/hashicorp/vault/sdk v0.18.0
10-
github.com/prometheus/client_golang v1.23.0
11-
github.com/prometheus/common v0.65.0
8+
github.com/hashicorp/vault/api v1.21.0
9+
github.com/hashicorp/vault/sdk v0.19.0
10+
github.com/prometheus/client_golang v1.23.2
11+
github.com/prometheus/common v0.66.1
1212
gotest.tools v2.2.0+incompatible
1313
)
1414

1515
require (
16-
cloud.google.com/go/auth v0.16.3 // indirect
16+
cloud.google.com/go/auth v0.16.5 // indirect
1717
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
18-
cloud.google.com/go/cloudsqlconn v1.17.3 // indirect
19-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
18+
cloud.google.com/go/cloudsqlconn v1.18.1 // indirect
19+
cloud.google.com/go/compute/metadata v0.8.4 // indirect
2020
github.com/Microsoft/go-winio v0.6.2 // indirect
2121
github.com/armon/go-metrics v0.4.1 // indirect
2222
github.com/armon/go-radix v1.0.0 // indirect
@@ -27,8 +27,8 @@ require (
2727
github.com/containerd/errdefs/pkg v0.3.0 // indirect
2828
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2929
github.com/distribution/reference v0.6.0 // indirect
30-
github.com/docker/docker v28.3.3+incompatible // indirect
31-
github.com/docker/go-connections v0.5.0 // indirect
30+
github.com/docker/docker v28.4.0+incompatible // indirect
31+
github.com/docker/go-connections v0.6.0 // indirect
3232
github.com/docker/go-units v0.5.0 // indirect
3333
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3434
github.com/fatih/color v1.18.0 // indirect
@@ -59,14 +59,15 @@ require (
5959
github.com/hashicorp/go-kms-wrapping/v2 v2.0.18 // indirect
6060
github.com/hashicorp/go-metrics v0.5.4 // indirect
6161
github.com/hashicorp/go-multierror v1.1.1 // indirect
62-
github.com/hashicorp/go-plugin v1.6.3 // indirect
62+
github.com/hashicorp/go-plugin v1.7.0 // indirect
6363
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
6464
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
6565
github.com/hashicorp/go-secure-stdlib/cryptoutil v0.1.1 // indirect
6666
github.com/hashicorp/go-secure-stdlib/mlock v0.1.3 // indirect
6767
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
6868
github.com/hashicorp/go-secure-stdlib/permitpool v1.0.0 // indirect
69-
github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.1 // indirect
69+
github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.2 // indirect
70+
github.com/hashicorp/go-secure-stdlib/regexp v1.0.0 // indirect
7071
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
7172
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
7273
github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -94,32 +95,33 @@ require (
9495
github.com/oklog/run v1.2.0 // indirect
9596
github.com/opencontainers/go-digest v1.0.0 // indirect
9697
github.com/opencontainers/image-spec v1.1.1 // indirect
97-
github.com/petermattis/goid v0.0.0-20250721140440-ea1c0173183e // indirect
98+
github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 // indirect
9899
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
99100
github.com/pkg/errors v0.9.1 // indirect
100101
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
101102
github.com/prometheus/client_model v0.6.2 // indirect
102103
github.com/prometheus/procfs v0.17.0 // indirect
103104
github.com/robfig/cron/v3 v3.0.1 // indirect
104105
github.com/ryanuber/go-glob v1.0.0 // indirect
105-
github.com/sasha-s/go-deadlock v0.3.5 // indirect
106-
github.com/stretchr/testify v1.10.0 // indirect
106+
github.com/sasha-s/go-deadlock v0.3.6 // indirect
107+
github.com/stretchr/testify v1.11.1 // indirect
107108
go.opencensus.io v0.24.0 // indirect
108-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
109-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
110-
go.opentelemetry.io/otel v1.37.0 // indirect
111-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
112-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
109+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
110+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
111+
go.opentelemetry.io/otel v1.38.0 // indirect
112+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
113114
go.uber.org/atomic v1.11.0 // indirect
114-
golang.org/x/crypto v0.40.0 // indirect
115-
golang.org/x/net v0.42.0 // indirect
116-
golang.org/x/oauth2 v0.30.0 // indirect
117-
golang.org/x/sys v0.34.0 // indirect
118-
golang.org/x/text v0.27.0 // indirect
119-
golang.org/x/time v0.12.0 // indirect
120-
google.golang.org/api v0.244.0 // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
122-
google.golang.org/grpc v1.74.2 // indirect
123-
google.golang.org/protobuf v1.36.6 // indirect
115+
go.yaml.in/yaml/v2 v2.4.3 // indirect
116+
golang.org/x/crypto v0.42.0 // indirect
117+
golang.org/x/net v0.44.0 // indirect
118+
golang.org/x/oauth2 v0.31.0 // indirect
119+
golang.org/x/sys v0.36.0 // indirect
120+
golang.org/x/text v0.29.0 // indirect
121+
golang.org/x/time v0.13.0 // indirect
122+
google.golang.org/api v0.249.0 // indirect
123+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
124+
google.golang.org/grpc v1.75.1 // indirect
125+
google.golang.org/protobuf v1.36.9 // indirect
124126
gopkg.in/yaml.v3 v3.0.1 // indirect
125127
)

0 commit comments

Comments
 (0)