Merge pull request #34 from harsimranmaan/error_message_update

Return a client error when a nodeID is not found

Author: michaelw

.circleci/config.yml

@@ -8,9 +8,8 @@ defaultenv: &defaultenv
 
 jobs:
   build:
-    working_directory: /go/workdir/src/github.com/splunk/vault-plugin-splunk
     docker:
-      - image: circleci/golang:1.16.6
+      - image: cimg/go:1.18
         <<: *defaultenv
       - image: splunk/splunk:latest
         user: root

Makefile

@@ -36,7 +36,7 @@ lint: dep
 
 .PHONY: dep
 dep:
-	./scripts/golangci-lint.sh -b $(GOBIN) v1.42.0
+	./scripts/golangci-lint.sh -b $(GOBIN) v1.45.0
 
 .PHONY: clean
 clean:

README.md

@@ -15,8 +15,8 @@ accounts, including secrets rotation for compliance purposes.
 # Building from Source
 
 ```shell
-git clone [email protected]:splunk/vault-plugin-splunk ${GOPATH}/src/github.com/splunk/vault-plugin-splunk
-cd ${GOPATH}/src/github.com/splunk/vault-plugin-splunk
+git clone [email protected]:splunk/vault-plugin-splunk
+cd vault-plugin-splunk
 make
 ```
 

backend_test.go

@@ -9,7 +9,7 @@ import (
 	logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
 	"github.com/hashicorp/vault/sdk/logical"
 	"github.com/mitchellh/mapstructure"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 
 	"github.com/splunk/vault-plugin-splunk/clients/splunk"
 )
@@ -40,6 +40,7 @@ func TestBackend_basic(t *testing.T) {
 				testAccStepConfig(t),
 				testAccStepRole(t, "test", roleConfig),
 				testAccStepCredsRead(t, "test"),
+				testAccStepCredsReadMultiBadConfig(t, "test"),
 			},
 		})
 	}
@@ -278,6 +279,21 @@ func testAccStepCredsRead(t *testing.T, role string) logicaltest.TestStep {
 	}
 }
 
+func testAccStepCredsReadMultiBadConfig(t *testing.T, role string) logicaltest.TestStep {
+	return logicaltest.TestStep{
+		Operation: logical.ReadOperation,
+		Path:      "creds/" + role + "/someNonExistentNodeID",
+		ErrorOk:   true,
+		Check: func(resp *logical.Response) error {
+			if resp == nil {
+				return fmt.Errorf("response is nil")
+			}
+			assert.Error(t, resp.Error(), `host "someNonExistentNodeID" not found`)
+			return nil
+		},
+	}
+}
+
 func testAccRotateRoot(t *testing.T, conn string) logicaltest.TestStep {
 	return logicaltest.TestStep{
 		Operation: logical.UpdateOperation,

clients/splunk/auth_test.go

@@ -3,7 +3,7 @@ package splunk
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestAuthenticationService(t *testing.T) {

clients/splunk/client_test.go

@@ -3,7 +3,7 @@ package splunk
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestTokenSource_Token(t *testing.T) {

clients/splunk/introspection_test.go

@@ -3,7 +3,7 @@ package splunk
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func testIntrospectionService(t *testing.T) *IntrospectionService {

clients/splunk/properties_test.go

@@ -1,8 +1,9 @@
 package splunk
 
 import (
-	"gotest.tools/assert"
 	"testing"
+
+	"gotest.tools/v3/assert"
 )
 
 func TestPropertiesService_GetKey(t *testing.T) {

clients/splunk/splunk_test.go

@@ -3,7 +3,7 @@ package splunk
 import (
 	"testing"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 
 	"github.com/google/go-querystring/query"
 )

clients/splunk/testing.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-uuid"
-	"github.com/ory/dockertest"
+	"github.com/ory/dockertest/v3"
 	"golang.org/x/oauth2"
 )