add.go

@@ -61,19 +61,6 @@ func (c *OldCluster) FindDropletByName(name string) *Droplet {
 	return nil
 }
 
-func (c *OldCluster) FindDropletByUuid(id string) *Droplet {
-	/*
-		log.Info("START FIND", id)
-		loop := c.d.All() // get the list of droplets
-		for loop.Scan() {
-			d := loop.Next()
-			log.Info("droplet:", d.Hostname, d.Uuid)
-		}
-		log.Info("END FIND", id)
-	*/
-	return c.d.FindByUuid(id)
-}
-
 func (c *OldCluster) FindHypervisorByName(name string) *Hypervisor {
 	for _, h := range c.H.Hypervisors {
 		if h.Hostname == name {

change.go

@@ -73,7 +73,7 @@ func (d *Droplet) NewChangeEvent(fname string, origval any, newval any) *Event {
 	var e *Event
 	e = new(Event)
 
-	e.DropletName = d.Hostname
+	e.Droplet = d.Hostname
 	e.OrigVal = convertToString(origval)
 	e.NewVal = convertToString(newval)
 	e.FieldName = fname
@@ -99,12 +99,12 @@ func NewAddEvent(a any, fname string, newval any) *Event {
 	case *Droplet:
 		var d *Droplet
 		d = a.(*Droplet)
-		e.DropletName = d.Hostname
+		e.Droplet = d.Hostname
 	case nil:
-		e.DropletName = "<nil>"
+		e.Droplet = "<nil>"
 	default:
 		log.Info("newAddEvent() unknown type", v)
-		e.DropletName = "on something somewhere"
+		e.Droplet = "on something somewhere"
 	}
 
 	e.NewVal = convertToString(newval)
@@ -177,7 +177,7 @@ func (c *OldCluster) ChangeDropletState(d *Droplet, newState DropletState) error
 	var e *Event
 	e = new(Event)
 
-	e.DropletName = d.Hostname
+	e.Droplet = d.Hostname
 	e.OrigVal = convertToString(d.Current.State)
 	e.NewVal = convertToString(newState)
 	e.FieldName = "status"
@@ -209,7 +209,7 @@ func (c *OldCluster) DropletMoved(d *Droplet, newh *Hypervisor) error {
 	var e *Event
 	e = new(Event)
 
-	e.DropletName = d.Hostname
+	e.Droplet = d.Hostname
 	e.OrigVal = d.Current.Hypervisor
 	e.NewVal = newh.Hostname
 	e.FieldName = "droplet migrate"

cluster.proto

@@ -4,16 +4,14 @@ package virtpb;
 import "google/protobuf/timestamp.proto";
 import "droplet.proto";
 import "hypervisor.proto";
-import "event.proto";
 
-message Cluster {                                         // `autogenpb:marshal`
+message Cluster {
         string                      uuid            = 1;  // `autogenpb:unique`
         string                      name            = 2;
         repeated string             URL             = 3;
         google.protobuf.Timestamp   ctime           = 4;  // when the cluster was created
-        Droplets                    droplets        = 5;
-        Hypervisors                 hypervisors     = 6;
-        Events                      events          = 7;
+        repeated Droplet            droplets        = 5;
+        repeated Hypervisor         hypervisors     = 6;
 }
 
 message Clusters {                                        // `autogenpb:marshal`

config.go

@@ -9,34 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.wit.com/log"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-func (c *Cluster) ConfigSave() error {
-	name := c.Name
-	if name == "" {
-		name = c.Uuid
-	}
-	fullname := filepath.Join(os.Getenv("VIRTIGO_HOME"), name+".pb")
-	cfgfile, err := os.OpenFile(fullname, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-	defer cfgfile.Close()
-	if err != nil {
-		fmt.Println("open config file :", err)
-		return err
-	}
-	log.Info("ConfigSave()", fullname)
-	data, err := c.Marshal()
-	if err != nil {
-		fmt.Println("cluster Marshal() err:", err)
-		return err
-	}
-	fmt.Fprintln(cfgfile, data)
-	return nil
-}
-
 // writes out the cluster information it seperate files
 // to make it humanly possible to hand edit things as needed
 func (c *OldCluster) ConfigSave() error {
@@ -57,12 +34,20 @@ func (c *OldCluster) ConfigSave() error {
 	for _, drop := range dcopy.Droplets {
 		drop.Current = nil
 	}
+	if err := ConfigWriteJSON(dcopy, "droplets.json"); err != nil {
+		fmt.Println("droplets.json write failed")
+		return err
+	}
 	if err := ConfigWriteTEXT(dcopy, "droplets.text"); err != nil {
 		fmt.Println("droplets.json write failed")
 		return err
 	}
 	c.configWriteDroplets()
 
+	if err := ConfigWriteJSON(c.H, "hypervisors.json"); err != nil {
+		fmt.Println("hypervisors.json write failed")
+		return err
+	}
 	if err := ConfigWriteTEXT(c.H, "hypervisors.text"); err != nil {
 		fmt.Println("hypervisors.json write failed")
 		return err
@@ -84,22 +69,22 @@ func (c *OldCluster) ConfigLoad() error {
 		return errors.New("It's not safe to run ConfigLoad() on a nil cluster")
 	}
 
-	if data, err := loadFile("droplets.text"); err == nil {
-		if err = prototext.Unmarshal(data, c.d); err != nil {
-			fmt.Println("broken droplets.text config file")
+	if data, err := loadFile("droplets.json"); err == nil {
+		if err = protojson.Unmarshal(data, c.d); err != nil {
+			fmt.Println("broken droplets.json config file")
 			return err
 		}
 	} else {
 		return err
 	}
 
-	if data, err := loadFile("hypervisors.text"); err == nil {
-		if err = prototext.Unmarshal(data, c.H); err != nil {
-			fmt.Println("broken hypervisors.text config file")
+	if data, err := loadFile("hypervisors.json"); err == nil {
+		if err = protojson.Unmarshal(data, c.H); err != nil {
+			fmt.Println("broken hypervisors.json config file")
 			return err
 		}
 	} else {
-		log.Warn("ERROR HERE IN Hypervisors")
+		fmt.Println("ERROR HERE IN Hypervisors")
 		return err
 	}
 
@@ -108,11 +93,8 @@ func (c *OldCluster) ConfigLoad() error {
 		// does it not stay allocated after this function ends?
 		c.e = new(Events)
 	}
-
 	if err := c.e.loadEvents(); err != nil {
-		// ignore events.pb since these should be sent elsewhere
-		log.Warn("Events failed to load, ignoring:", err)
-		return nil
+		return err
 	}
 	return nil
 }

event.proto

@@ -3,7 +3,6 @@ package virtpb;
 
 import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
 import "google/protobuf/any.proto"; // Import the well-known type for Timestamp
-import "droplet.proto";
 
 // global settings for autogenpb `autogenpb:no-sort` `autogenpb:mutex`
 
@@ -19,15 +18,10 @@ message Events {                                             // `autogenpb:marsh
 // at least for now in the early days. but maybe forever.
 // homelab clouds normally don't have many events.
 // we are talking less than 1 a minute. even 1 an hour is often a lot
-message Event {                                              // `autogenpb:marshal`
-        enum status {
-                DONE    = 0;
-                FAIL    = 1;
-                RUNNING = 2;
-        }
+message Event {
         int32                       id                 = 1;  // `autogenpb:unique` // should be unique across the cluster
         EventType                   etype              = 2;
-        string                      dropletName        = 3;  // name of the droplet
+        string                      droplet            = 3;  // name of the droplet
         string                      dropletUuid        = 4;  // uuid of the droplet
         string                      hypervisor         = 5;  // name of the hypervisor
         string                      hypervisorUuid     = 6;  // uuid of the hypervisor
@@ -38,10 +32,8 @@ message Event {                                              // `autogenpb:marsh
         string                      newVal             = 11; // new value
         google.protobuf.Any         origAny            = 12; // anypb format. probably overkill
         google.protobuf.Any         newAny             = 13; // anypb format
-        string                      error              = 14; // what went wrong
-        status                      state              = 15; // state of the event
-        Droplet                     droplet            = 16; // droplet
 }
+
 enum EventType {
         ADD	= 0;
         DELETE = 1;
@@ -56,5 +48,4 @@ enum EventType {
         FAIL	= 10;	// everything failed
         CRASH   = 11;   // droplet hard crashed
         CHANGE  = 12;   // droplet or hypervisor config change
-        EDIT    = 13;   // edit droplet settings
 }