From f742d01cedceff8247a1d7f23a7e1f46c0686d31 Mon Sep 17 00:00:00 2001
From: iguazio-deploy <iguazio-deploy@iguazio.com>
Date: Thu, 3 Jan 2019 15:38:48 +0000
Subject: [PATCH] Updated TSDB to v0.8.6

---
 vendor/github.com/v3io/v3io-tsdb/.gitignore            |  1 -
 vendor/github.com/v3io/v3io-tsdb/pkg/config/config.go  |  2 +-
 .../github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl.go   | 10 +++++-----
 .../v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl_test.go         |  4 ++--
 .../github.com/v3io/v3io-tsdb/pkg/utils/container.go   |  2 +-
 .../vendor/github.com/v3io/v3io-go-http/context.go     |  8 ++++----
 6 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 vendor/github.com/v3io/v3io-tsdb/.gitignore

diff --git a/vendor/github.com/v3io/v3io-tsdb/.gitignore b/vendor/github.com/v3io/v3io-tsdb/.gitignore
deleted file mode 100644
index bff2d762960..00000000000
--- a/vendor/github.com/v3io/v3io-tsdb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.iml
diff --git a/vendor/github.com/v3io/v3io-tsdb/pkg/config/config.go b/vendor/github.com/v3io/v3io-tsdb/pkg/config/config.go
index 53e1bb20e3b..f1d2cb61fda 100644
--- a/vendor/github.com/v3io/v3io-tsdb/pkg/config/config.go
+++ b/vendor/github.com/v3io/v3io-tsdb/pkg/config/config.go
@@ -122,7 +122,7 @@ type V3ioConfig struct {
 	TablePath      string `json:"tablePath"`
 	Username       string `json:"username,omitempty"`
 	Password       string `json:"password,omitempty"`
-	SessionKey     string `json:"sessionKey,omitempty"`
+	AccessKey      string `json:"accessKey,omitempty"`
 
 	HttpTimeout string `json:"httpTimeout,omitempty"`
 
diff --git a/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl.go b/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl.go
index 6d63712fd64..43c245fad78 100644
--- a/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl.go
+++ b/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl.go
@@ -46,7 +46,7 @@ type RootCommandeer struct {
 	container   string
 	username    string
 	password    string
-	sessionKey  string
+	accessKey   string
 	Reporter    *performance.MetricReporter
 	BuildInfo   *config.BuildInfo
 }
@@ -83,8 +83,8 @@ func NewRootCommandeer() *RootCommandeer {
 		"Username of an Iguazio Continuous Data Platform user.")
 	cmd.PersistentFlags().StringVarP(&commandeer.password, "password", "p", "",
 		"Password of the configured user (see -u|--username).")
-	cmd.PersistentFlags().StringVarP(&commandeer.sessionKey, "session-key", "k", "",
-		"Session key for accessing the required table.\nIf session-key is passed, it will take precedence on user/password authentication.")
+	cmd.PersistentFlags().StringVarP(&commandeer.accessKey, "access-key", "k", "",
+		"Access-key for accessing the required table.\nIf access-key is passed, it will take precedence on user/password authentication.")
 
 	// Add children
 	cmd.AddCommand(
@@ -144,8 +144,8 @@ func (rc *RootCommandeer) populateConfig(cfg *config.V3ioConfig) error {
 		cfg.Password = rc.password
 	}
 
-	if rc.sessionKey != "" {
-		cfg.SessionKey = rc.sessionKey
+	if rc.accessKey != "" {
+		cfg.AccessKey = rc.accessKey
 	}
 
 	if rc.v3ioPath != "" {
diff --git a/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl_test.go b/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl_test.go
index 52f7a463f9f..9be9e9f6169 100644
--- a/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl_test.go
+++ b/vendor/github.com/v3io/v3io-tsdb/pkg/tsdbctl/tsdbctl_test.go
@@ -61,7 +61,7 @@ func (suite *testTsdbctlSuite) TestPopulateConfigWithTenant() {
 		TablePath:      "/x/y/z",
 		Username:       "Vel@Odar",
 		Password:       "p455w0rd",
-		SessionKey:     "sess10n-key",
+		AccessKey:      "acce55-key",
 	})
 
 	suite.Require().Nil(err)
@@ -81,7 +81,7 @@ func (suite *testTsdbctlSuite) TestContainerConfig() {
 		TablePath:      "/x/y/z",
 		Username:       "Vel@Odar",
 		Password:       "p455w0rd",
-		SessionKey:     "sess10n-key",
+		AccessKey:      "acce55-key",
 	})
 
 	suite.Require().Nil(err)
diff --git a/vendor/github.com/v3io/v3io-tsdb/pkg/utils/container.go b/vendor/github.com/v3io/v3io-tsdb/pkg/utils/container.go
index f031a635a78..f3f035f8049 100644
--- a/vendor/github.com/v3io/v3io-tsdb/pkg/utils/container.go
+++ b/vendor/github.com/v3io/v3io-tsdb/pkg/utils/container.go
@@ -80,7 +80,7 @@ func CreateContainer(logger logger.Logger, cfg *config.V3ioConfig) (*v3io.Contai
 		Username:   cfg.Username,
 		Password:   cfg.Password,
 		Label:      "tsdb",
-		SessionKey: cfg.SessionKey,
+		SessionKey: cfg.AccessKey,
 	}
 	session, err := context.NewSessionFromConfig(sessionConfig)
 	if err != nil {
diff --git a/vendor/github.com/v3io/v3io-tsdb/vendor/github.com/v3io/v3io-go-http/context.go b/vendor/github.com/v3io/v3io-tsdb/vendor/github.com/v3io/v3io-go-http/context.go
index f62dd286a55..9f1bde6ab70 100644
--- a/vendor/github.com/v3io/v3io-tsdb/vendor/github.com/v3io/v3io-go-http/context.go
+++ b/vendor/github.com/v3io/v3io-tsdb/vendor/github.com/v3io/v3io-go-http/context.go
@@ -12,10 +12,10 @@ type Context struct {
 }
 
 type SessionConfig struct {
-	Username	string
-	Password	string
-	Label		string
-	SessionKey	string
+	Username  string
+	Password  string
+	Label     string
+	SessionKey string
 }
 
 func NewContext(parentLogger logger.Logger, clusterURL string, numWorkers int) (*Context, error) {