- Change description for server service-account list

- Add `--limit` Flag to `server service-account list`

Author: marceljk

docs/stackit_beta_server_service-account.md

@@ -31,5 +31,5 @@ stackit beta server service-account [flags]
 * [stackit beta server](./stackit_beta_server.md)	 - Provides functionality for servers
 * [stackit beta server service-account attach](./stackit_beta_server_service-account_attach.md)	 - Attach a service account to a server
 * [stackit beta server service-account detach](./stackit_beta_server_service-account_detach.md)	 - Detach a service account from a server
-* [stackit beta server service-account list](./stackit_beta_server_service-account_list.md)	 - List all attached service accounts from a server
+* [stackit beta server service-account list](./stackit_beta_server_service-account_list.md)	 - List all attached service accounts for a server
 

docs/stackit_beta_server_service-account_list.md

@@ -1,10 +1,10 @@
 ## stackit beta server service-account list
 
-List all attached service accounts from a server
+List all attached service accounts for a server
 
 ### Synopsis
 
-List all attached service accounts from a server
+List all attached service accounts for a server
 
 ```
 stackit beta server service-account list [flags]
@@ -16,6 +16,9 @@ stackit beta server service-account list [flags]
   List all attached service accounts for a server with ID "xxx"
   $ stackit beta server service-account list --server-id xxx
 
+  List up to 10 attached service accounts for a server with ID "xxx"
+  $ stackit beta server service-account list --server-id xxx --limit 10
+
   List all attached service accounts for a server with ID "xxx" in JSON format
   $ stackit beta server service-account list --server-id xxx --output-format json
 ```
@@ -24,6 +27,7 @@ stackit beta server service-account list [flags]
 
 ```
   -h, --help               Help for "stackit beta server service-account list"
+      --limit int          Maximum number of entries to list
   -s, --server-id string   Server ID
 ```
 

internal/cmd/beta/server/service-account/attach/attach.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	serviceAccMailArg = "SERVICE_ACCOUNT_MAIL"
+	serviceAccMailArg = "SERVICE_ACCOUNT_EMAIL"
 
 	serverIdFlag = "server-id"
 )

internal/cmd/beta/server/service-account/detach/detach.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	serviceAccMailArg = "SERVICE_ACCOUNT_MAIL"
+	serviceAccMailArg = "SERVICE_ACCOUNT_EMAIL"
 
 	serverIdFlag = "server-id"
 )

internal/cmd/beta/server/service-account/list/list.go

@@ -21,24 +21,30 @@ import (
 
 const (
 	serverIdFlag = "server-id"
+	limitFlag    = "limit"
 )
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
+	Limit    *int64
 	ServerId *string
 }
 
 func NewCmd(p *print.Printer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list",
-		Short: "List all attached service accounts from a server",
-		Long:  "List all attached service accounts from a server",
+		Short: "List all attached service accounts for a server",
+		Long:  "List all attached service accounts for a server",
 		Args:  cobra.NoArgs,
 		Example: examples.Build(
 			examples.NewExample(
 				`List all attached service accounts for a server with ID "xxx"`,
 				"$ stackit beta server service-account list --server-id xxx",
 			),
+			examples.NewExample(
+				`List up to 10 attached service accounts for a server with ID "xxx"`,
+				"$ stackit beta server service-account list --server-id xxx --limit 10",
+			),
 			examples.NewExample(
 				`List all attached service accounts for a server with ID "xxx" in JSON format`,
 				"$ stackit beta server service-account list --server-id xxx --output-format json",
@@ -75,6 +81,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return nil
 			}
 
+			if model.Limit != nil && len(serviceAccounts) > int(*model.Limit) {
+				serviceAccounts = serviceAccounts[:int(*model.Limit)]
+			}
+
 			return outputResult(p, model.OutputFormat, *model.ServerId, serverName, serviceAccounts)
 		},
 	}
@@ -84,6 +94,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().VarP(flags.UUIDFlag(), serverIdFlag, "s", "Server ID")
+	cmd.Flags().Int64(limitFlag, 0, "Maximum number of entries to list")
 
 	err := flags.MarkFlagsRequired(cmd, serverIdFlag)
 	cobra.CheckErr(err)
@@ -95,8 +106,17 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 		return nil, &errors.ProjectIdError{}
 	}
 
+	limit := flags.FlagToInt64Pointer(p, cmd, limitFlag)
+	if limit != nil && *limit < 1 {
+		return nil, &errors.FlagValidationError{
+			Flag:    limitFlag,
+			Details: "must be greater than 0",
+		}
+	}
+
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
+		Limit:           limit,
 		ServerId:        flags.FlagToStringPointer(p, cmd, serverIdFlag),
 	}
 

internal/cmd/beta/server/service-account/list/list_test.go

@@ -2,6 +2,7 @@ package list
 
 import (
 	"context"
+	"strconv"
 	"testing"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
@@ -22,11 +23,13 @@ var testCtx = context.WithValue(context.Background(), &testCtxKey{}, "test")
 var testClient = &iaas.APIClient{}
 var testProjectId = uuid.NewString()
 var testServerId = uuid.NewString()
+var testLimit = int64(10)
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
 		projectIdFlag: testProjectId,
 		serverIdFlag:  testServerId,
+		limitFlag:     strconv.FormatInt(testLimit, 10),
 	}
 	for _, mod := range mods {
 		mod(flagValues)
@@ -41,6 +44,7 @@ func fixtureInputModel(mods ...func(inputModel *inputModel)) *inputModel {
 			ProjectId: testProjectId,
 		},
 		ServerId: utils.Ptr(testServerId),
+		Limit:    utils.Ptr(testLimit),
 	}
 	for _, mod := range mods {
 		mod(model)
@@ -116,6 +120,30 @@ func TestParseInput(t *testing.T) {
 			}),
 			isValid: false,
 		},
+		{
+			description: "without limit",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				delete(flagValues, limitFlag)
+			}),
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.Limit = nil
+			}),
+		},
+		{
+			description: "limit invalid 1",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[limitFlag] = "invalid"
+			}),
+			isValid: false,
+		},
+		{
+			description: "limit invalid 2",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[limitFlag] = "0"
+			}),
+			isValid: false,
+		},
 	}
 
 	for _, tt := range tests {