change --details flag handling

Author: GokceGK

docs/stackit_beta_server_list.md

@@ -19,9 +19,6 @@ stackit beta server list [flags]
   Lists all servers which contains the label xxx
   $ stackit beta server list --label-selector xxx
 
-  Lists all servers with detailed information
-  $ stackit beta server list --details
-
   Lists all servers in JSON format
   $ stackit beta server list --output-format json
 
@@ -32,7 +29,6 @@ stackit beta server list [flags]
 ### Options
 
 ```
-      --details                 Show detailed information about server
   -h, --help                    Help for "stackit beta server list"
       --label-selector string   Filter by label
       --limit int               Maximum number of entries to list

internal/cmd/beta/server/describe/describe.go

@@ -73,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("read server: %w", err)
 			}
 
-			return outputResult(p, model.OutputFormat, resp)
+			return outputResult(p, model, resp)
 		},
 	}
 	configureFlags(cmd)
@@ -120,7 +120,9 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, server *iaas.Server) error {
+func outputResult(p *print.Printer, model *inputModel, server *iaas.Server) error {
+	outputFormat := model.OutputFormat
+
 	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(server, "", "  ")
@@ -173,32 +175,43 @@ func outputResult(p *print.Printer, outputFormat string, server *iaas.Server) er
 			table.AddSeparator()
 		}
 
-		if server.Nics != nil && len(*server.Nics) > 0 {
-			nics := []string{}
-			for _, nic := range *server.Nics {
-				nics = append(nics, *nic.NicId)
-			}
-			table.AddRow("NICS", strings.Join(nics, "\n"))
-		}
-
 		if server.Labels != nil && len(*server.Labels) > 0 {
 			labels := []string{}
 			for key, value := range *server.Labels {
 				labels = append(labels, fmt.Sprintf("%s: %s", key, value))
 			}
 			table.AddRow("LABELS", strings.Join(labels, "\n"))
-		}
-
-		if server.ServiceAccountMails != nil && len(*server.ServiceAccountMails) > 0 {
-			emails := []string{}
-			emails = append(emails, *server.ServiceAccountMails...)
-			table.AddRow("SERVICE ACCOUNTS", strings.Join(emails, "\n"))
+			table.AddSeparator()
 		}
 
 		if server.Volumes != nil && len(*server.Volumes) > 0 {
 			volumes := []string{}
 			volumes = append(volumes, *server.Volumes...)
 			table.AddRow("VOLUMES", strings.Join(volumes, "\n"))
+			table.AddSeparator()
+		}
+
+		if model.Details {
+			if server.ServiceAccountMails != nil && len(*server.ServiceAccountMails) > 0 {
+				emails := []string{}
+				emails = append(emails, *server.ServiceAccountMails...)
+				table.AddRow("SERVICE ACCOUNTS", strings.Join(emails, "\n"))
+				table.AddSeparator()
+			}
+
+			if server.Nics != nil && len(*server.Nics) > 0 {
+				nics := []string{}
+				for _, nic := range *server.Nics {
+					nics = append(nics, *nic.NicId)
+				}
+				table.AddRow("NICS", strings.Join(nics, "\n"))
+				table.AddSeparator()
+			}
+
+			if server.UserData != nil {
+				table.AddRow("USER DATA", *server.UserData)
+				table.AddSeparator()
+			}
 		}
 
 		err := table.Display(p)

internal/cmd/beta/server/list/list.go

@@ -23,14 +23,12 @@ import (
 const (
 	limitFlag         = "limit"
 	labelSelectorFlag = "label-selector"
-	detailsFlag       = "details"
 )
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
 	Limit         *int64
 	LabelSelector *string
-	Details       bool
 }
 
 func NewCmd(p *print.Printer) *cobra.Command {
@@ -48,10 +46,6 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				`Lists all servers which contains the label xxx`,
 				"$ stackit beta server list --label-selector xxx",
 			),
-			examples.NewExample(
-				`Lists all servers with detailed information`,
-				"$ stackit beta server list --details",
-			),
 			examples.NewExample(
 				`Lists all servers in JSON format`,
 				"$ stackit beta server list --output-format json",
@@ -107,7 +101,6 @@ func NewCmd(p *print.Printer) *cobra.Command {
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64(limitFlag, 0, "Maximum number of entries to list")
 	cmd.Flags().String(labelSelectorFlag, "", "Filter by label")
-	cmd.Flags().Bool(detailsFlag, false, "Show detailed information about server")
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
@@ -128,7 +121,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 		GlobalFlagModel: globalFlags,
 		Limit:           limit,
 		LabelSelector:   flags.FlagToStringPointer(p, cmd, labelSelectorFlag),
-		Details:         flags.FlagToBoolValue(p, cmd, detailsFlag),
 	}
 
 	if p.IsVerbosityDebug() {
@@ -149,10 +141,6 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		req = req.LabelSelector(*model.LabelSelector)
 	}
 
-	if model.Details {
-		req = req.Details(true)
-	}
-
 	return req
 }
 

internal/cmd/beta/server/list/list_test.go

@@ -28,7 +28,6 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 		projectIdFlag:     testProjectId,
 		limitFlag:         "10",
 		labelSelectorFlag: testLabelSelector,
-		detailsFlag:       "true",
 	}
 	for _, mod := range mods {
 		mod(flagValues)
@@ -44,7 +43,6 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		},
 		Limit:         utils.Ptr(int64(10)),
 		LabelSelector: utils.Ptr(testLabelSelector),
-		Details:       true,
 	}
 	for _, mod := range mods {
 		mod(model)
@@ -55,7 +53,6 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 func fixtureRequest(mods ...func(request *iaas.ApiListServersRequest)) iaas.ApiListServersRequest {
 	request := testClient.ListServers(testCtx, testProjectId)
 	request = request.LabelSelector(testLabelSelector)
-	request = request.Details(true)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -130,16 +127,6 @@ func TestParseInput(t *testing.T) {
 				model.LabelSelector = utils.Ptr("")
 			}),
 		},
-		{
-			description: "details flag false",
-			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
-				flagValues[detailsFlag] = "false"
-			}),
-			isValid: true,
-			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.Details = false
-			}),
-		},
 	}
 
 	for _, tt := range tests {