Add listing to database connections. (#2827)

Fixes #2823
hashicorp · Jun 7, 2017 · 2daf018 · 2daf018
1 parent 25fd17a
commit 2daf018
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/builtin/logical/database/backend.go b/builtin/logical/database/backend.go
@@ -25,6 +25,7 @@ func Backend(conf *logical.BackendConfig) *databaseBackend {
 		Help: strings.TrimSpace(backendHelp),
 
 		Paths: []*framework.Path{
+			pathListPluginConnection(&b),
 			pathConfigurePluginConnection(&b),
 			pathListRoles(&b),
 			pathRoles(&b),

diff --git a/builtin/logical/database/backend_test.go b/builtin/logical/database/backend_test.go
@@ -185,6 +185,19 @@ func TestBackend_config_connection(t *testing.T) {
 	if !reflect.DeepEqual(expected, resp.Data) {
 		t.Fatalf("bad: expected:%#v\nactual:%#v\n", expected, resp.Data)
 	}
+
+	configReq.Operation = logical.ListOperation
+	configReq.Data = nil
+	configReq.Path = "config/"
+	resp, err = b.HandleRequest(configReq)
+	if err != nil {
+		t.Fatal(err)
+	}
+	keys := resp.Data["keys"].([]string)
+	key := keys[0]
+	if key != "plugin-test" {
+		t.Fatalf("bad key: %q", key)
+	}
 }
 
 func TestBackend_basic(t *testing.T) {

diff --git a/builtin/logical/database/path_config_connection.go b/builtin/logical/database/path_config_connection.go
@@ -115,6 +115,30 @@ func pathConfigurePluginConnection(b *databaseBackend) *framework.Path {
 	}
 }
 
+func pathListPluginConnection(b *databaseBackend) *framework.Path {
+	return &framework.Path{
+		Pattern: fmt.Sprintf("config/?$"),
+
+		Callbacks: map[logical.Operation]framework.OperationFunc{
+			logical.ListOperation: b.connectionListHandler(),
+		},
+
+		HelpSynopsis:    pathConfigConnectionHelpSyn,
+		HelpDescription: pathConfigConnectionHelpDesc,
+	}
+}
+
+func (b *databaseBackend) connectionListHandler() framework.OperationFunc {
+	return func(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
+		entries, err := req.Storage.List("config/")
+		if err != nil {
+			return nil, err
+		}
+
+		return logical.ListResponse(entries), nil
+	}
+}
+
 // connectionReadHandler reads out the connection configuration
 func (b *databaseBackend) connectionReadHandler() framework.OperationFunc {
 	return func(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {