From 5094149406d55c4119b03e9160fed64c9f22d3a5 Mon Sep 17 00:00:00 2001 From: Pavel Sviderski Date: Fri, 4 Oct 2024 20:45:54 +1000 Subject: [PATCH] improve error message for adding machine that already exists in the cluster --- internal/machine/cluster/cluster.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/machine/cluster/cluster.go b/internal/machine/cluster/cluster.go index c562c96f..ab3c5be9 100644 --- a/internal/machine/cluster/cluster.go +++ b/internal/machine/cluster/cluster.go @@ -110,11 +110,17 @@ func (c *Cluster) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*p } if req.Network.ManagementIp != nil && req.Network.ManagementIp.Equal(m.Network.ManagementIp) { manageIP, _ := req.Network.ManagementIp.ToAddr() - return nil, status.Errorf(codes.AlreadyExists, "machine with management IP %q already exists", manageIP) + return nil, status.Errorf( + codes.AlreadyExists, "machine with management IP %q already exists under the name %q", + manageIP, m.Name, + ) } if bytes.Equal(m.Network.PublicKey, req.Network.PublicKey) { publicKey := secret.Secret(m.Network.PublicKey) - return nil, status.Errorf(codes.AlreadyExists, "machine with public key %q already exists", publicKey) + return nil, status.Errorf( + codes.AlreadyExists, "machine with public key %q already exists under the name %q", + publicKey, m.Name, + ) } allocatedSubnets[i], _ = m.Network.Subnet.ToPrefix() }