review changes

Author: h3adex

docs/stackit_routing-table_create.md

@@ -20,23 +20,23 @@ stackit routing-table create [flags]
   stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --description "some description"
 
   Create a routing-table with name `rt` with system routes disabled
-  stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --non-system-routes
+  stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --system-routes false
 
   Create a routing-table with name `rt` with dynamic routes disabled
-  stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --non-dynamic-routes
+  stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --dynamic-routes false
 ```
 
 ### Options
 
 ```
       --description string       Description of the routing-table
+      --dynamic-routes           If false, preventing dynamic routes from propagating to the routing-table. (default true)
   -h, --help                     Help for "stackit routing-table create"
       --labels stringToString    Key=value labels (default [])
       --name string              Name of the routing-table
       --network-area-id string   Network-Area ID
-      --non-dynamic-routes       If true, preventing dynamic routes from propagating to the routing-table.
-      --non-system-routes        If true, automatically disables routes for project-to-project communication.
       --organization-id string   Organization ID
+      --system-routes            If false, automatically disables routes for project-to-project communication. (default true)
 ```
 
 ### Options inherited from parent commands

docs/stackit_routing-table_delete.md

@@ -7,7 +7,7 @@ Deletes a routing-table
 Deletes a routing-table
 
 ```
-stackit routing-table delete ROUTING_TABLE [flags]
+stackit routing-table delete ROUTING_TABLE_ID [flags]
 ```
 
 ### Examples

docs/stackit_routing-table_update.md

@@ -23,23 +23,23 @@ stackit routing-table update ROUTING_TABLE_ID [flags]
   $ stackit routing-table update xxx --description foo --organization-id yyy --network-area-id zzz
 
   Disables the dynamic routes of a routing-table with ID "xxx" in organization with ID "yyy" and network-area with ID "zzz"
-  $ stackit routing-table update xxx --organization-id yyy --network-area-id zzz --non-dynamic-routes
+  $ stackit routing-table update xxx --organization-id yyy --network-area-id zzz --disable-dynamic-routes
 
   Disables the system routes of a routing-table with ID "xxx" in organization with ID "yyy" and network-area with ID "zzz"
-  $ stackit routing-table update xxx --organization-id yyy --network-area-id zzz --non-system-routes
+  $ stackit routing-table update xxx --organization-id yyy --network-area-id zzz --disable-system-routes
 ```
 
 ### Options
 
 ```
       --description string       Description of the routing-table
+      --dynamic-routes           If false, automatically disables routes for project-to-project communication. (default true)
   -h, --help                     Help for "stackit routing-table update"
       --labels stringToString    Key=value labels (default [])
       --name string              Name of the routing-table
       --network-area-id string   Network-Area ID
-      --non-dynamic-routes       If true, preventing dynamic routes from propagating to the routing-table.
-      --non-system-routes        If true, automatically disables routes for project-to-project communication.
       --organization-id string   Organization ID
+      --system-routes            If false, preventing dynamic routes from propagating to the routing-table. (default true)
 ```
 
 ### Options inherited from parent commands

internal/cmd/routingtable/create/create.go

