cmd: fix name prefix matching

Currently if there are two services, and one service is named
busybox while the other is busybox-top. It is not possible to
remove the busybox service by giving its fullname which is also
a common name prefix of both. The only way out is removing the
busybox-top service first. This looks not an acceptable behavior.

The same problem applies to clusters, nodes and networks.

Fix it by finding a full name match if prefix matches are more
than one.

Another way to fix it is that start a request with a full name
filter before doing it with a name prefix filter. But I think
this way just presents the same result but adds one more call
overhead to server.

Signed-off-by: Jin Xu <jinuxstyle@hotmail.com>
v2: do not use node's Spec.Annotations.Name as defaut

cmd/swarmctl/cluster/common.go

@@ -29,6 +29,12 @@ func getCluster(ctx context.Context, c api.ControlClient, input string) (*api.Cl
 	}
 
 	if l := len(rl.Clusters); l > 1 {
+		for _, c := range rl.Clusters {
+			if c.Spec.Annotations.Name == input {
+				// Found a full name match
+				return c, nil
+			}
+		}
 		return nil, fmt.Errorf("cluster %s is ambiguous (%d matches found)", input, l)
 	}
 

cmd/swarmctl/network/common.go

@@ -32,6 +32,12 @@ func GetNetwork(ctx context.Context, c api.ControlClient, input string) (*api.Ne
 		}
 
 		if l := len(rl.Networks); l > 1 {
+			for _, n := range rl.Networks {
+				if n.Spec.Annotations.Name == input {
+					// Found a full name match
+					return n, nil
+				}
+			}
 			return nil, fmt.Errorf("network %s is ambiguous (%d matches found)", input, l)
 		}
 

cmd/swarmctl/node/common.go

@@ -138,6 +138,16 @@ func getNode(ctx context.Context, c api.ControlClient, input string) (*api.Node,
 		}
 
 		if l := len(rl.Nodes); l > 1 {
+			for _, n := range rl.Nodes {
+				name := ""
+				if n.Description != nil {
+					name = n.Description.Hostname
+				}
+				if name == input {
+					// Found a full name match
+					return n, nil
+				}
+			}
 			return nil, fmt.Errorf("node %s is ambiguous (%d matches found)", input, l)
 		}
 

cmd/swarmctl/node/list.go

@@ -42,11 +42,11 @@ var (
 				common.PrintHeader(w, "ID", "Name", "Membership", "Status", "Availability", "Manager Status")
 				output = func(n *api.Node) {
 					spec := &n.Spec
-					name := spec.Annotations.Name
+					name := ""
 					availability := spec.Availability.String()
 					membership := spec.Membership.String()
 
-					if name == "" && n.Description != nil {
+					if n.Description != nil {
 						name = n.Description.Hostname
 					}
 					reachability := ""

cmd/swarmctl/service/common.go

@@ -29,6 +29,12 @@ func getService(ctx context.Context, c api.ControlClient, input string) (*api.Se
 		}
 
 		if l := len(rl.Services); l > 1 {
+			for _, s := range rl.Services {
+				if s.Spec.Annotations.Name == input {
+					// Found a full name match
+					return s, nil
+				}
+			}
 			return nil, fmt.Errorf("service %s is ambiguous (%d matches found)", input, l)
 		}