Skip to content

Commit 0b8def6

Browse files
fairclothjmZlaticanintvoran
authored
Prepare for v0.4.0 release (#72)
* Prepare for v0.4.0 release * update docker compose command * update docker username and password * updating to vault/sdk@v0.14.0 go get github.com/hashicorp/vault/sdk@latest go mod tidy * docker/cli@v26 * Update CHANGELOG.md --------- Co-authored-by: Zlaticanin <zlaticaninmilena@gmail.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>
1 parent 507483b commit 0b8def6

File tree

9 files changed

+150
-154
lines changed

9 files changed

+150
-154
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.0
1+
1.22.6

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
## Unreleased
22

3+
## v0.4.0
4+
* Bump go version to 1.22.6
5+
* Updated dependencies:
6+
* https://github.com/hashicorp/vault-plugin-database-redis/pull/72
7+
38
## v0.3.0
49
IMPROVEMENTS:
510
* Updated dependencies:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ A set of make targets are provided for quick and easy iterations when developing
182182
server running locally and accessible via the `vault` CLI. See this [documentation](https://github.com/hashicorp/vault#developing-vault)
183183
on how to get started with Vault.
184184

185-
1. `make setup-env` will start a Redis docker container and initialize a test user with the username `us3rn4m3` and passwod `user-pa55w0rd`
185+
1. `make setup-env` will start a Redis docker container and initialize a test user with the username `default` and password `default-pa55w0rd`
186186
2. `source ./bootstrap/terraform/local_environment_setup.sh` will export the necessary environment variables generated from the setup step
187187
3. `make configure` will build the plugin, register it in your local Vault server and run sample commands to verify everything is working
188188
4. `make testacc` will run the acceptance tests against the Redis container created during the environment setup

bootstrap/terraform/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
networks:
1515
- redis
1616
restart: always
17-
command: "redis-server --requirepass default-pa55w0rd --user us4rn4m3 on >user-pa55w0rd ~* allcommands"
17+
command: "redis-server --requirepass default-pa55w0rd"
1818
ports:
1919
- "6379:6379"
2020
volumes:

bootstrap/terraform/redis.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "null_resource" "docker_compose_up" {
88

99
// Running down at the beginning so terraform apply can be executed multiple times to pick up on latest docker-compose.yaml changes
1010
provisioner "local-exec" {
11-
command = "docker-compose -f ./docker-compose.yml down && docker-compose -f ./docker-compose.yml up -d"
11+
command = "docker compose -f ./docker-compose.yml down && docker compose -f ./docker-compose.yml up -d"
1212
when = create
1313
}
1414
}
@@ -19,17 +19,17 @@ resource "null_resource" "docker_compose_down" {
1919
}
2020

2121
provisioner "local-exec" {
22-
command = "docker-compose -f ./docker-compose.yml down"
22+
command = "docker compose -f ./docker-compose.yml down"
2323
when = destroy
2424
}
2525
}
2626

2727
resource "local_file" "setup_environment_file" {
2828
filename = "local_environment_setup.sh"
29-
content = <<EOF
30-
export TEST_REDIS_HOST=localhost &&\
31-
export TEST_REDIS_PORT=6379 &&\
32-
export TEST_REDIS_USERNAME=us4rn4m3 &&\
33-
export TEST_REDIS_PASSWORD=user-pa55w0rd
29+
content = <<EOF
30+
export TEST_REDIS_HOST=localhost
31+
export TEST_REDIS_PORT=6379
32+
export TEST_REDIS_USERNAME=default
33+
export TEST_REDIS_PASSWORD=default-pa55w0rd
3434
EOF
3535
}

go.mod

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
module github.com/hashicorp/vault-plugin-database-redis
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.7
46

57
require (
68
github.com/hashicorp/errwrap v1.1.0
79
github.com/hashicorp/go-hclog v1.6.3
8-
github.com/hashicorp/vault/sdk v0.12.0
10+
github.com/hashicorp/vault/sdk v0.14.0
911
github.com/mediocregopher/radix/v4 v4.1.4
1012
github.com/mitchellh/mapstructure v1.5.0
1113
github.com/ory/dockertest/v3 v3.10.0
1214
)
1315

1416
require (
1517
cloud.google.com/go/cloudsqlconn v1.4.3 // indirect
16-
cloud.google.com/go/compute v1.23.0 // indirect
17-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
18+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
19+
dario.cat/mergo v1.0.1 // indirect
1820
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
1921
github.com/Microsoft/go-winio v0.6.1 // indirect
2022
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
@@ -23,51 +25,54 @@ require (
2325
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2426
github.com/containerd/continuity v0.3.0 // indirect
2527
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/docker/cli v20.10.18+incompatible // indirect
27-
github.com/docker/distribution v2.8.2+incompatible // indirect
28-
github.com/docker/docker v24.0.9+incompatible // indirect
28+
github.com/distribution/reference v0.6.0 // indirect
29+
github.com/docker/cli v26.1.5+incompatible // indirect
30+
github.com/docker/docker v26.1.5+incompatible // indirect
2931
github.com/docker/go-connections v0.4.0 // indirect
3032
github.com/docker/go-units v0.5.0 // indirect
3133
github.com/fatih/color v1.16.0 // indirect
34+
github.com/felixge/httpsnoop v1.0.4 // indirect
35+
github.com/go-logr/logr v1.4.2 // indirect
36+
github.com/go-logr/stdr v1.2.2 // indirect
3237
github.com/gogo/protobuf v1.3.2 // indirect
3338
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3439
github.com/golang/protobuf v1.5.4 // indirect
3540
github.com/golang/snappy v0.0.4 // indirect
36-
github.com/google/s2a-go v0.1.4 // indirect
41+
github.com/google/s2a-go v0.1.7 // indirect
3742
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
3843
github.com/google/uuid v1.6.0 // indirect
39-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
40-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
44+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
45+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
4146
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
4247
github.com/hashicorp/go-kms-wrapping/v2 v2.0.8 // indirect
4348
github.com/hashicorp/go-multierror v1.1.1 // indirect
44-
github.com/hashicorp/go-plugin v1.6.0 // indirect
49+
github.com/hashicorp/go-plugin v1.6.1 // indirect
4550
github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect
4651
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
4752
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
48-
github.com/hashicorp/go-secure-stdlib/plugincontainer v0.3.0 // indirect
53+
github.com/hashicorp/go-secure-stdlib/plugincontainer v0.4.0 // indirect
4954
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
5055
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
5156
github.com/hashicorp/go-uuid v1.0.3 // indirect
5257
github.com/hashicorp/go-version v1.6.0 // indirect
5358
github.com/hashicorp/golang-lru v0.5.4 // indirect
5459
github.com/hashicorp/yamux v0.1.1 // indirect
55-
github.com/imdario/mergo v0.3.13 // indirect
5660
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
5761
github.com/jackc/pgconn v1.14.3 // indirect
5862
github.com/jackc/pgio v1.0.0 // indirect
5963
github.com/jackc/pgpassfile v1.0.0 // indirect
6064
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
6165
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
6266
github.com/jackc/pgtype v1.14.0 // indirect
63-
github.com/jackc/pgx/v4 v4.18.2 // indirect
67+
github.com/jackc/pgx/v4 v4.18.3 // indirect
6468
github.com/joshlf/go-acl v0.0.0-20200411065538-eae00ae38531 // indirect
65-
github.com/kr/text v0.2.0 // indirect
69+
github.com/kr/pretty v0.3.1 // indirect
6670
github.com/mattn/go-colorable v0.1.13 // indirect
6771
github.com/mattn/go-isatty v0.0.20 // indirect
6872
github.com/mitchellh/copystructure v1.2.0 // indirect
6973
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
7074
github.com/mitchellh/reflectwalk v1.0.2 // indirect
75+
github.com/moby/docker-image-spec v1.3.1 // indirect
7176
github.com/moby/term v0.5.0 // indirect
7277
github.com/oklog/run v1.1.0 // indirect
7378
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -77,6 +82,7 @@ require (
7782
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
7883
github.com/pkg/errors v0.9.1 // indirect
7984
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
85+
github.com/rogpeppe/go-internal v1.12.0 // indirect
8086
github.com/ryanuber/go-glob v1.0.0 // indirect
8187
github.com/sasha-s/go-deadlock v0.2.0 // indirect
8288
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -86,20 +92,28 @@ require (
8692
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
8793
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
8894
go.opencensus.io v0.24.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
96+
go.opentelemetry.io/otel v1.30.0 // indirect
97+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
98+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
99+
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
100+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
101+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
89102
go.uber.org/atomic v1.9.0 // indirect
90-
golang.org/x/crypto v0.21.0 // indirect
91-
golang.org/x/mod v0.11.0 // indirect
92-
golang.org/x/net v0.23.0 // indirect
93-
golang.org/x/oauth2 v0.18.0 // indirect
94-
golang.org/x/sys v0.18.0 // indirect
95-
golang.org/x/text v0.14.0 // indirect
96-
golang.org/x/time v0.3.0 // indirect
97-
golang.org/x/tools v0.10.0 // indirect
98-
google.golang.org/api v0.134.0 // indirect
99-
google.golang.org/appengine v1.6.8 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
101-
google.golang.org/grpc v1.60.1 // indirect
102-
google.golang.org/protobuf v1.33.0 // indirect
103+
golang.org/x/crypto v0.26.0 // indirect
104+
golang.org/x/mod v0.17.0 // indirect
105+
golang.org/x/net v0.28.0 // indirect
106+
golang.org/x/oauth2 v0.20.0 // indirect
107+
golang.org/x/sync v0.8.0 // indirect
108+
golang.org/x/sys v0.25.0 // indirect
109+
golang.org/x/text v0.17.0 // indirect
110+
golang.org/x/time v0.5.0 // indirect
111+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
112+
google.golang.org/api v0.169.0 // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
114+
google.golang.org/grpc v1.65.0 // indirect
115+
google.golang.org/protobuf v1.34.2 // indirect
116+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
103117
gopkg.in/yaml.v2 v2.4.0 // indirect
104118
gopkg.in/yaml.v3 v3.0.1 // indirect
105119
)

0 commit comments

Comments
 (0)