Skip to content

Commit

Permalink
Merge pull request #1894 from paradigm/describe-billing-account-non-hcp
Browse files Browse the repository at this point in the history
Display AWS Billing Account on non-HCP
  • Loading branch information
openshift-merge-bot[bot] committed Apr 3, 2024
2 parents 260f864 + b89464f commit 59cfc84
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/describe/cluster/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func run(cmd *cobra.Command, argv []string) {
cluster.Version().ChannelGroup(),
clusterDNS,
creatorARN.AccountID,
BillingAccount(cluster, isHypershift),
BillingAccount(cluster),
cluster.API().URL(),
cluster.Console().URL(),
cluster.Region().ID(),
Expand Down Expand Up @@ -740,8 +740,8 @@ func formatClusterHypershift(cluster *cmv1.Cluster,
return ret, nil
}

func BillingAccount(cluster *cmv1.Cluster, isHostedControlPlane bool) string {
if !isHostedControlPlane || cluster.AWS().BillingAccountID() == "" {
func BillingAccount(cluster *cmv1.Cluster) string {
if cluster.AWS().BillingAccountID() == "" {
return ""
}
return fmt.Sprintf("AWS Billing Account: %s\n", cluster.AWS().BillingAccountID())
Expand Down

0 comments on commit 59cfc84

Please sign in to comment.