Whoami: print as a table or json, add tenantID (#1431)

Author: jordanstephens

src/cmd/cli/command/commands.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -213,6 +214,7 @@ func SetupCommands(ctx context.Context, version string) {
 	RootCmd.AddCommand(loginCmd)
 
 	// Whoami Command
+	whoamiCmd.PersistentFlags().Bool("json", pkg.GetenvBool("DEFANG_JSON"), "print output in JSON format")
 	RootCmd.AddCommand(whoamiCmd)
 
 	// Logout Command
@@ -434,13 +436,30 @@ var whoamiCmd = &cobra.Command{
 			term.Debug("unable to get provider:", err)
 		}
 
-		str, err := cli.Whoami(cmd.Context(), client, provider)
+		jsonMode, _ := cmd.Flags().GetBool("json")
+
+		data, err := cli.Whoami(cmd.Context(), client, provider)
 		if err != nil {
 			return err
 		}
 
-		term.Info(str)
-		return nil
+		if jsonMode {
+			bytes, err := json.Marshal(data)
+			if err != nil {
+				return err
+			}
+			_, err = fmt.Println(string(bytes))
+			return err
+		} else {
+			return term.Table([]cli.ShowAccountData{data}, []string{
+				"Provider",
+				"AccountID",
+				"Tenant",
+				"TenantID",
+				"Subscription Tier",
+				"Region",
+			})
+		}
 	},
 }
 

src/pkg/cli/whoami.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"context"
 
-	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/term"
 
@@ -14,55 +13,30 @@ type ShowAccountData struct {
 	client.AccountInfo
 	SubscriberTier defangv1.SubscriptionTier
 	Tenant         string
+	TenantID       string
 }
 
-func showAccountInfo(showData ShowAccountData) (string, error) {
-	if showData.Provider == "" {
-		showData.Provider = "Defang"
-	}
-	outputText := "WhoAmI - \n\tProvider: " + showData.Provider.Name()
-
-	if showData.AccountID != "" {
-		outputText += "\n\tAccountID: " + showData.AccountID
-	}
-
-	if showData.Tenant != "" {
-		outputText += "\n\tTenant: " + showData.Tenant
-	}
-
-	outputText += "\n\tSubscription Tier: " + pkg.SubscriptionTierToString(showData.SubscriberTier)
-
-	if showData.Region != "" {
-		outputText += "\n\tRegion: " + showData.Region
-	}
-
-	if showData.Details != "" {
-		outputText += "\n\tDetails: " + showData.Details
-	}
-
-	return outputText, nil
-}
-
-func Whoami(ctx context.Context, fabric client.FabricClient, provider client.Provider) (string, error) {
+func Whoami(ctx context.Context, fabric client.FabricClient, provider client.Provider) (ShowAccountData, error) {
 	showData := ShowAccountData{}
 
 	resp, err := fabric.WhoAmI(ctx)
 	if err != nil {
-		return "", err
+		return ShowAccountData{}, err
 	}
 
 	term.Debug("User ID: " + resp.UserId)
 	showData.Region = resp.Region
 	showData.SubscriberTier = resp.Tier
 	showData.Tenant = resp.Tenant
+	showData.TenantID = resp.TenantId
 
 	if provider != nil {
 		account, err := provider.AccountInfo(ctx)
 		if err != nil {
-			return "", err
+			return ShowAccountData{}, err
 		}
 		showData.AccountInfo = *account
 	}
 
-	return showAccountInfo(showData)
+	return showData, err
 }

src/pkg/cli/whoami_test.go

@@ -44,7 +44,16 @@ func TestWhoami(t *testing.T) {
 	}
 
 	// Playground provider is hardcoded to return "us-west-2" as the region
-	want := "WhoAmI - \n\tProvider: Defang Playground\n\tAccountID: tenant-1\n\tTenant: tenant-1\n\tSubscription Tier: Pro\n\tRegion: us-west-2"
+	want := ShowAccountData{
+		AccountInfo: cliClient.AccountInfo{
+			AccountID: "tenant-1",
+			Provider:  "defang",
+			Region:    "us-west-2",
+		},
+		SubscriberTier: defangv1.SubscriptionTier_PRO,
+		Tenant:         "tenant-1",
+		TenantID:       "",
+	}
 
 	if got != want {
 		t.Errorf("Whoami() = %v, \nwant: %v", got, want)