philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve error message for adding machine that already exists in the cluster

Browse Source
This commit is contained in:
Pavel Sviderski
2024-10-04 20:45:54 +10:00
parent 2fd1ee203a
commit 5094149406
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/machine/cluster/cluster.go
+8 -2
View File
@@ -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) { if req.Network.ManagementIp != nil && req.Network.ManagementIp.Equal(m.Network.ManagementIp) {
manageIP, _ := req.Network.ManagementIp.ToAddr() 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) { if bytes.Equal(m.Network.PublicKey, req.Network.PublicKey) {
publicKey := secret.Secret(m.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() allocatedSubnets[i], _ = m.Network.Subnet.ToPrefix()
} }