topo: consul paths don't start with '/'

So, we should only check for non-empty topo roots instead of a '/' prefix. Signed-off-by: Sugu Sougoumarane <[email protected]>
morgo · Apr 27, 2020 · a129d14 · a129d14
1 parent 200b261
commit a129d14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/go/vt/topo/server.go b/go/vt/topo/server.go
@@ -45,7 +45,6 @@ package topo
 import (
 	"flag"
 	"fmt"
-	"strings"
 	"sync"
 
 	"golang.org/x/net/context"
@@ -219,8 +218,8 @@ func Open() *Server {
 	if *topoGlobalServerAddress == "" && *topoImplementation != "k8s" {
 		log.Exitf("topo_global_server_address must be configured")
 	}
-	if !strings.HasPrefix(*topoGlobalRoot, "/") {
-		log.Exitf("topo_global_root must be non-empty and must begin with a '/': %v", *topoGlobalRoot)
+	if *topoGlobalRoot == "" {
+		log.Exit("topo_global_root must be non-empty")
 	}
 	ts, err := OpenServer(*topoImplementation, *topoGlobalServerAddress, *topoGlobalRoot)
 	if err != nil {

diff --git a/go/vt/vtctl/cell_info.go b/go/vt/vtctl/cell_info.go
@@ -73,8 +73,8 @@ func commandAddCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
-	if !strings.HasPrefix(*root, "/") {
-		return fmt.Errorf("root must be non-empty and must begin with a '/': %v", *root)
+	if *root == "" {
+		return fmt.Errorf("root must be non-empty")
 	}
 	if subFlags.NArg() != 1 {
 		return fmt.Errorf("the <cell> argument is required for the AddCellInfo command")