check for empty client settings (#649)

* check for empty client settings

* update the util.Await to run ActionWithErr so that we return errors and use ctx in the spinner closure

* cleanup

* propogate context

* bump version

Author: real-danm

cmd/lk/agent.go

@@ -704,8 +704,10 @@ func updateAgent(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	var resp *lkproto.UpdateAgentResponse
-	util.Await("Updating agent ["+util.Accented(lkConfig.Agent.ID)+"]", func() {
-		resp, err = agentsClient.UpdateAgent(ctx, req)
+	err = util.Await("Updating agent ["+util.Accented(lkConfig.Agent.ID)+"]", ctx, func(ctx context.Context) error {
+		var clientErr error
+		resp, clientErr = agentsClient.UpdateAgent(ctx, req)
+		return clientErr
 	})
 	if err != nil {
 		if twerr, ok := err.(twirp.Error); ok {
@@ -732,11 +734,13 @@ func rollbackAgent(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	var resp *lkproto.RollbackAgentResponse
-	util.Await("Rolling back agent ["+util.Accented(agentID)+"]", func() {
-		resp, err = agentsClient.RollbackAgent(ctx, &lkproto.RollbackAgentRequest{
+	err = util.Await("Rolling back agent ["+util.Accented(agentID)+"]", ctx, func(ctx context.Context) error {
+		var clientErr error
+		resp, clientErr = agentsClient.RollbackAgent(ctx, &lkproto.RollbackAgentRequest{
 			AgentId: agentID,
 			Version: cmd.String("version"),
 		})
+		return clientErr
 	})
 
 	if err != nil {
@@ -790,25 +794,25 @@ func deleteAgent(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	var res *lkproto.DeleteAgentResponse
-	var agentErr error
-	if err := util.Await(
+	err = util.Await(
 		"Deleting agent ["+util.Accented(agentID)+"]",
-		func() {
-			res, agentErr = agentsClient.DeleteAgent(ctx, &lkproto.DeleteAgentRequest{
+		ctx,
+		func(ctx context.Context) error {
+			var clientErr error
+			res, clientErr = agentsClient.DeleteAgent(ctx, &lkproto.DeleteAgentRequest{
 				AgentId: agentID,
 			})
+			return clientErr
 		},
-	); err != nil {
-		return err
-	}
+	)
 
-	if agentErr != nil {
-		if twerr, ok := agentErr.(twirp.Error); ok {
+	if err != nil {
+		if twerr, ok := err.(twirp.Error); ok {
 			if twerr.Code() == twirp.PermissionDenied {
 				return fmt.Errorf("agent hosting is disabled for this project -- join the beta program here [%s]", cloudAgentsBetaSignupURL)
 			}
 		}
-		return agentErr
+		return err
 	}
 
 	if !res.Success {
@@ -1026,10 +1030,11 @@ func getAgentID(ctx context.Context, cmd *cli.Command, agentDir string, tomlFile
 
 func selectAgent(ctx context.Context, _ *cli.Command, excludeEmptyVersion bool) (string, error) {
 	var agents *lkproto.ListAgentsResponse
-	var err error
 
-	util.Await("No agent ID provided, selecting from available agents...", func() {
-		agents, err = agentsClient.ListAgents(ctx, &lkproto.ListAgentsRequest{})
+	err := util.Await("No agent ID provided, selecting from available agents...", ctx, func(ctx context.Context) error {
+		var clientErr error
+		agents, clientErr = agentsClient.ListAgents(ctx, &lkproto.ListAgentsRequest{})
+		return clientErr
 	})
 	if err != nil {
 		if twerr, ok := err.(twirp.Error); ok {
@@ -1127,26 +1132,24 @@ func requireSecrets(_ context.Context, cmd *cli.Command, required, lazy bool) ([
 	return secretsSlice, nil
 }
 
-func requireDockerfile(_ context.Context, cmd *cli.Command, workingDir string, projectType agentfs.ProjectType, settingsMap map[string]string) error {
+func requireDockerfile(ctx context.Context, cmd *cli.Command, workingDir string, projectType agentfs.ProjectType, settingsMap map[string]string) error {
 	dockerfileExists, err := agentfs.HasDockerfile(workingDir)
 	if err != nil {
 		return err
 	}
 
 	if !dockerfileExists {
 		if !cmd.Bool("silent") {
-			var innerErr error
-			if err := util.Await(
+			err := util.Await(
 				"Creating Dockerfile...",
-				func() {
-					innerErr = agentfs.CreateDockerfile(workingDir, projectType, settingsMap)
+				ctx,
+				func(ctx context.Context) error {
+					return agentfs.CreateDockerfile(workingDir, projectType, settingsMap)
 				},
-			); err != nil {
+			)
+			if err != nil {
 				return err
 			}
-			if innerErr != nil {
-				return innerErr
-			}
 			fmt.Println("Created [" + util.Accented("Dockerfile") + "]")
 		} else {
 			if err := agentfs.CreateDockerfile(workingDir, projectType, settingsMap); err != nil {
@@ -1169,8 +1172,10 @@ func getClientSettings(ctx context.Context, silent bool) (map[string]string, err
 	if !silent {
 		err = util.Await(
 			"Loading client settings...",
-			func() {
+			ctx,
+			func(ctx context.Context) error {
 				clientSettingsResponse, err = agentsClient.GetClientSettings(ctx, &lkproto.ClientSettingsRequest{})
+				return err
 			},
 		)
 	} else {
@@ -1186,6 +1191,10 @@ func getClientSettings(ctx context.Context, silent bool) (map[string]string, err
 		return nil, err
 	}
 
+	if clientSettingsResponse == nil {
+		return nil, fmt.Errorf("unable to contact server; please try again later")
+	}
+
 	settingsMap := make(map[string]string)
 	for _, setting := range clientSettingsResponse.Params {
 		settingsMap[setting.Name] = setting.Value

cmd/lk/app.go

@@ -24,10 +24,11 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/huh"
+	"github.com/urfave/cli/v3"
+
 	"github.com/livekit/livekit-cli/v2/pkg/bootstrap"
 	"github.com/livekit/livekit-cli/v2/pkg/config"
 	"github.com/livekit/livekit-cli/v2/pkg/util"
-	"github.com/urfave/cli/v3"
 )
 
 var (
@@ -385,33 +386,35 @@ func setupTemplate(ctx context.Context, cmd *cli.Command) error {
 	return cleanupTemplate(ctx, cmd, appName)
 }
 
-func cloneTemplate(_ context.Context, cmd *cli.Command, url, appName string) error {
+func cloneTemplate(ctx context.Context, cmd *cli.Command, url, appName string) error {
 	var stdout string
 	var stderr string
-	var cmdErr error
 
 	tempName, relocate, cleanup := util.UseTempPath(appName)
 	defer cleanup()
 
-	if err := util.Await(
+	err := util.Await(
 		"Cloning template from "+url,
-		func() {
+		ctx,
+		func(ctx context.Context) error {
+			var cmdErr error
 			stdout, stderr, cmdErr = bootstrap.CloneTemplate(url, tempName)
+			return cmdErr
 		},
-	); err != nil {
-		return err
-	}
+	)
 
+	// err is handled after checking stdout and stderr
 	if len(stdout) > 0 && cmd.Bool("verbose") {
 		fmt.Println(string(stdout))
 	}
 	if len(stderr) > 0 && cmd.Bool("verbose") {
 		fmt.Fprintln(os.Stderr, string(stderr))
 	}
 
-	if cmdErr != nil {
-		return cmdErr
+	if err != nil {
+		return err
 	}
+
 	return relocate()
 }
 
@@ -512,14 +515,17 @@ func doInstall(ctx context.Context, task bootstrap.KnownTask, rootPath string, v
 		return err
 	}
 
-	var cmdErr error
-	if err := util.Await(
+	err = util.Await(
 		"Installing...",
-		func() { cmdErr = install() },
-	); err != nil {
+		ctx,
+		func(ctx context.Context) error {
+			return install()
+		},
+	)
+	if err != nil {
 		return err
 	}
-	return cmdErr
+	return nil
 }
 
 func runTask(ctx context.Context, cmd *cli.Command) error {

cmd/lk/cloud.go

@@ -300,18 +300,19 @@ func tryAuthIfNeeded(ctx context.Context, cmd *cli.Command) error {
 	_ = browser.OpenURL(authURL.String()) // discard result; this will fail in headless environments
 
 	var ak *ClaimAccessKeyResponse
-	var pollErr error
-	if err := util.Await(
+	err = util.Await(
 		"Awaiting confirmation...",
-		func() {
+		ctx,
+		func(ctx context.Context) error {
+			var pollErr error
 			ak, pollErr = pollClaim(ctx, cmd)
+			return pollErr
 		},
-	); err != nil {
+	)
+	if err != nil {
 		return err
 	}
-	if pollErr != nil {
-		return pollErr
-	}
+
 	if ak == nil {
 		return errors.New("operation cancelled")
 	}

pkg/util/action.go

@@ -15,15 +15,18 @@
 package util
 
 import (
+	"context"
+
 	"github.com/charmbracelet/huh/spinner"
 )
 
 // Call an action and show a spinner while waiting for it to finish.
-func Await(title string, action func()) error {
+func Await(title string, ctx context.Context, action func(ctx context.Context) error) error {
 	return spinner.New().
 		Title(" " + title).
-		Action(action).
+		ActionWithErr(action).
 		Type(spinner.Pulse).
 		Style(Theme.Focused.Title).
+		Context(ctx).
 		Run()
 }

version.go

@@ -15,5 +15,5 @@
 package livekitcli
 
 const (
-	Version = "2.5.0"
+	Version = "2.5.1"
 )