chore(edge): fix review comments

relates to STACKITCLI-357

Author: GokceGK

docs/stackit_beta_edge-cloud_kubeconfig_create.md

@@ -12,34 +12,35 @@ An expiration time can be set for the kubeconfig. The expiration time is set in
 Note: the format for the duration is <value><unit>, e.g. 30d for 30 days. You may not combine units.
 
 ```
-stackit beta edge-cloud kubeconfig create kubeconfig for INSTANCE_ID [flags]
+stackit beta edge-cloud kubeconfig create [flags]
 ```
 
 ### Examples
 
 ```
   Create or update a kubeconfig for the Edge Cloud instance with instance ID "xxx". If the config exists in the kubeconfig file, the information will be updated.
-  $ stackit beta edge-cloud kubeconfig create xxx
+  $ stackit beta edge-cloud kubeconfig create --instance-id xxx
 
   Create or update a kubeconfig for the Edge Cloud instance with instance ID "xxx" in a custom filepath.
-  $ stackit beta edge-cloud kubeconfig create xxx --filepath yyy
+  $ stackit beta edge-cloud kubeconfig create --instance-id xxx --filepath yyy
 
   Get a kubeconfig for the Edge Cloud instance with instance ID "xxx" without writing it to a file and format the output as json.
-  $ stackit beta edge-cloud kubeconfig create xxx --disable-writing --output-format json
+  $ stackit beta edge-cloud kubeconfig create --instance-id xxx --disable-writing --output-format json
 
   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 xxx --overwrite
+  $ stackit beta edge-cloud kubeconfig create --instance-id xxx --overwrite
 ```
 
 ### Options
 
 ```
-      --disable-writing     Disable writing the kubeconfig to a file.
-  -e, --expiration string   Expiration time for the kubeconfig, e.g. 5d. By default, the token is valid for 1h.
-  -f, --filepath string     Path to the kubeconfig file. A default is chosen by Kubernetes if not set.
-  -h, --help                Help for "stackit beta edge-cloud kubeconfig create"
-      --overwrite           Force overwrite the kubeconfig file if it exists.
-      --switch-context      Switch to the context in the kubeconfig file to the new context.
+      --disable-writing      Disable writing the kubeconfig to a file.
+  -e, --expiration string    Expiration time for the kubeconfig, e.g. 5d. By default, the token is valid for 1h.
+  -f, --filepath string      Path to the kubeconfig file. A default is chosen by Kubernetes if not set.
+  -h, --help                 Help for "stackit beta edge-cloud kubeconfig create"
+      --instance-id string   Edge Cloud instance ID
+      --overwrite            Force overwrite the kubeconfig file if it exists.
+      --switch-context       Switch to the context in the kubeconfig file to the new context.
 ```
 
 ### Options inherited from parent commands

docs/stackit_beta_edge-cloud_token_create.md

@@ -10,24 +10,25 @@ An expiration time can be set for the token. The expiration time is set in secon
 Note: the format for the duration is <value><unit>, e.g. 30d for 30 days. You may not combine units.
 
 ```
-stackit beta edge-cloud token create token for INSTANCE_ID [flags]
+stackit beta edge-cloud token create [flags]
 ```
 
 ### Examples
 
 ```
   Create a token for the Edge Cloud instance with instance ID "xxx".
-  $ stackit beta edge-cloud token create xxx
+  $ stackit beta edge-cloud token create --instance-id xxx
 
   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 xxx --expiration 1d
+  $ stackit beta edge-cloud token create --instance-id xxx --expiration 1d
 ```
 
 ### Options
 
 ```
-  -e, --expiration string   Expiration time for the token, e.g. 5d. By default, the token is valid for 1h.
-  -h, --help                Help for "stackit beta edge-cloud token create"
+  -e, --expiration string    Expiration time for the token, e.g. 5d. By default, the token is valid for 1h.
+  -h, --help                 Help for "stackit beta edge-cloud token create"
+      --instance-id string   Edge Cloud instance ID
 ```
 
 ### Options inherited from parent commands

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

