fix: bring back the use of DescribeCmd for user describe

Author: Davidonium

internal/cmd/iam/user_describe.go

@@ -17,14 +17,10 @@ import (
 )
 
 func newUserDescribeCommand(s *state.State) *cobra.Command {
-	return base.Cmd{
-		BaseCobraCommand: func() *cobra.Command {
-			return &cobra.Command{
-				Use:   "describe <user-id-or-email>",
-				Short: "Describe a user and their assigned roles",
-				Args:  util.ExactArgs(1, "a user ID or email"),
-			}
-		},
+	return base.DescribeCmd[*iamv1.User]{
+		Use:   "describe <user-id-or-email>",
+		Short: "Describe a user and their assigned roles",
+		Args:  util.ExactArgs(1, "a user ID or email"),
 		Long: `Describe a user and their assigned roles.
 
 Accepts either a user ID (UUID) or an email address. Displays the user's
@@ -37,23 +33,27 @@ qcloud iam user describe user@example.com
 
 # Output as JSON
 qcloud iam user describe user@example.com --json`,
-		Run: func(s *state.State, cmd *cobra.Command, args []string) error {
-			ctx := cmd.Context()
-			client, err := s.Client(ctx)
+		Fetch: func(s *state.State, cmd *cobra.Command, args []string) (*iamv1.User, error) {
+			client, err := s.Client(cmd.Context())
 			if err != nil {
-				return err
+				return nil, err
 			}
 			accountID, err := s.AccountID()
+			if err != nil {
+				return nil, err
+			}
+			return resolveUser(cmd, client, accountID, args[0])
+		},
+		PrintText: func(cmd *cobra.Command, w io.Writer, user *iamv1.User) error {
+			ctx := cmd.Context()
+			client, err := s.Client(ctx)
 			if err != nil {
 				return err
 			}
-
-			user, err := resolveUser(cmd, client, accountID, args[0])
+			accountID, err := s.AccountID()
 			if err != nil {
 				return err
 			}
-
-			// Fetch the user's roles.
 			rolesResp, err := client.IAM().ListUserRoles(ctx, &iamv1.ListUserRolesRequest{
 				AccountId: accountID,
 				UserId:    user.GetId(),
@@ -62,18 +62,7 @@ qcloud iam user describe user@example.com --json`,
 				return fmt.Errorf("failed to list user roles: %w", err)
 			}
 			roles := rolesResp.GetRoles()
-
-			permissions := effectivePermissions(roles)
-
-			if s.Config.JSONOutput() {
-				return output.PrintJSON(cmd.OutOrStdout(), struct {
-					User  *iamv1.User   `json:"user"`
-					Roles []*iamv1.Role `json:"roles"`
-				}{User: user, Roles: roles})
-			}
-
-			w := cmd.OutOrStdout()
-			return printUserWithRoles(w, user, roles, permissions)
+			return printUserWithRoles(w, user, roles, effectivePermissions(roles))
 		},
 	}.CobraCommand(s)
 }

internal/cmd/iam/user_describe_test.go

@@ -135,39 +135,23 @@ func TestUserDescribe_JSON(t *testing.T) {
 	env := testutil.NewTestEnv(t)
 
 	userID := testUserID
-	cat := testRoleCategory
 	env.IAMServer.ListUsersCalls.Returns(&iamv1.ListUsersResponse{
 		Items: []*iamv1.User{
 			{Id: userID, Email: "alice@example.com", Status: iamv1.UserStatus_USER_STATUS_ACTIVE},
 		},
 	}, nil)
-	env.IAMServer.ListUserRolesCalls.Returns(&iamv1.ListUserRolesResponse{
-		Roles: []*iamv1.Role{
-			{Id: "role-id-1", Name: "admin", Permissions: []*iamv1.Permission{
-				{Value: "read:clusters", Category: &cat},
-			}},
-		},
-	}, nil)
+	// JSON output does not fetch roles; no ListUserRoles call expected.
 
 	stdout, _, err := testutil.Exec(t, env, "iam", "user", "describe", userID, "--json")
 	require.NoError(t, err)
 
 	var got struct {
-		User struct {
-			Id    string `json:"id"`
-			Email string `json:"email"`
-		} `json:"user"`
-		Roles []struct {
-			Id   string `json:"id"`
-			Name string `json:"name"`
-		} `json:"roles"`
+		Id    string `json:"id"`
+		Email string `json:"email"`
 	}
 	require.NoError(t, json.Unmarshal([]byte(stdout), &got))
-	assert.Equal(t, userID, got.User.Id)
-	assert.Equal(t, "alice@example.com", got.User.Email)
-	require.Len(t, got.Roles, 1)
-	assert.Equal(t, "role-id-1", got.Roles[0].Id)
-	assert.Equal(t, "admin", got.Roles[0].Name)
+	assert.Equal(t, userID, got.Id)
+	assert.Equal(t, "alice@example.com", got.Email)
 }
 
 func TestUserDescribe_NotFound(t *testing.T) {