Move RemoveHost into daemon

go/bootstrap/garage_global_bucket.go

@@ -1,35 +0,0 @@
-package bootstrap
-
-import (
-	"context"
-	"isle/garage"
-	"path/filepath"
-
-	"github.com/minio/minio-go/v7"
-)
-
-// Paths within garage's global bucket.
-//
-// TODO this is getting moved into daemon package.
-const (
-	garageGlobalBucketBootstrapHostsDirPath = "bootstrap/hosts"
-)
-
-// RemoveGarageBootstrapHost removes the <hostname>.json.signed for the given
-// host from garage.
-//
-// The given client should be for the global bucket.
-func RemoveGarageBootstrapHost(
-	ctx context.Context, client garage.S3APIClient, hostName string,
-) error {
-
-	filePath := filepath.Join(
-		garageGlobalBucketBootstrapHostsDirPath,
-		hostName+".json.signed",
-	)
-
-	return client.RemoveObject(
-		ctx, garage.GlobalBucket, filePath,
-		minio.RemoveObjectOptions{},
-	)
-}

go/cmd/entrypoint/hosts.go

@@ -4,7 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"isle/bootstrap"
+	"isle/daemon"
 	"isle/jsonutil"
+	"isle/nebula"
 	"os"
 	"sort"
 )
@@ -45,39 +47,39 @@ var subCmdHostsList = subCmd{
 	},
 }
 