@@ -19,24 +19,24 @@ import (
 )
 
 const (
-	descriptionFlag      = "description"
-	labelFlag            = "labels"
-	nameFlag             = "name"
-	networkAreaIdFlag    = "network-area-id"
-	nonDynamicRoutesFlag = "non-dynamic-routes"
-	nonSystemRoutesFlag  = "non-system-routes"
-	organizationIdFlag   = "organization-id"
+	descriptionFlag    = "description"
+	labelFlag          = "labels"
+	nameFlag           = "name"
+	networkAreaIdFlag  = "network-area-id"
+	dynamicRoutesFlag  = "dynamic-routes"
+	systemRoutesFlag   = "system-routes"
+	organizationIdFlag = "organization-id"
 )
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
-	Description      *string
-	Labels           *map[string]string
-	Name             string
-	NetworkAreaId    string
-	NonSystemRoutes  bool
-	NonDynamicRoutes bool
-	OrganizationId   string
+	Description    *string
+	Labels         *map[string]string
+	Name           string
+	NetworkAreaId  string
+	SystemRoutes   bool
+	DynamicRoutes  bool
+	OrganizationId string
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -56,11 +56,11 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			),
 			examples.NewExample(
 				"Create a routing-table with name `rt` with system routes disabled",
-				`stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --non-system-routes`,
+				`stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --system-routes false`,
 			),
 			examples.NewExample(
 				"Create a routing-table with name `rt` with dynamic routes disabled",
-				`stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --non-dynamic-routes`,
+				`stackit routing-table create --organization-id xxx --network-area-id yyy --name "rt" --dynamic-routes false`,
 			),
 		),
 		RunE: func(cmd *cobra.Command, _ []string) error {
@@ -76,8 +76,9 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			if !model.AssumeYes {
-				prompt := fmt.Sprintf("Are you sure you want to create a routing-table with the name %s?", model.Name)
-				if err := params.Printer.PromptForConfirmation(prompt); err != nil {
+				prompt := fmt.Sprintf("Are you sure you want to create the routing-table %q?", model.Name)
+				err = params.Printer.PromptForConfirmation(prompt)
+				if err != nil {
 					return err
 				}
 			}
@@ -104,8 +105,8 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().StringToString(labelFlag, nil, "Key=value labels")
 	cmd.Flags().String(nameFlag, "", "Name of the routing-table")
 	cmd.Flags().Var(flags.UUIDFlag(), networkAreaIdFlag, "Network-Area ID")
-	cmd.Flags().Bool(nonDynamicRoutesFlag, false, "If true, preventing dynamic routes from propagating to the routing-table.")
-	cmd.Flags().Bool(nonSystemRoutesFlag, false, "If true, automatically disables routes for project-to-project communication.")
+	cmd.Flags().Bool(dynamicRoutesFlag, true, "If false, preventing dynamic routes from propagating to the routing-table.")
+	cmd.Flags().Bool(systemRoutesFlag, true, "If false, automatically disables routes for project-to-project communication.")
 	cmd.Flags().Var(flags.UUIDFlag(), organizationIdFlag, "Organization ID")
 
 	err := flags.MarkFlagsRequired(cmd, organizationIdFlag, networkAreaIdFlag, nameFlag)
@@ -116,30 +117,27 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	globalFlags := globalflags.Parse(p, cmd)
 
 	model := &inputModel{
-		GlobalFlagModel:  globalFlags,
-		Description:      flags.FlagToStringPointer(p, cmd, descriptionFlag),
-		NonDynamicRoutes: flags.FlagToBoolValue(p, cmd, nonDynamicRoutesFlag),
-		Labels:           flags.FlagToStringToStringPointer(p, cmd, labelFlag),
-		Name:             flags.FlagToStringValue(p, cmd, nameFlag),
-		NetworkAreaId:    flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
-		OrganizationId:   flags.FlagToStringValue(p, cmd, organizationIdFlag),
-		NonSystemRoutes:  flags.FlagToBoolValue(p, cmd, nonSystemRoutesFlag),
+		GlobalFlagModel: globalFlags,
+		Description:     flags.FlagToStringPointer(p, cmd, descriptionFlag),
+		DynamicRoutes:   flags.FlagToBoolValue(p, cmd, dynamicRoutesFlag),
+		Labels:          flags.FlagToStringToStringPointer(p, cmd, labelFlag),
+		Name:            flags.FlagToStringValue(p, cmd, nameFlag),
+		NetworkAreaId:   flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
+		OrganizationId:  flags.FlagToStringValue(p, cmd, organizationIdFlag),
+		SystemRoutes:    flags.FlagToBoolValue(p, cmd, systemRoutesFlag),
 	}
 
 	p.DebugInputModel(model)
 	return model, nil
 }
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) (iaas.ApiAddRoutingTableToAreaRequest, error) {
-	systemRoutes := !model.NonSystemRoutes
-	dynamicRoutes := !model.NonDynamicRoutes
-
 	payload := iaas.AddRoutingTableToAreaPayload{
 		Description:   model.Description,
 		Name:          utils.Ptr(model.Name),
 		Labels:        utils.ConvertStringMapToInterfaceMap(model.Labels),
-		SystemRoutes:  utils.Ptr(systemRoutes),
-		DynamicRoutes: utils.Ptr(dynamicRoutes),
+		SystemRoutes:  utils.Ptr(model.SystemRoutes),
+		DynamicRoutes: utils.Ptr(model.DynamicRoutes),
 	}
 
 	return apiClient.AddRoutingTableToArea(

internal/cmd/routingtable/create/create_test.go

@@ -30,8 +30,8 @@ var testNetworkAreaId = uuid.NewString()
 const testRoutingTableName = "test"
 const testRoutingTableDescription = "test"
 
-const testNonSystemRoutes = false
-const testNonDynamicRoutes = false
+const testSystemRoutesFlag = true
+const testDynamicRoutesFlag = true
 
 const testLabelSelectorFlag = "key1=value1,key2=value2"
 
@@ -47,8 +47,8 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
 		networkAreaIdFlag:      testNetworkAreaId,
 		descriptionFlag:        testRoutingTableDescription,
 		nameFlag:               testRoutingTableName,
-		nonSystemRoutesFlag:    strconv.FormatBool(testNonSystemRoutes),
-		nonDynamicRoutesFlag:   strconv.FormatBool(testNonDynamicRoutes),
+		systemRoutesFlag:       strconv.FormatBool(testSystemRoutesFlag),
+		dynamicRoutesFlag:      strconv.FormatBool(testDynamicRoutesFlag),
 		labelFlag:              testLabelSelectorFlag,
 	}
 	for _, mod := range mods {
@@ -63,13 +63,13 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 			Verbosity: globalflags.VerbosityDefault,
 			Region:    testRegion,
 		},
-		OrganizationId:   testOrgId,
-		NetworkAreaId:    testNetworkAreaId,
-		Name:             testRoutingTableName,
-		Description:      utils.Ptr(testRoutingTableDescription),
-		NonSystemRoutes:  testNonSystemRoutes,
-		NonDynamicRoutes: testNonDynamicRoutes,
-		Labels:           utils.Ptr(*testLabels),
+		OrganizationId: testOrgId,
+		NetworkAreaId:  testNetworkAreaId,
+		Name:           testRoutingTableName,
+		Description:    utils.Ptr(testRoutingTableDescription),
+		SystemRoutes:   testSystemRoutesFlag,
+		DynamicRoutes:  testDynamicRoutesFlag,
+		Labels:         utils.Ptr(*testLabels),
 	}
 	for _, mod := range mods {
 		mod(model)
@@ -118,21 +118,21 @@ func TestParseInput(t *testing.T) {
 		{
 			description: "dynamic routes disabled",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
-				flagValues[nonDynamicRoutesFlag] = "true"
+				flagValues[dynamicRoutesFlag] = "false"
 			}),
 			isValid: true,
 			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.NonDynamicRoutes = true
+				model.DynamicRoutes = false
 			}),
 		},
 		{
 			description: "system routes disabled",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
-				flagValues[nonSystemRoutesFlag] = "true"
+				flagValues[systemRoutesFlag] = "false"
 			}),
 			isValid: true,
 			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.NonSystemRoutes = true
