Move the rest of the protos (spawn) to internal

Author: fsmv

spawn/embedspawn/config.pb.go internal/spawnpb/config.pb.gospawn/embedspawn/config.pb.go renamed to internal/spawnpb/config.pb.go

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "ask.systems/daemon/spawn/embedspawn";
+option go_package = "ask.systems/daemon/internal/spawnpb";
 
 // The schema of the config file
 //

spawn/embedspawn/config.proto internal/spawnpb/config.protospawn/embedspawn/config.proto renamed to internal/spawnpb/config.proto

@@ -0,0 +1,6 @@
+package spawnpb
+
+import _ "embed"
+
+//go:embed config.proto
+var ConfigProto string

internal/spawnpb/embed.go

@@ -98,7 +98,7 @@ import (
 
 //go:generate protoc -I ./ internal/portalpb/storage.proto --go_out ./ --go_opt=paths=source_relative
 //go:generate protoc -I ./ internal/portalpb/service.proto --go_out ./ --go-grpc_out ./ --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative
-//go:generate protoc -I ./spawn/ spawn/embedspawn/config.proto --go_out ./spawn --go_opt=paths=source_relative
+//go:generate protoc -I ./ internal/spawnpb/config.proto --go_out ./ --go_opt=paths=source_relative
 
 type command struct {
 	name        string

main.go

@@ -17,6 +17,7 @@ import (
 	"syscall"
 	"time"
 
+	"ask.systems/daemon/internal/spawnpb"
 	_ "ask.systems/daemon/portal/flags"
 	"ask.systems/daemon/tools"
 )
@@ -30,7 +31,7 @@ type child struct {
 	Up          bool
 	Message     error
 	Name        string
-	Cmd         *Command
+	Cmd         *spawnpb.Command
 	Proc        *os.Process
 	ChrootFiles []string
 	Binary      string
@@ -66,7 +67,7 @@ func newChildren(quit chan struct{}) *children {
 	return c
 }
 
-func (c *children) StartPrograms(programs []*Command) (errCnt int) {
+func (c *children) StartPrograms(programs []*spawnpb.Command) (errCnt int) {
 	// Make portal first if it exists
 	portalIdx := 0
 	for i, cmd := range programs {
@@ -125,7 +126,7 @@ func (c *children) waitForPortalToken() (string, error) {
 	}
 }
 
-func (cmd *Command) FullName() string {
+func commandName(cmd *spawnpb.Command) string {
 	name := filepath.Base(cmd.Binary)
 	if cmd.Name != "" {
 		name = fmt.Sprintf("%v-%v", name, cmd.Name)
@@ -170,7 +171,7 @@ func (c *children) ReloadConfig() {
 	c.Lock()
 	defer c.Unlock()
 	for _, cmd := range commands {
-		name := cmd.FullName()
+		name := commandName(cmd)
 		cmdChild, ok := c.ByName[name]
 		if ok {
 			cmdChild.Cmd = cmd
@@ -393,7 +394,7 @@ func copyBinary(bin, out string, exclusive bool, uid, gid uint32) (string, error
 	return binary, openerr
 }
 
-func (children *children) setupChildFiles(cmd *Command, quit chan struct{}) ([]*os.File, error) {
+func (children *children) setupChildFiles(cmd *spawnpb.Command, quit chan struct{}) ([]*os.File, error) {
 	// Set up stdout and stderr piping
 	r, w, err := os.Pipe()
 	if err != nil {
@@ -420,6 +421,6 @@ func (children *children) setupChildFiles(cmd *Command, quit chan struct{}) ([]*
 	if err != nil {
 		return files, err
 	}
-	go children.HandleLogs(r, cmd.FullName())
+	go children.HandleLogs(r, commandName(cmd))
 	return files, nil
 }

spawn/embedspawn/children.go

@@ -19,6 +19,7 @@ import (
 	"syscall"
 	"time"
 
+	"ask.systems/daemon/internal/spawnpb"
 	"ask.systems/daemon/portal/gate"
 )
 
@@ -63,12 +64,12 @@ type platformSpecificChildrenInfo struct{}
 
 func (p *platformSpecificChildrenInfo) Init(c *children) {}
 
-func (children *children) StartProgram(cmd *Command) error {
+func (children *children) StartProgram(cmd *spawnpb.Command) error {
 	if len(cmd.Binary) == 0 {
 		return fmt.Errorf("Binary is required")
 	}
 	isPortal := filepath.Base(cmd.Binary) == "portal"
-	name := cmd.FullName()
+	name := commandName(cmd)
 	attr := &os.ProcAttr{
 		Env: []string{
 			fmt.Sprintf("SPAWN_FILES=%v", len(cmd.Files)),
@@ -328,7 +329,7 @@ func lookupUser(username string) (*syscall.Credential, *user.User, error) {
 	}, u, nil
 }
 
-func openOrRefreshFiles(cmd *Command, quitFileRefresh <-chan struct{}) ([]*os.File, error) {
+func openOrRefreshFiles(cmd *spawnpb.Command, quitFileRefresh <-chan struct{}) ([]*os.File, error) {
 	if len(cmd.Files) == 0 {
 		return nil, nil
 	}

spawn/embedspawn/children_unix.go

@@ -14,6 +14,7 @@ import (
 	"time"
 	"unsafe"
 
+	"ask.systems/daemon/internal/spawnpb"
 	"ask.systems/daemon/portal/gate"
 
 	"golang.org/x/sys/windows"
@@ -72,7 +73,7 @@ func (c *children) addProcToJobObject(proc *os.Process) error {
 	return nil
 }
 
-func (children *children) StartProgram(cmd *Command) error {
+func (children *children) StartProgram(cmd *spawnpb.Command) error {
 	if len(cmd.Binary) == 0 {
 		return fmt.Errorf("Binary is required")
 	}
@@ -89,7 +90,7 @@ func (children *children) StartProgram(cmd *Command) error {
 	if err != nil {
 		return err
 	}
-	name := cmd.FullName()
+	name := commandName(cmd)
 	attr := &os.ProcAttr{
 		// Note: on windows we need to pass in the existing environment variables
 		// because there are some important system variables that are needed to
@@ -276,7 +277,7 @@ func copyFile(oldName string, newName string, uid, gid uint32, exclusive bool) (
 // Windows doesn't support watching files on spawn
 // TODO: try windows.FindFirstChangeNotification or windows.ReadDirectoryChanges
 // thanks https://stackoverflow.com/a/17376701/428740
-func openOrRefreshFiles(cmd *Command, quitFileRefresh <-chan struct{}) ([]*os.File, error) {
+func openOrRefreshFiles(cmd *spawnpb.Command, quitFileRefresh <-chan struct{}) ([]*os.File, error) {
 	if len(cmd.Files) == 0 {
 		return nil, nil
 	}