-var subCmdHostsDelete = subCmd{
+var subCmdHostsRemove = subCmd{
-	name:  "delete",
+	name:  "remove",
-	descr: "Deletes a host from the network",
+	descr: "Removes a host from the network",
 	do: func(subCmdCtx subCmdCtx) error {
+		var (
+			flags    = subCmdCtx.flagSet(false)
+			hostName nebula.HostName
+		)
 
-		flags := subCmdCtx.flagSet(false)
+		hostNameF := flags.VarPF(
-
+			textUnmarshalerFlag{&hostName},
-		hostName := flags.StringP(
+			"hostname", "h",
-			"hostname", "h", "",
+			"Name of the host to remove",
-			"Name of the host to delete",
 		)
 
 		if err := flags.Parse(subCmdCtx.args); err != nil {
 			return fmt.Errorf("parsing flags: %w", err)
 		}
 
-		if *hostName == "" {
+		if !hostNameF.Changed {
 			return errors.New("--hostname is required")
 		}
 
-		var clientParams bootstrap.GarageClientParams
 		err := subCmdCtx.daemonRCPClient.Call(
-			subCmdCtx.ctx, &clientParams, "GetGarageClientParams", nil,
+			subCmdCtx.ctx, nil, "RemoveHost", daemon.RemoveHostRequest{
+				HostName: hostName,
+			},
 		)
 		if err != nil {
-			return fmt.Errorf("calling GetGarageClientParams: %w", err)
+			return fmt.Errorf("calling RemoveHost: %w", err)
 		}
 
-		client := clientParams.GlobalBucketS3APIClient()
+		return nil
-
-		// TODO do this within the daemon, along with first checking if the host
-		// has any assigned network resources.
-		return bootstrap.RemoveGarageBootstrapHost(subCmdCtx.ctx, client, *hostName)
 	},
 }
 
@@ -86,7 +88,7 @@ var subCmdHosts = subCmd{
 	descr: "Sub-commands having to do with configuration of hosts in the network",
 	do: func(subCmdCtx subCmdCtx) error {
 		return subCmdCtx.doSubCmd(
-			subCmdHostsDelete,
+			subCmdHostsRemove,
 			subCmdHostsList,
 		)
 	},

go/daemon/daemon.go

@@ -52,6 +52,9 @@ type Daemon interface {
 	// GetBootstraps returns the currently active Bootstrap.
 	GetBootstrap(context.Context) (bootstrap.Bootstrap, error)
 
+	// RemoveHost removes the host of the given name from the network.
+	RemoveHost(context.Context, nebula.HostName) error
+
 	// Shutdown blocks until all resources held or created by the daemon,
 	// including child processes it has started, have been cleaned up.
 	//
@@ -372,7 +375,7 @@ func (d *daemon) postInit(ctx context.Context) bool {
 		d.logger,
 		"Updating host info in garage",
 		func(ctx context.Context) error {
-			return d.putGarageBoostrapHost(ctx)
+			return putGarageBoostrapHost(ctx, d.logger, d.currBootstrap)
 		},
 	) {
 		return false
@@ -575,6 +578,20 @@ func (d *daemon) GetBootstrap(ctx context.Context) (bootstrap.Bootstrap, error)
 	})
 }
 
+func (d *daemon) RemoveHost(ctx context.Context, hostName nebula.HostName) error {
+	// TODO RemoveHost should publish a certificate revocation for the host
+	// being removed.
+	_, err := withCurrBootstrap(d, func(
+		currBootstrap bootstrap.Bootstrap,
+	) (
+		struct{}, error,
+	) {
+		client := currBootstrap.GarageClientParams().GlobalBucketS3APIClient()
+		return struct{}{}, removeGarageBootstrapHost(ctx, client, hostName)
+	})
+	return err
+}
+
 func (d *daemon) Shutdown() error {
 	d.l.Lock()
 	defer d.l.Unlock()

go/daemon/global_bucket.go

@@ -62,9 +62,11 @@ func garageInitializeGlobalBucket(
 // putGarageBoostrapHost places the <hostname>.json.signed file for this host
 // into garage so that other hosts are able to see relevant configuration for
 // it.
-func (d *daemon) putGarageBoostrapHost(ctx context.Context) error {
+func putGarageBoostrapHost(
+	ctx context.Context, logger *mlog.Logger, currBootstrap bootstrap.Bootstrap,
+) error {
 	var (
-		b      = d.currBootstrap
+		b      = currBootstrap
 		host   = b.ThisHost()
 		client = b.GarageClientParams().GlobalBucketS3APIClient()
 	)
@@ -160,3 +162,17 @@ func getGarageBootstrapHosts(
 
 	return hosts, nil
 }
+
+func removeGarageBootstrapHost(
+	ctx context.Context, client garage.S3APIClient, hostName nebula.HostName,
+) error {
+
+	filePath := filepath.Join(
+		garageGlobalBucketBootstrapHostsDirPath,
+		string(hostName)+".json.signed",
+	)
+
+	return client.RemoveObject(
+		ctx, garage.GlobalBucket, filePath, minio.RemoveObjectOptions{},
+	)
+}

go/daemon/rpc.go

@@ -86,7 +86,8 @@ func (r *RPC) GetHosts(
 	return GetHostsResult{hosts}, nil
 }
 
-// GetGarageClientParams passes through to the Daemon method of the same name.
+// GetGarageClientParams returns a GarageClientParams which can be used to
+// interact with garage.
 func (r *RPC) GetGarageClientParams(
 	ctx context.Context, req struct{},
 ) (
@@ -102,6 +103,7 @@ func (r *RPC) GetGarageClientParams(
 	return b.GarageClientParams(), nil
 }
 
+// GetNebulaCAPublicCredentials returns the CAPublicCredentials for the network.
 func (r *RPC) GetNebulaCAPublicCredentials(
 	ctx context.Context, req struct{},
 ) (
@@ -116,3 +118,15 @@ func (r *RPC) GetNebulaCAPublicCredentials(
 
 	return b.CAPublicCredentials, nil
 }
+
+// RemoveHostRequest contains the arguments to the RemoveHost method.
+//
+// All fields are required.
+type RemoveHostRequest struct {
+	HostName nebula.HostName
+}
+
+// RemoveHost passes the call through to the Daemon method of the same name.
+func (r *RPC) RemoveHost(ctx context.Context, req RemoveHostRequest) (struct{}, error) {
+	return struct{}{}, r.daemon.RemoveHost(ctx, req.HostName)
+}