+				model.SystemRoutes = false
 			}),
 		},
 		{
@@ -245,7 +245,7 @@ func TestBuildRequest(t *testing.T) {
 		{
 			description: "system routes disabled",
 			model: fixtureInputModel(func(model *inputModel) {
-				model.NonSystemRoutes = true
+				model.SystemRoutes = false
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiAddRoutingTableToAreaRequest) {
 				*request = (*request).AddRoutingTableToAreaPayload(
@@ -258,7 +258,7 @@ func TestBuildRequest(t *testing.T) {
 		{
 			description: "dynamic routes disabled",
 			model: fixtureInputModel(func(model *inputModel) {
-				model.NonDynamicRoutes = true
+				model.DynamicRoutes = false
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiAddRoutingTableToAreaRequest) {
 				*request = (*request).AddRoutingTableToAreaPayload(

internal/cmd/routingtable/delete/delete.go

@@ -18,7 +18,7 @@ import (
 const (
 	networkAreaIdFlag  = "network-area-id"
 	organizationIdFlag = "organization-id"
-	routingTableIdArg  = "ROUTING_TABLE"
+	routingTableIdArg  = "ROUTING_TABLE_ID"
 )
 
 type inputModel struct {
@@ -54,7 +54,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			if !model.AssumeYes {
-				prompt := fmt.Sprintf("Are you sure you want to delete the routing-table %q for network-area-id %q?", model.RoutingTableId, model.OrganizationId)
+				prompt := fmt.Sprintf("Are you sure you want to delete the routing-table %q?", model.RoutingTableId)
 				err = params.Printer.PromptForConfirmation(prompt)
 				if err != nil {
 					return err

internal/cmd/routingtable/list/list.go

@@ -13,8 +13,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
-	rmClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client"
-	rmUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
@@ -77,31 +75,14 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list routing-tables: %w", err)
 			}
 
-			if items := response.Items; items == nil {
-				var orgLabel string
-				rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
-				if err == nil {
-					orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, model.OrganizationId)
-					if err != nil {
-						params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
-						orgLabel = model.OrganizationId
-					} else if orgLabel == "" {
-						orgLabel = model.OrganizationId
-					}
-				} else {
-					params.Printer.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
-				}
-				params.Printer.Outputf("No routing-tables found for organization %q\n", orgLabel)
-				return nil
-			}
+			routingTables := utils.GetSliceFromPointer(response.Items)
 
 			// Truncate output
-			items := response.GetItems()
-			if model.Limit != nil && len(items) > int(*model.Limit) {
-				items = items[:*model.Limit]
+			if model.Limit != nil && len(routingTables) > int(*model.Limit) {
+				routingTables = routingTables[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, items)
+			return outputResult(params.Printer, model.OutputFormat, routingTables, model.OrganizationId)
 		},
 	}
 
@@ -150,12 +131,17 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	return request
 }
-func outputResult(p *print.Printer, outputFormat string, routingTables []iaas.RoutingTable) error {
+func outputResult(p *print.Printer, outputFormat string, routingTables []iaas.RoutingTable, orgId string) error {
 	if routingTables == nil {
 		return fmt.Errorf("list routing-table items are nil")
 	}
 
 	return p.OutputResult(outputFormat, routingTables, func() error {
+		if len(routingTables) == 0 {
+			p.Outputf("No routing-tables found for organization %q\n", orgId)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "DESCRIPTION", "DEFAULT", "LABELS", "SYSTEM ROUTES", "DYNAMIC ROUTES", "CREATED AT", "UPDATED AT")
 		for _, routingTable := range routingTables {

internal/cmd/routingtable/list/list_test.go

@@ -220,7 +220,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.outputFormat, tt.routingTable); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.outputFormat, tt.routingTable, "dummy-org-id"); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/routingtable/route/create/create.go

@@ -82,7 +82,8 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to create a route for routing-table with id %q?", model.RoutingTableId)
-				if err := params.Printer.PromptForConfirmation(prompt); err != nil {
+				err = params.Printer.PromptForConfirmation(prompt)
+				if err != nil {
 					return err
 				}
 			}