Skip to content

Commit fc94432

Browse files
authored
Support some commands offline (#1237)
* Support some commands offline * Move friendly network error to prettyError
1 parent 6092a65 commit fc94432

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/cmd/cli/command/commands.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ func prettyError(err error) error {
6767
term.Debug("Server error:", cerr)
6868
err = errors.Unwrap(cerr)
6969
}
70+
if cli.IsNetworkError(err) {
71+
return fmt.Errorf("%w; please check network settings and try again", err)
72+
}
7073
return err
7174
}
7275

@@ -360,9 +363,6 @@ var RootCmd = &cobra.Command{
360363
}
361364

362365
client, err = cli.Connect(cmd.Context(), getCluster())
363-
if cli.IsNetworkError(err) {
364-
return fmt.Errorf("unable to connect to Defang server %q; please check network settings and try again", cluster)
365-
}
366366

367367
if v, err := client.GetVersions(cmd.Context()); err == nil {
368368
version := cmd.Root().Version // HACK to avoid circular dependency with RootCmd
@@ -1279,7 +1279,7 @@ func determineProviderID(ctx context.Context, loader cliClient.Loader) (string,
12791279
if projectName != "" && !RootCmd.PersistentFlags().Changed("provider") { // If user manually selected auto provider, do not load from remote
12801280
resp, err := client.GetSelectedProvider(ctx, &defangv1.GetSelectedProviderRequest{Project: projectName})
12811281
if err != nil {
1282-
term.Warnf("Unable to get selected provider: %v", err)
1282+
term.Debugf("Unable to get selected provider: %v", err)
12831283
} else if resp.Provider != defangv1.Provider_PROVIDER_UNSPECIFIED {
12841284
providerID.SetValue(resp.Provider)
12851285
return "stored preference", nil
@@ -1292,7 +1292,7 @@ func determineProviderID(ctx context.Context, loader cliClient.Loader) (string,
12921292
// Save the selected provider to the fabric
12931293
if projectName != "" {
12941294
if err := client.SetSelectedProvider(ctx, &defangv1.SetSelectedProviderRequest{Project: projectName, Provider: providerID.Value()}); err != nil {
1295-
term.Warnf("Unable to save selected provider to defang server: %v", err)
1295+
term.Debugf("Unable to save selected provider to defang server: %v", err)
12961296
} else {
12971297
term.Printf("%v is now the default provider for project %v and will auto-select next time if no other provider is specified. Use --provider=auto to reselect.", providerID, projectName)
12981298
}

0 commit comments

Comments
 (0)