feat: add option to skip logins during bootstrap for system preloading

Author: fastcat

addons/bootstrap/addon.go

@@ -2,10 +2,12 @@ package bootstrap
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/spf13/cobra"
 
 	"fastcat.org/go/gdev/addons"
+	b_internal "fastcat.org/go/gdev/addons/bootstrap/internal"
 	"fastcat.org/go/gdev/instance"
 	"fastcat.org/go/gdev/internal"
 )
@@ -44,6 +46,17 @@ func Configure(opts ...Option) {
 func initialize() error {
 	cmd := RunPlanCmd(addon.Config.plan)
 	cmd.Use = "bootstrap"
+	pf := cmd.PersistentFlags()
+	pf.BoolFunc("skip-logins", "skip logging into any accounts", func(s string) error {
+		if s == "" {
+			b_internal.SetDefault(skipLoginsKey, true)
+		} else if v, err := strconv.ParseBool(s); err != nil {
+			return err
+		} else {
+			b_internal.SetDefault(skipLoginsKey, v)
+		}
+		return nil
+	})
 	instance.AddCommands(cmd)
 
 	for _, f := range addon.Config.cmdFactories {

addons/bootstrap/context-keys.go

@@ -0,0 +1,16 @@
+package bootstrap
+
+var skipLoginsKey = NewKey[bool]("bootstrap.skipLogins")
+
+// SkipLogins returns whether login steps should be skipped. This is set by a
+// command line argument. Custom bootstrap steps/plans should obey this.
+func SkipLogins(ctx *Context) bool {
+	v, ok := Get(ctx, skipLoginsKey)
+	return ok && v
+}
+
+func SkipIfNoLogins() StepOpt {
+	return SkipFunc(func(ctx *Context) (bool, error) {
+		return SkipLogins(ctx), nil
+	})
+}

addons/bootstrap/context.go

@@ -13,8 +13,8 @@ type (
 	InfoKey[T any] = internal.InfoKey[T]
 )
 
-func NewContext(ctx context.Context) *Context {
-	return internal.NewContext(ctx)
+func NewContextWithDefaults(ctx context.Context) *Context {
+	return internal.NewContextWithDefaults(ctx)
 }
 
 func NewKey[T any](name string) InfoKey[T] {

addons/bootstrap/input/user.go

@@ -229,5 +229,6 @@ func UserInfoStep() *bootstrap.Step {
 		GitHubUserPrompt,
 	).With(
 		bootstrap.AfterSteps(apt.StepNameInstall),
+		bootstrap.SkipIfNoLogins(),
 	)
 }

addons/bootstrap/internal/context.go

@@ -3,14 +3,27 @@ package internal
 import (
 	"context"
 	"fmt"
+	"maps"
 )
 
 type Context struct {
 	context.Context
 	info map[AnyInfoKey]any
 }
 
-func NewContext(ctx context.Context) *Context {
+var defaults = map[AnyInfoKey]any{}
+
+// NewContextWithDefaults creates a new Context with default InfoKey values as
+// configured with SetDefault.
+func NewContextWithDefaults(ctx context.Context) *Context {
+	bCtx := NewEmptyContext(ctx)
+	maps.Copy(bCtx.info, defaults)
+	return bCtx
+}
+
+// NewEmptyContext creates a new empty Context without any default InfoKey
+// values set.
+func NewEmptyContext(ctx context.Context) *Context {
 	return &Context{
 		Context: ctx,
 		info:    map[AnyInfoKey]any{},
@@ -32,6 +45,13 @@ func Set[T any](ctx *Context, k InfoKey[T], v T) {
 	ctx.info[k] = v
 }
 
+func SetDefault[T any](k InfoKey[T], v T) {
+	if _, ok := defaults[k]; ok {
+		panic(fmt.Errorf("already saved default %s for %v", k.k, k.typ()))
+	}
+	defaults[k] = v
+}
+
 func Get[T any](ctx *Context, k InfoKey[T]) (T, bool) {
 	v, ok := ctx.info[k]
 	if !ok {

addons/bootstrap/plan.go

@@ -111,7 +111,7 @@ func (p *Plan) Run(ctx context.Context) error {
 func (p *Plan) prepare(ctx context.Context) (*Context, error) {
 	bc, ok := ctx.(*Context)
 	if !ok {
-		bc = NewContext(ctx)
+		bc = NewContextWithDefaults(ctx)
 	}
 	if !p.Ready() {
 		names := make([]string, 0, len(p.pending))

addons/gcloud/addon.go

@@ -115,6 +115,7 @@ func BootstrapSteps() []*bootstrap.Step {
 			ConfigureStepName,
 			configureGcloud,
 			bootstrap.AfterSteps(apt.StepNameInstall),
+			bootstrap.SkipIfNoLogins(),
 		),
 	)
 	return steps
@@ -180,6 +181,7 @@ func verifyStep() *bootstrap.Step {
 			return nil
 		},
 		// the two auth steps mark themselves before this to order things
+		bootstrap.SkipIfNoLogins(),
 	)
 }
 

addons/github/gh-login.go

@@ -67,6 +67,7 @@ func GHLoginStep(opts GHLoginOpts) *bootstrap.Step {
 			return nil
 		},
 		bootstrap.AfterSteps(apt.StepNameInstall),
+		bootstrap.SkipIfNoLogins(),
 	)
 }
 

addons/tailscale/addon.go

@@ -1,6 +1,7 @@
 package tailscale
 
 import (
+	"context"
 	_ "embed"
 	"fmt"
 	"sync"
@@ -95,6 +96,7 @@ var configureBootstrap = sync.OnceFunc(func() {
 			configureTailscale,
 			bootstrap.AfterSteps(apt.StepNameInstall),
 			bootstrap.SkipInContainer(),
+			bootstrap.SkipIfNoLogins(),
 		)),
 	)
 })
@@ -108,7 +110,7 @@ func configureTailscale(ctx *bootstrap.Context) error {
 	return TailscaleUp(ctx)
 }
 
-func TailscaleUp(ctx *bootstrap.Context) error {
+func TailscaleUp(ctx context.Context) error {
 	fmt.Println("Bringing up tailscale...")
 	_, err := shx.Run(
 		ctx,