Update Aerospike dependency

go.sum was intentionally left out of the commit to avoid merge conflicts
hashicorp · Nov 2, 2021 · 1188e6e · 1188e6e
1 parent 759f94f
commit 1188e6e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -23,6 +23,7 @@ require (
 	github.com/SAP/go-hdb v0.14.1
 	github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a
 	github.com/aerospike/aerospike-client-go v3.1.1+incompatible
+	github.com/aerospike/aerospike-client-go/v5 v5.6.0
 	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
 	github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2

diff --git a/physical/aerospike/aerospike.go b/physical/aerospike/aerospike.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	aero "github.com/aerospike/aerospike-client-go"
+	aero "github.com/aerospike/aerospike-client-go/v5"
 	log "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
 	"github.com/hashicorp/vault/sdk/physical"
@@ -162,7 +162,7 @@ func (a *AerospikeBackend) Get(_ context.Context, key string) (*physical.Entry,
 
 	record, err := a.client.Get(nil, aeroKey)
 	if err != nil {
-		if err.Error() == keyNotFoundError {
+		if strings.Contains(err.Error(), keyNotFoundError) {
 			return nil, nil
 		}
 		return nil, err

diff --git a/physical/aerospike/aerospike_test.go b/physical/aerospike/aerospike_test.go
@@ -43,7 +43,7 @@ func prepareAerospikeContainer(t *testing.T) (func(), *aerospikeConfig) {
 	runner, err := docker.NewServiceRunner(docker.RunOptions{
 		ImageRepo:     "aerospike/aerospike-server",
 		ContainerName: "aerospikedb",
-		ImageTag:      "5.5.0.10",
+		ImageTag:      "5.6.0.5",
 		Ports:         []string{"3000/tcp", "3001/tcp", "3002/tcp", "3003/tcp"},
 	})
 	if err != nil {