whoami expose subscription level (#860)

* in progress update

* update whoami output. Add platform to provider account info.

update test, use tier info from fabric

fix to show tiers

* update tier mapping to name

* proto rebuild

* remove tier information account info. fabric will be source of info for teir, not provider identity.

* update to use providerID

* make the display function convert tier to string

Author: nullfunc

src/pkg/cli/client/byoc/aws/byoc.go

@@ -409,6 +409,7 @@ func (b *ByocAws) AccountInfo(ctx context.Context) (client.AccountInfo, error) {
 	if err != nil {
 		return nil, AnnotateAwsError(err)
 	}
+
 	return AWSAccountInfo{
 		region:    cfg.Region,
 		accountID: *identity.Account,
@@ -426,6 +427,10 @@ func (i AWSAccountInfo) AccountID() string {
 	return i.accountID
 }
 
+func (i AWSAccountInfo) Provider() client.ProviderID {
+	return client.ProviderAWS
+}
+
 func (i AWSAccountInfo) Region() string {
 	return i.region
 }

src/pkg/cli/client/byoc/do/byoc.go

@@ -495,18 +495,26 @@ func (b *ByocDo) AccountInfo(ctx context.Context) (client.AccountInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	return DoAccountInfo{region: b.driver.Region.String(), accountID: account.Email}, nil
+	return DoAccountInfo{
+			accountID: account.Email,
+			region:    b.driver.Region.String(),
+		},
+		nil
 }
 
 type DoAccountInfo struct {
-	region    string
 	accountID string
+	region    string
 }
 
 func (i DoAccountInfo) AccountID() string {
 	return i.accountID
 }
 
+func (i DoAccountInfo) Provider() client.ProviderID {
+	return client.ProviderDO
+}
+
 func (i DoAccountInfo) Region() string {
 	return i.region
 }

src/pkg/cli/client/playground.go

@@ -124,6 +124,7 @@ func (g *PlaygroundProvider) PrepareDomainDelegation(ctx context.Context, req Pr
 
 type PlaygroundAccountInfo struct{}
 
-func (g PlaygroundAccountInfo) AccountID() string { return "playground" }
-func (g PlaygroundAccountInfo) Region() string    { return "us-west-2" } // Hardcoded for now for prod1
-func (g PlaygroundAccountInfo) Details() string   { return "" }
+func (g PlaygroundAccountInfo) AccountID() string    { return "" }
+func (g PlaygroundAccountInfo) Details() string      { return "" }
+func (g PlaygroundAccountInfo) Provider() ProviderID { return ProviderDefang }
+func (g PlaygroundAccountInfo) Region() string       { return "us-west-2" } // Hardcoded for now for prod1

src/pkg/cli/client/provider.go

@@ -135,8 +135,9 @@ type Provider interface {
 
 type AccountInfo interface {
 	AccountID() string
-	Region() string
 	Details() string
+	Provider() ProviderID
+	Region() string
 }
 
 type Loader interface {

src/pkg/cli/whoami.go

@@ -2,12 +2,52 @@ package cli
 
 import (
 	"context"
-	"fmt"
 
+	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
+
+	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
+type ShowAccountData struct {
+	Provider       string
+	AccountID      string
+	Details        string
+	Region         string
+	SubscriberTier defangv1.SubscriptionTier
+	Tenant         string
+}
+
+func showAccountInfo(showData ShowAccountData) (string, error) {
+	if showData.Provider == "" {
+		showData.Provider = "Defang"
+	}
+	outputText := "WhoAmI - \n\tProvider: " + showData.Provider
+
+	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) {
+	showData := ShowAccountData{}
+
 	resp, err := fabric.WhoAmI(ctx)
 	if err != nil {
 		return "", err
@@ -18,23 +58,19 @@ func Whoami(ctx context.Context, fabric client.FabricClient, provider client.Pro
 		return "", err
 	}
 
-	accountID := resp.Account
 	if account.AccountID() != "" {
-		accountID = account.AccountID()
+		showData.AccountID = account.AccountID()
 	}
 
-	region := resp.Region
+	showData.Region = resp.Region
 	if account.Region() != "" {
-		region = account.Region()
+		showData.Region = account.Region()
 	}
 
-	if account.Details() != "" {
-		accountID += " (" + account.Details() + ")"
-	}
+	showData.Details = account.Details()
+	showData.Provider = account.Provider().Name()
+	showData.SubscriberTier = resp.Tier
+	showData.Tenant = resp.Tenant
 
-	// TODO: Add provider name here?
-	return fmt.Sprintf(
-		"You are logged into %s region %s with tenant %q",
-		accountID, region, resp.Tenant,
-	), nil
+	return showAccountInfo(showData)
 }

src/pkg/cli/whoami_test.go

@@ -22,6 +22,7 @@ func (g *grpcWhoamiMockHandler) WhoAmI(context.Context, *connect.Request[emptypb
 		Tenant:  "tenant-1",
 		Account: "playground",
 		Region:  "us-test-2",
+		Tier:    defangv1.SubscriptionTier_PRO,
 	}), nil
 }
 
@@ -43,9 +44,9 @@ func TestWhoami(t *testing.T) {
 	}
 
 	// Playground provider is hardcoded to return "us-west-2" as the region
-	want := `You are logged into playground region us-west-2 with tenant "tenant-1"`
+	want := "WhoAmI - \n\tProvider: Defang Playground\n\tTenant: tenant-1\n\tSubscription Tier: Pro\n\tRegion: us-west-2"
 
 	if got != want {
-		t.Errorf("Whoami() = %v, want: %v", got, want)
+		t.Errorf("Whoami() = %v, \nwant: %v", got, want)
 	}
 }

src/pkg/utils.go

@@ -10,6 +10,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
 var (
@@ -114,3 +116,20 @@ func Contains[T comparable](s []T, v T) bool {
 	}
 	return false
 }
+
+func SubscriptionTierToString(tier defangv1.SubscriptionTier) string {
+	switch tier {
+	case defangv1.SubscriptionTier_SUBSCRIPTION_TIER_UNSPECIFIED:
+		return "Unknown"
+	case defangv1.SubscriptionTier_PERSONAL:
+		return "Free"
+	case defangv1.SubscriptionTier_BASIC:
+		return "Basic"
+	case defangv1.SubscriptionTier_PRO:
+		return "Pro"
+	case defangv1.SubscriptionTier_TEAM:
+		return "Team"
+	default:
+		return "Unknown"
+	}
+}