From 8e6820008b328d9b0f39a4a6c9771c9edb0e1dd0 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Tue, 24 May 2022 09:50:32 -0400 Subject: [PATCH] whoami: Remove external org ID if empty On some environments there is no external ID associated with an organization. --- cmd/whoami/cmd.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/whoami/cmd.go b/cmd/whoami/cmd.go index 3702cc8b62..a1f466802e 100644 --- a/cmd/whoami/cmd.go +++ b/cmd/whoami/cmd.go @@ -134,8 +134,7 @@ func run(_ *cobra.Command, _ []string) { "OCM Account Username: %s\n"+ "OCM Account Email: %s\n"+ "OCM Organization ID: %s\n"+ - "OCM Organization Name: %s\n"+ - "OCM Organization External ID: %s\n", + "OCM Organization Name: %s\n", awsCreator.AccountID, awsRegion, awsCreator.ARN, @@ -146,8 +145,13 @@ func run(_ *cobra.Command, _ []string) { account.Email(), account.Organization().ID(), account.Organization().Name(), - account.Organization().ExternalID(), ) + if account.Organization().ExternalID() != "" { + fmt.Printf(""+ + "OCM Organization External ID: %s\n", + account.Organization().ExternalID(), + ) + } fmt.Println() }