Allow pools to be given a ksuid name

The commit fixes an issue with pool looks that made it so pools with a
ksuid-like name could not be looked up for most zed commands. Fix the
logic for lake/api.PoolID so that looking up a pool by ID is tried first
and then falls back to looking up a pool by name if nothing is found.

Closes #4431

cmd/zed/use/command.go

@@ -107,12 +107,9 @@ func (c *Command) Run(args []string) error {
 	if err != nil {
 		return err
 	}
-	poolID, err := lakeparse.ParseID(commitish.Pool)
+	poolID, err := lake.PoolID(ctx, commitish.Pool)
 	if err != nil {
-		poolID, err = lake.PoolID(ctx, commitish.Pool)
-		if err != nil {
-			return err
-		}
+		return err
 	}
 	if _, err = lake.CommitObject(ctx, poolID, commitish.Branch); err != nil {
 		return err

lake/api/local.go

@@ -128,6 +128,11 @@ func (l *local) PoolID(ctx context.Context, poolName string) (ksuid.KSUID, error
 	if poolName == "" {
 		return ksuid.Nil, errors.New("no pool name provided")
 	}
+	if id, err := lakeparse.ParseID(poolName); err == nil {
+		if _, err := l.root.OpenPool(ctx, id); err == nil {
+			return id, nil
+		}
+	}
 	return l.root.PoolID(ctx, poolName)
 }
 

lake/api/remote.go

@@ -33,6 +33,11 @@ func (l *remote) Root() *lake.Root {
 }
 
 func (r *remote) PoolID(ctx context.Context, poolName string) (ksuid.KSUID, error) {
+	if id, err := lakeparse.ParseID(poolName); err == nil {
+		if _, err := LookupPoolByID(ctx, r, id); err == nil {
+			return id, nil
+		}
+	}
 	config, err := LookupPoolByName(ctx, r, poolName)
 	if err != nil {
 		return ksuid.Nil, err

lake/root.go

@@ -238,16 +238,10 @@ func (r *Root) PoolID(ctx context.Context, poolName string) (ksuid.KSUID, error)
 	if poolName == "" {
 		return ksuid.Nil, errors.New("no pool name given")
 	}
-	poolID, err := ksuid.Parse(poolName)
-	var poolRef *pools.Config
-	if err != nil {
-		poolRef = r.pools.LookupByName(ctx, poolName)
-		if poolRef == nil {
-			return ksuid.Nil, fmt.Errorf("%s: %w", poolName, pools.ErrNotFound)
-		}
-		poolID = poolRef.ID
+	if poolRef := r.pools.LookupByName(ctx, poolName); poolRef != nil {
+		return poolRef.ID, nil
 	}
-	return poolID, nil
+	return ksuid.Nil, fmt.Errorf("%s: %w", poolName, pools.ErrNotFound)
 }
 
 func (r *Root) CommitObject(ctx context.Context, poolID ksuid.KSUID, branchName string) (ksuid.KSUID, error) {

lake/ztests/create-ksuid-name.yaml

@@ -0,0 +1,11 @@
+# Test that a pool can be given a ksuid name and everything still works.
+script: |
+  export ZED_LAKE=test
+  zed init -q
+  zed create 2WwyVrZdEITo5WkKu1YsJC4dMjU
+  zed use 2WwyVrZdEITo5WkKu1YsJC4dMjU
+outputs:
+  - name: stdout
+    regexp: |
+      pool created: 2WwyVrZdEITo5WkKu1YsJC4dMjU \w{27}
+      Switched to branch "main" on pool "2WwyVrZdEITo5WkKu1YsJC4dMjU"

service/request.go

@@ -84,18 +84,20 @@ func (r *Request) PoolID(w *ResponseWriter, root *lake.Root) (ksuid.KSUID, bool)
 	if !ok {
 		return ksuid.Nil, false
 	}
-	id, err := lakeparse.ParseID(s)
-	if err != nil {
-		id, err = root.PoolID(r.Context(), s)
-		if errors.Is(err, pools.ErrNotFound) {
-			w.Error(err)
-			return ksuid.Nil, false
-		}
-		if err != nil {
-			w.Error(srverr.ErrInvalid("invalid path param %q: %w", s, err))
-			return ksuid.Nil, false
+	if id, err := lakeparse.ParseID(s); err == nil {
+		if _, err = root.OpenPool(r.Context(), id); err == nil {
+			return id, true
 		}
 	}
+	id, err := root.PoolID(r.Context(), s)
+	if errors.Is(err, pools.ErrNotFound) {
+		w.Error(err)
+		return ksuid.Nil, false
+	}
+	if err != nil {
+		w.Error(srverr.ErrInvalid("invalid path param %q: %w", s, err))
+		return ksuid.Nil, false
+	}
 	return id, true
 }
 

service/ztests/create-ksuid-name.yaml

@@ -0,0 +1,12 @@
+# Test that a pool can be given a ksuid name and everything still works.
+script: |
+  source service.sh
+  zed create 2WwyVrZdEITo5WkKu1YsJC4dMjU
+  zed use 2WwyVrZdEITo5WkKu1YsJC4dMjU
+inputs:
+  - name: service.sh
+outputs:
+  - name: stdout
+    regexp: |
+      pool created: 2WwyVrZdEITo5WkKu1YsJC4dMjU \w{27}
+      Switched to branch "main" on pool "2WwyVrZdEITo5WkKu1YsJC4dMjU"