TSDB-115: Fix propagation of password and token. (#228)

v3io · May 14, 2019 · cf521f4 · cf521f4
1 parent f0f77c7
commit cf521f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/backends/tsdb/backend.go b/backends/tsdb/backend.go
@@ -73,7 +73,7 @@ func (b *Backend) newConfig(session *frames.Session) *config.V3ioConfig {
 	return config.WithDefaults(cfg)
 }
 
-func (b *Backend) newAdapter(session *frames.Session, path string) (*tsdb.V3ioAdapter, error) {
+func (b *Backend) newAdapter(session *frames.Session, password string, token string, path string) (*tsdb.V3ioAdapter, error) {
 
 	session = frames.InitSessionDefaults(session, b.framesConfig)
 	containerName, newPath, err := v3ioutils.ProcessPaths(session, path, false)
@@ -86,8 +86,8 @@ func (b *Backend) newAdapter(session *frames.Session, path string) (*tsdb.V3ioAd
 
 	container, err := v3ioutils.NewContainer(
 		session,
-		"",
-		"",
+		password,
+		token,
 		b.logger,
 		cfg.Workers,
 	)
@@ -107,10 +107,10 @@ func (b *Backend) newAdapter(session *frames.Session, path string) (*tsdb.V3ioAd
 }
 
 // GetAdapter returns an adapter
-func (b *Backend) GetAdapter(session *frames.Session, path string) (*tsdb.V3ioAdapter, error) {
+func (b *Backend) GetAdapter(session *frames.Session, password string, token string, path string) (*tsdb.V3ioAdapter, error) {
 	// TODO: maintain adapter cache, for now create new per read/write request
 
-	adapter, err := b.newAdapter(session, path)
+	adapter, err := b.newAdapter(session, password, token, path)
 	if err != nil {
 		return nil, err
 	}
@@ -189,7 +189,7 @@ func (b *Backend) Delete(request *frames.DeleteRequest) error {
 
 	delAll := request.Proto.Start == "" && request.Proto.End == ""
 
-	adapter, err := b.GetAdapter(request.Proto.Session, request.Proto.Table)
+	adapter, err := b.GetAdapter(request.Proto.Session, request.Password.Get(), request.Token.Get(), request.Proto.Table)
 	if err != nil {
 		return err
 	}

diff --git a/backends/tsdb/reader.go b/backends/tsdb/reader.go
@@ -83,7 +83,7 @@ func (b *Backend) Read(request *frames.ReadRequest) (frames.FrameIterator, error
 			return nil, err
 		}
 	}
-	adapter, err := b.GetAdapter(request.Proto.Session, table)
+	adapter, err := b.GetAdapter(request.Proto.Session, request.Password.Get(), request.Token.Get(), table)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create adapter")
 	}

diff --git a/backends/tsdb/writer.go b/backends/tsdb/writer.go
@@ -34,7 +34,7 @@ import (
 
 func (b *Backend) Write(request *frames.WriteRequest) (frames.FrameAppender, error) {
 	b.logger.InfoWith("write request", "request", request)
-	adapter, err := b.GetAdapter(request.Session, request.Table)
+	adapter, err := b.GetAdapter(request.Session, request.Password.Get(), request.Token.Get(), request.Table)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create adapter")
 	}