Fix TSDB-4: handle tenant correctly in CLI. (#48)

Author: Gal Topper

pkg/tsdbctl/tsdbctl.go

@@ -93,7 +93,6 @@ func (rc *RootCommandeer) CreateMarkdown(path string) error {
 }
 
 func (rc *RootCommandeer) initialize() error {
-
 	cfg, err := config.LoadConfig(rc.cfgFilePath)
 	if err != nil {
 		// if we couldn't load the file and its not the default
@@ -103,11 +102,14 @@ func (rc *RootCommandeer) initialize() error {
 		cfg = &config.V3ioConfig{} // initialize struct, will try and set it from individual flags
 		config.InitDefaults(cfg)
 	}
+	rc.populateConfig(cfg)
+	return nil
+}
 
+func (rc *RootCommandeer) populateConfig(cfg *config.V3ioConfig) error {
 	if rc.v3ioPath != "" {
-
 		// read username and password
-		if i := strings.Index(rc.v3ioPath, "@"); i > 0 {
+		if i := strings.LastIndex(rc.v3ioPath, "@"); i > 0 {
 			cfg.Username = rc.v3ioPath[0:i]
 			rc.v3ioPath = rc.v3ioPath[i+1:]
 			if userpass := strings.Split(cfg.Username, ":"); len(userpass) > 1 {
@@ -123,19 +125,15 @@ func (rc *RootCommandeer) initialize() error {
 		cfg.V3ioUrl = rc.v3ioPath[0:slash]
 		cfg.Container = rc.v3ioPath[slash+1:]
 	}
-
 	if rc.dbPath != "" {
 		cfg.Path = rc.dbPath
 	}
-
 	if cfg.V3ioUrl == "" || cfg.Container == "" || cfg.Path == "" {
-		return fmt.Errorf("User must provide V3IO URL, container name, and table path via the config file or flags")
+		return fmt.Errorf("user must provide V3IO URL, container name, and table path via the config file or flags")
 	}
-
 	if rc.verbose != "" {
 		cfg.Verbose = rc.verbose
 	}
-
 	rc.v3iocfg = cfg
 	return nil
 }

pkg/tsdbctl/tsdbctl_test.go

@@ -0,0 +1,60 @@
+/*
+Copyright 2018 Iguazio Systems Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License") with
+an addition restriction as set forth herein. You may not use this
+file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+In addition, you may not use the software for any purposes that are
+illegal under applicable law, and the grant of the foregoing license
+under the Apache 2.0 license is conditioned upon your compliance with
+such restriction.
+*/
+
+package tsdbctl
+
+import (
+	"github.com/stretchr/testify/suite"
+	"github.com/v3io/v3io-tsdb/pkg/config"
+	"testing"
+)
+
+type testSuite struct {
+	suite.Suite
+}
+
+func (suite *testSuite) TestPopulateConfigWithTenant() {
+	rc := RootCommandeer{v3ioPath: "Vel@Odar:p455w0rd@localhost:80123/123"}
+	cfg := &config.V3ioConfig{
+		Path: "/x/y/z",
+	}
+
+	err := rc.populateConfig(cfg)
+
+	expectedRc := RootCommandeer{
+		v3iocfg:  cfg,
+		v3ioPath: "localhost:80123/123",
+	}
+	expectedCfg := &config.V3ioConfig{
+		V3ioUrl:   "localhost:80123",
+		Container: "123",
+		Path:      "/x/y/z",
+		Username:  "Vel@Odar",
+		Password:  "p455w0rd",
+	}
+
+	suite.Require().Nil(err)
+	suite.Require().Equal(expectedCfg, rc.v3iocfg)
+	suite.Require().Equal(expectedRc, rc)
+}
+
+func TestBuilderSuite(t *testing.T) {
+	suite.Run(t, new(testSuite))
+}