diff --git a/.go-version b/.go-version index 57807d6..013173a 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.0 +1.22.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 85ea21c..78605e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Unreleased +## v0.4.0 +* Bump go version to 1.22.6 + ## v0.3.0 IMPROVEMENTS: * Updated dependencies: diff --git a/README.md b/README.md index 8fa263b..5752a3c 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ A set of make targets are provided for quick and easy iterations when developing server running locally and accessible via the `vault` CLI. See this [documentation](https://github.com/hashicorp/vault#developing-vault) on how to get started with Vault. -1. `make setup-env` will start a Redis docker container and initialize a test user with the username `us3rn4m3` and passwod `user-pa55w0rd` +1. `make setup-env` will start a Redis docker container and initialize a test user with the username `default` and password `default-pa55w0rd` 2. `source ./bootstrap/terraform/local_environment_setup.sh` will export the necessary environment variables generated from the setup step 3. `make configure` will build the plugin, register it in your local Vault server and run sample commands to verify everything is working 4. `make testacc` will run the acceptance tests against the Redis container created during the environment setup diff --git a/bootstrap/terraform/docker-compose.yml b/bootstrap/terraform/docker-compose.yml index edfad7d..269610d 100644 --- a/bootstrap/terraform/docker-compose.yml +++ b/bootstrap/terraform/docker-compose.yml @@ -14,7 +14,7 @@ services: networks: - redis restart: always - command: "redis-server --requirepass default-pa55w0rd --user us4rn4m3 on >user-pa55w0rd ~* allcommands" + command: "redis-server --requirepass default-pa55w0rd" ports: - "6379:6379" volumes: diff --git a/bootstrap/terraform/redis.tf b/bootstrap/terraform/redis.tf index 61cd177..de81258 100644 --- a/bootstrap/terraform/redis.tf +++ b/bootstrap/terraform/redis.tf @@ -8,7 +8,7 @@ resource "null_resource" "docker_compose_up" { // Running down at the beginning so terraform apply can be executed multiple times to pick up on latest docker-compose.yaml changes provisioner "local-exec" { - command = "docker-compose -f ./docker-compose.yml down && docker-compose -f ./docker-compose.yml up -d" + command = "docker compose -f ./docker-compose.yml down && docker compose -f ./docker-compose.yml up -d" when = create } } @@ -19,17 +19,17 @@ resource "null_resource" "docker_compose_down" { } provisioner "local-exec" { - command = "docker-compose -f ./docker-compose.yml down" + command = "docker compose -f ./docker-compose.yml down" when = destroy } } resource "local_file" "setup_environment_file" { filename = "local_environment_setup.sh" - content = <"+password)) - if err != nil { return err } diff --git a/redis_test.go b/redis_test.go index 9d6a2c5..6d0b92f 100644 --- a/redis_test.go +++ b/redis_test.go @@ -207,7 +207,6 @@ func testRedisDBInitialize_TLS(t *testing.T, host string, port int) { "insecure_tls": true, } err = setupRedisDBInitialize(t, connectionDetails) - if err != nil { t.Fatalf("Testing TLS Init() failed: error: %s", err) }