@@ -30,9 +30,9 @@ const (
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
-	DisplayName *string
-	Description string
-	PlanId      *string
+	DisplayName string
+	Description *string
+	PlanId      string
 }
 
 // NewCmd https://aip.stackit.cloud/aip/general/0121/
@@ -118,19 +118,19 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		return nil, &cliErr.ProjectIdError{}
 	}
 
-	displayNameValue := flags.FlagToStringPointer(p, cmd, displayNameFlag)
+	displayNameValue := flags.FlagToStringValue(p, cmd, displayNameFlag)
 	planIdValue := flags.FlagToStringValue(p, cmd, planIdFlag)
 	err := utils.ValidateUUID(planIdValue)
 	if err != nil {
 		return nil, err
 	}
-	descriptionValue := flags.FlagToStringValue(p, cmd, descriptionFlag)
+	descriptionValue := flags.FlagToStringPointer(p, cmd, descriptionFlag)
 
 	model := inputModel{
 		GlobalFlagModel: globalFlags,
 		DisplayName:     displayNameValue,
 		Description:     descriptionValue,
-		PlanId:          &planIdValue,
+		PlanId:          planIdValue,
 	}
 
 	p.DebugInputModel(model)
@@ -141,20 +141,20 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *edge.APICli
 	req = apiClient.DefaultAPI.CreateInstance(ctx, model.ProjectId, model.Region)
 
 	payload := edge.CreateInstancePayload{
-		DisplayName: *model.DisplayName,
-		Description: &model.Description,
-		PlanId:      *model.PlanId,
+		DisplayName: model.DisplayName,
+		Description: model.Description,
+		PlanId:      model.PlanId,
 	}
 
 	return req.CreateInstancePayload(payload), nil
 }
 
 func outputResult(p *print.Printer, model *inputModel, projectLabel string, instance *edge.Instance) error {
-	if instance == nil {
-		return fmt.Errorf("instance response is empty")
-	}
-
 	return p.OutputResult(model.OutputFormat, instance, func() error {
+		if instance == nil {
+			return fmt.Errorf("instance response is empty")
+		}
+
 		operationState := "Created"
 		if model.Async {
 			operationState = "Triggered creation of"

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

@@ -19,16 +19,17 @@ import (
 type testCtxKey struct{}
 
 var (
-	testCtx       = context.WithValue(context.Background(), testCtxKey{}, "foo")
-	testProjectId = uuid.NewString()
-	testRegion    = "eu01"
+	testCtx        = context.WithValue(context.Background(), testCtxKey{}, "foo")
+	testProjectId  = uuid.NewString()
+	testPlanId     = uuid.NewString()
+	testInstanceId = uuid.NewString()
+	testClient     = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
+)
 
+const (
+	testRegion      = "eu01"
 	testName        = "test"
-	testPlanId      = uuid.NewString()
 	testDescription = "Initial instance description"
-	testInstanceId  = uuid.NewString()
-
-	testClient = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
 )
 
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
@@ -52,9 +53,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 			Region:    testRegion,
 			Verbosity: globalflags.VerbosityDefault,
 		},
-		DisplayName: utils.Ptr(testName),
-		Description: testDescription,
-		PlanId:      utils.Ptr(testPlanId),
+		DisplayName: testName,
+		Description: utils.Ptr(testDescription),
+		PlanId:      testPlanId,
 	}
 	for _, mod := range mods {
 		mod(model)
@@ -165,15 +166,14 @@ func TestBuildRequest(t *testing.T) {
 					Region:    testRegion,
 					Verbosity: globalflags.VerbosityDefault,
 				},
-				DisplayName: utils.Ptr(testName),
-				PlanId:      utils.Ptr(testPlanId),
+				DisplayName: testName,
+				PlanId:      testPlanId,
 			},
 			expectedRequest: testClient.DefaultAPI.
 				CreateInstance(testCtx, testProjectId, testRegion).
 				CreateInstancePayload(edge.CreateInstancePayload{
 					DisplayName: testName,
 					PlanId:      testPlanId,
-					Description: utils.Ptr(""),
 				}),
 		},
 	}

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

@@ -62,7 +62,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				projectLabel = model.ProjectId
 			}
 
