Skip to content

Commit 780a399

Browse files
committed
refactor: broadly refactor Vault client
This commit broadly refactors the Vault backend to improve K/V lookup for both V1 and V2 KVs. It properly leverages the `prefix` configuration for the Secrets Engine path and accomodates the differences between the KV v1 and KV v2 endpoints, specifically the use of `data` in the secret path. This returns the Vault backend back to pathing parity with the other backends. It also means this commit is a breaking change and is not backwards compatible with configurations that use the more explicit pathing. This commit also resolves issue #244
1 parent 13d837c commit 780a399

File tree

487 files changed

+15756
-13443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+15756
-13443
lines changed

cmd/confd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package main
22

3-
const Version = "0.20.0"
3+
const Version = "0.30.0"
44

55
// We want to replace this variable at build time with "-ldflags -X main.GitSHA=xxx", where const is not supported.
66
var GitSHA = ""

go.mod

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
module github.com/abtreece/confd
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
6-
github.com/BurntSushi/toml v1.3.2
8+
github.com/BurntSushi/toml v1.4.0
79
github.com/armon/go-metrics v0.4.1 // indirect
8-
github.com/aws/aws-sdk-go v1.53.5
9-
github.com/coreos/go-semver v0.3.0 // indirect
10-
github.com/fatih/color v1.16.0 // indirect
10+
github.com/aws/aws-sdk-go v1.55.5
11+
github.com/coreos/go-semver v0.3.1 // indirect
12+
github.com/fatih/color v1.17.0 // indirect
1113
github.com/fsnotify/fsnotify v1.7.0
12-
github.com/go-zookeeper/zk v1.0.3
14+
github.com/go-zookeeper/zk v1.0.4
1315
github.com/gomodule/redigo v1.9.2
14-
github.com/hashicorp/consul/api v1.28.3
15-
github.com/hashicorp/vault/api v1.13.0
16+
github.com/hashicorp/consul/api v1.29.4
17+
github.com/hashicorp/vault/api v1.15.0
1618
github.com/kelseyhightower/memkv v0.1.1
1719
github.com/sirupsen/logrus v1.9.3
18-
go.etcd.io/etcd/client/v3 v3.5.13
20+
go.etcd.io/etcd/client/v3 v3.5.16
1921
gopkg.in/yaml.v2 v2.4.0
2022
)
2123

2224
require (
23-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
24-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
25-
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
25+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
26+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
27+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
2628
github.com/gogo/protobuf v1.3.2 // indirect
2729
github.com/golang/protobuf v1.5.4 // indirect
28-
github.com/hashicorp/consul/proto-public v0.6.1 // indirect
2930
github.com/hashicorp/errwrap v1.1.0 // indirect
3031
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3132
github.com/hashicorp/go-hclog v1.6.3 // indirect
3233
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
3334
github.com/hashicorp/go-multierror v1.1.1 // indirect
3435
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
3536
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
36-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
37+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
3738
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
38-
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
39+
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
3940
github.com/hashicorp/go-version v1.6.0 // indirect
40-
github.com/hashicorp/golang-lru v0.5.4 // indirect
41+
github.com/hashicorp/golang-lru v1.0.2 // indirect
4142
github.com/hashicorp/hcl v1.0.0 // indirect
4243
github.com/hashicorp/serf v0.10.1 // indirect
4344
github.com/jmespath/go-jmespath v0.4.0 // indirect
4445
github.com/mattn/go-colorable v0.1.13 // indirect
4546
github.com/mattn/go-isatty v0.0.20 // indirect
4647
github.com/mitchellh/go-homedir v1.1.0 // indirect
4748
github.com/mitchellh/mapstructure v1.5.0 // indirect
49+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
4850
github.com/ryanuber/go-glob v1.0.0 // indirect
49-
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
50-
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
51-
go.uber.org/atomic v1.10.0 // indirect
52-
go.uber.org/multierr v1.8.0 // indirect
53-
go.uber.org/zap v1.23.0 // indirect
54-
golang.org/x/crypto v0.22.0 // indirect
55-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
56-
golang.org/x/net v0.24.0 // indirect
57-
golang.org/x/sys v0.20.0 // indirect
58-
golang.org/x/text v0.14.0 // indirect
59-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
60-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
61-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
62-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
63-
google.golang.org/grpc v1.59.0 // indirect
64-
google.golang.org/protobuf v1.33.0 // indirect
51+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
52+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
53+
go.uber.org/multierr v1.11.0 // indirect
54+
go.uber.org/zap v1.27.0 // indirect
55+
golang.org/x/crypto v0.27.0 // indirect
56+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
57+
golang.org/x/net v0.29.0 // indirect
58+
golang.org/x/sys v0.25.0 // indirect
59+
golang.org/x/text v0.18.0 // indirect
60+
golang.org/x/time v0.6.0 // indirect
61+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
63+
google.golang.org/grpc v1.67.0 // indirect
64+
google.golang.org/protobuf v1.34.2 // indirect
6565
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
6666
)

0 commit comments

Comments
 (0)