protocol buf changes. need to merge #6173

hashicorp · Feb 12, 2019 · b717550 · b717550
1 parent 9e97e45
commit b717550
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/builtin/logical/database/dbplugin/grpc_transport.go b/builtin/logical/database/dbplugin/grpc_transport.go
@@ -115,23 +115,19 @@ func (s *gRPCServer) Close(_ context.Context, _ *Empty) (*Empty, error) {
 	return &Empty{}, nil
 }
 
-func (s *gRPCServer) SetCredentials(context.Context, *SetCredentialsRequest) (*SetCredentialsResponse, error) {
+func (s *gRPCServer) SetCredentials(ctx context.Context, req *SetCredentialsRequest) (*SetCredentialsResponse, error) {
 
-	resp, err := s.impl.SetCredentials(ctx, req.StaticUserConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	respConfig, err := json.Marshal(resp)
+	username, password, restored, err := s.impl.SetCredentials(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 
 	return &SetCredentialsResponse{
-		Config: respConfig,
+		Username: username,
+		Password: password,
+		Restored: restored,
 	}, err
-}
-	return nil, status.Error(codes.Unimplemented, "not yet implemented")
+	// return nil, status.Error(codes.Unimplemented, "not yet implemented")
 }
 
 // ---- gRPC client domain ----
@@ -302,3 +298,7 @@ func (c *gRPCClient) Close() error {
 	_, err := c.client.Close(c.doneCtx, &Empty{})
 	return err
 }
+
+func (c *gRPCClient) SetCredentials(ctx context.Context, req *SetCredentialsRequest) (username, password string, restored bool, err error) {
+	return
+}
diff --git a/builtin/logical/database/dbplugin/plugin.go b/builtin/logical/database/dbplugin/plugin.go
@@ -23,6 +23,7 @@ type Database interface {
 	RevokeUser(ctx context.Context, statements Statements, username string) error
 
 	RotateRootCredentials(ctx context.Context, statements []string) (config map[string]interface{}, err error)
+	SetCredentials(ctx context.Context, req *SetCredentialsRequest) (username string, password string, restored bool, err error)
 
 	Init(ctx context.Context, config map[string]interface{}, verifyConnection bool) (saveConfig map[string]interface{}, err error)
 	Close() error