-			instanceLabel, err := edgeUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.InstanceId, model.Region)
+			instanceLabel, err := edgeUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.InstanceId)
 			if err != nil {
 				params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err)
 				instanceLabel = model.InstanceId
@@ -95,7 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if model.Async {
 				operationState = "Triggered deletion of"
 			}
-			params.Printer.Info("%s instance %q of project %q.\n", operationState, instanceLabel, projectLabel)
+			params.Printer.Outputf("%s instance %q of project %q.\n", operationState, instanceLabel, projectLabel)
 			return nil
 		},
 	}

internal/cmd/beta/edge/instance/delete/delete_test.go

@@ -19,11 +19,11 @@ var (
 	testCtx        = context.WithValue(context.Background(), testCtxKey{}, "foo")
 	testProjectId  = uuid.NewString()
 	testInstanceId = uuid.NewString()
-	testRegion     = "eu01"
-
-	testClient = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
+	testClient     = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
 )
 
+const testRegion = "eu01"
+
 func fixtureArgValues(mods ...func(argValues []string)) []string {
 	argValues := []string{
 		testInstanceId,

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

@@ -94,11 +94,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *edge.APICli
 }
 
 func outputResult(p *print.Printer, outputFormat string, instance *edge.Instance) error {
-	if instance == nil {
-		return fmt.Errorf("instance response is empty")
-	}
-
 	return p.OutputResult(outputFormat, instance, func() error {
+		if instance == nil {
+			return fmt.Errorf("instance response is empty")
+		}
+
 		table := tables.NewTable()
 		table.AddRow("ID", instance.Id)
 		table.AddSeparator()

internal/cmd/beta/edge/instance/describe/describe_test.go

@@ -17,15 +17,14 @@ import (
 type testCtxKey struct{}
 
 var (
-	testCtx       = context.WithValue(context.Background(), testCtxKey{}, "foo")
-	testProjectId = uuid.NewString()
-	testRegion    = "eu01"
-
+	testCtx        = context.WithValue(context.Background(), testCtxKey{}, "foo")
+	testProjectId  = uuid.NewString()
 	testInstanceId = uuid.NewString()
-
-	testClient = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
+	testClient     = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
 )
 
+const testRegion = "eu01"
+
 func fixtureArgValues(mods ...func(argValues []string)) []string {
 	argValues := []string{
 		testInstanceId,
@@ -153,8 +152,10 @@ func TestOutputResult(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name:    "empty",
-			args:    args{},
+			name: "instance is nil",
+			args: args{
+				instance: nil,
+			},
 			wantErr: true,
 		},
 		{

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

@@ -127,8 +127,7 @@ func outputResult(p *print.Printer, outputFormat, projectLabel string, instances
 
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "UI", "STATE")
-		for i := range instances {
-			instance := instances[i]
+		for _, instance := range instances {
 			table.AddRow(
 				instance.Id,
 				instance.DisplayName,

internal/cmd/beta/edge/instance/list/list_test.go

@@ -20,11 +20,11 @@ type testCtxKey struct{}
 var (
 	testCtx       = context.WithValue(context.Background(), testCtxKey{}, "foo")
 	testProjectId = uuid.NewString()
-	testRegion    = "eu01"
-
-	testClient = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
+	testClient    = &edge.APIClient{DefaultAPI: &edge.DefaultAPIService{}}
 )
 
+const testRegion = "eu01"
+
 func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
 	flagValues := map[string]string{
 		globalflags.ProjectIdFlag: testProjectId,