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

rename Machine message to MachineInfo to not conflict with the service name

Browse Source
This commit is contained in:
Pavel Sviderski
2024-09-08 13:40:43 +10:00
parent f49e91b41f
commit 45cacfa6f5
6 changed files with 145 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/machine/cluster/server.go
+2 -2
View File
@@ -75,7 +75,7 @@ func (c *Server) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*pb
if manageIP == nil {
manageIP = pb.NewIP(network.ManagementIP(req.Network.PublicKey))
}
m := &pb.Machine{
m := &pb.MachineInfo{
Id: mid,
Name: req.Name,
Network: &pb.NetworkConfig{
@@ -105,7 +105,7 @@ func (c *Server) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*pb
m.Network.Subnet = pb.NewIPPrefix(subnet)
// TODO: announce the new machine to the cluster network using Serf and achieve consensus.
mState := proto.Clone(m).(*pb.Machine)
mState := proto.Clone(m).(*pb.MachineInfo)
c.state.State.Machines[mState.Id] = mState
// Store machine endpoints in a separate collection to allow modifying them with limited permissions.
c.state.State.Endpoints[mState.Id] = &pb.MachineEndpoints{
internal/machine/cluster/state.go
+2 -2
View File
@@ -17,7 +17,7 @@ func StatePath(dataDir string) string {
func NewState(path string) *State {
return &State{
State: &pb.State{
Machines: make(map[string]*pb.Machine),
Machines: make(map[string]*pb.MachineInfo),
Endpoints: make(map[string]*pb.MachineEndpoints),
},
path: path,
@@ -33,7 +33,7 @@ func (s *State) Load() error {
return fmt.Errorf("parse state file %q: %w", s.path, err)
}
if s.State.Machines == nil {
s.State.Machines = make(map[string]*pb.Machine)
s.State.Machines = make(map[string]*pb.MachineInfo)
}
if s.State.Endpoints == nil {
s.State.Endpoints = make(map[string]*pb.MachineEndpoints)