chore(edge): fix review comments

relates to STACKITCLI-357

Author: GokceGK

docs/stackit_beta_edge-cloud_token_create.md

@@ -6,7 +6,7 @@ Creates a token for an Edge Cloud instance
 
 Creates a token for a STACKIT Edge Cloud (STEC) instance.
 
-An expiration time can be set for the token. The expiration time is set in seconds(s), minutes(m), hours(h), days(d) or months(M). Default is 3600(1h) seconds.
+An expiration time can be set for the token. The expiration time is set in seconds(s), minutes(m), hours(h), days(d) or months(M). Default is 3600 seconds.
 Note: the format for the duration is <value><unit>, e.g. 30d for 30 days. You may not combine units.
 
 ```
@@ -26,7 +26,7 @@ stackit beta edge-cloud token create [flags]
 ### Options
 
 ```
-  -e, --expiration string    Expiration time for the token, e.g. 5d. By default, the token is valid for 1h.
+  -e, --expiration string    Expiration time for the token, e.g. 5d. By default, the token is valid for 3600 seconds.
   -h, --help                 Help for "stackit beta edge-cloud token create"
       --instance-id string   Edge Cloud instance ID
 ```

internal/cmd/beta/edge/instance/create/create.go

@@ -74,11 +74,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			// Call API
-			req, err := buildRequest(ctx, model, apiClient)
-			if err != nil {
-				return err
-			}
-			resp, err := req.Execute()
+			request := buildRequest(ctx, model, apiClient)
+
+			resp, err := request.Execute()
 			if err != nil {
 				return fmt.Errorf("create edge cloud instance: %w", err)
 			}
@@ -131,16 +129,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	return &model, nil
 }
 
-func buildRequest(ctx context.Context, model *inputModel, apiClient *edge.APIClient) (req edge.ApiCreateInstanceRequest, err error) {
-	req = apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId, model.Region)
+func buildRequest(ctx context.Context, model *inputModel, apiClient *edge.APIClient) edge.ApiCreateInstanceRequest {
+	req := apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId, model.Region)
 
 	payload := edge.CreateInstancePayload{
 		DisplayName: model.DisplayName,
 		Description: model.Description,
 		PlanId:      model.PlanId,
 	}
 
-	return req.CreateInstancePayload(payload), nil
+	return req.CreateInstancePayload(payload)
 }
 
 func outputResult(p *print.Printer, model *inputModel, projectLabel string, instance *edge.Instance) error {

internal/cmd/beta/edge/instance/create/create_test.go

@@ -180,10 +180,7 @@ func TestBuildRequest(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			request, err := buildRequest(testCtx, tt.model, testClient)
-			if err != nil {
-				t.Fatalf("cannot create request: %v", err)
-			}
+			request := buildRequest(testCtx, tt.model, testClient)
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest, edge.DefaultAPIService{}),

internal/cmd/beta/edge/kubeconfig/create/create.go

@@ -76,10 +76,10 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				`Create a kubeconfig for the Edge Cloud instance with instance ID "xxx". This will replace your current kubeconfig file.`,
 				`$ stackit beta edge-cloud kubeconfig create --instance-id xxx --overwrite`),
 		),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := context.Background()
 
-			model, err := parseInput(params.Printer, cmd, args)
+			model, err := parseInput(params.Printer, cmd)
 			if err != nil {
 				return err
 			}
@@ -165,7 +165,7 @@ func configureFlags(cmd *cobra.Command) {
 }
 
 // Parse user input (arguments and/or flags)
-func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &cliErr.ProjectIdError{}

internal/cmd/beta/edge/kubeconfig/create/create_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
+	"github.com/spf13/cobra"
 	edge "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
@@ -224,7 +225,9 @@ func TestParseInput(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
+			testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
+				return parseInput(p, cmd)
+			}, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
 		})
 	}
 }

internal/cmd/beta/edge/token/create/create.go

@@ -45,7 +45,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		Short: "Creates a token for an Edge Cloud instance",
 		Long: fmt.Sprintf("%s\n\n%s\n%s",
 			"Creates a token for a STACKIT Edge Cloud (STEC) instance.",
-			"An expiration time can be set for the token. The expiration time is set in seconds(s), minutes(m), hours(h), days(d) or months(M). Default is 3600(1h) seconds.",
+			fmt.Sprintf("An expiration time can be set for the token. The expiration time is set in seconds(s), minutes(m), hours(h), days(d) or months(M). Default is %d seconds.", expirationSecondsDefault),
 			"Note: the format for the duration is <value><unit>, e.g. 30d for 30 days. You may not combine units."),
 		Args: args.NoArgs,
 		Example: examples.Build(
@@ -56,10 +56,10 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				`Create a token for the Edge Cloud instance with instance ID "xxx". The token will be valid for one day.`,
 				`$ stackit beta edge-cloud token create --instance-id xxx --expiration 1d`),
 		),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := context.Background()
 
-			model, err := parseInput(params.Printer, cmd, args)
+			model, err := parseInput(params.Printer, cmd)
 			if err != nil {
 				return err
 			}
@@ -123,14 +123,14 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().String(instanceIdFlag, "", "Edge Cloud instance ID")
-	cmd.Flags().StringP(expirationFlag, "e", "", "Expiration time for the token, e.g. 5d. By default, the token is valid for 1h.")
+	cmd.Flags().StringP(expirationFlag, "e", "", fmt.Sprintf("Expiration time for the token, e.g. 5d. By default, the token is valid for %d seconds.", expirationSecondsDefault))
 
 	err := flags.MarkFlagsRequired(cmd, instanceIdFlag)
 	cobra.CheckErr(err)
 }
 
 // Parse user input (arguments and/or flags)
-func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 	globalFlags := globalflags.Parse(p, cmd)
 	if globalFlags.ProjectId == "" {
 		return nil, &cliErr.ProjectIdError{}

internal/cmd/beta/edge/token/create/create_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
+	"github.com/spf13/cobra"
 	edge "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
@@ -157,7 +158,9 @@ func TestParseInput(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
+			testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
+				return parseInput(p, cmd)
+			}, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
 		})
 	}
 }