Update CLI output functions to show scope info and cleanup (#416)

internal/cmd/commands/authmethods/funcs.go

@@ -1,7 +1,6 @@
 package authmethods
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/hashicorp/boundary/api/authmethods"
@@ -22,15 +21,12 @@ func addPasswordFlags(c *PasswordCommand, f *base.FlagSet) {
 }
 
 func generateAuthMethodTableOutput(in *authmethods.AuthMethod) string {
-	var ret []string
-
 	nonAttributeMap := map[string]interface{}{
 		"ID":           in.Id,
-		"Scope ID":     in.Scope.Id,
 		"Version":      in.Version,
 		"Type":         in.Type,
-		"Created Time": in.CreatedTime.Local().Format(time.RFC3339),
-		"Updated Time": in.UpdatedTime.Local().Format(time.RFC3339),
+		"Created Time": in.CreatedTime.Local().Format(time.RFC1123),
+		"Updated Time": in.UpdatedTime.Local().Format(time.RFC1123),
 	}
 
 	if in.Name != "" {
@@ -40,40 +36,20 @@ func generateAuthMethodTableOutput(in *authmethods.AuthMethod) string {
 		nonAttributeMap["Description"] = in.Description
 	}
 
-	maxLength := 0
-	for k := range nonAttributeMap {
-		if len(k) > maxLength {
-			maxLength = len(k)
-		}
-	}
-	if len(in.Attributes) > 0 {
-		for k, v := range in.Attributes {
-			if attributeMap[k] != "" {
-				in.Attributes[attributeMap[k]] = v
-				delete(in.Attributes, k)
-			}
-		}
-		for k := range in.Attributes {
-			if len(k) > maxLength {
-				maxLength = len(k)
-			}
-		}
-	}
+	maxLength := base.MaxAttributesLength(nonAttributeMap, in.Attributes, keySubstMap)
 
-	ret = append(ret, "", "Auth method information:")
-
-	ret = append(ret,
-		// We do +2 because there is another +2 offset for attributes below
+	ret := []string{
+		"",
+		"Auth Method information:",
 		base.WrapMap(2, maxLength+2, nonAttributeMap),
-	)
+		"",
+		"  Scope:",
+		base.ScopeInfoForOutput(in.Scope, maxLength),
+	}
 
 	if len(in.Attributes) > 0 {
-		if true {
-			ret = append(ret,
-				fmt.Sprintf("  Attributes:   %s", ""),
-			)
-		}
 		ret = append(ret,
+			"  Attributes:",
 			base.WrapMap(4, maxLength, in.Attributes),
 		)
 	}
@@ -81,7 +57,7 @@ func generateAuthMethodTableOutput(in *authmethods.AuthMethod) string {
 	return base.WrapForHelpText(ret)
 }
 
-var attributeMap = map[string]string{
+var keySubstMap = map[string]string{
 	"min_login_name_length": "Minimum Login Name Length",
 	"min_password_length":   "Minimum Password Length",
 }