review feedback

Author: marceljk

internal/cmd/network-area/create/create.go

@@ -148,10 +148,10 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				}
 				if !model.AssumeYes {
 					s := spinner.New(params.Printer)
-					s.Start("Create network area")
+					s.Start("Create network area region")
 					_, err = wait.CreateNetworkAreaRegionWaitHandler(ctx, apiClient, model.OrganizationId, *resp.Id, model.Region).WaitWithContext(ctx)
 					if err != nil {
-						return fmt.Errorf("wait for completing SKE credentials rotation %w", err)
+						return fmt.Errorf("wait for creating network area region %w", err)
 					}
 					s.Stop()
 				}
@@ -235,7 +235,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		Labels:              flags.FlagToStringToStringPointer(p, cmd, labelFlag),
 	}
 
-	hasAllRequiredRegionalAreaFieldsSet := model.NetworkRanges != nil || model.TransferNetwork != nil
+	// Check if any of the deprecated **optional** fields are set and if no of the associated deprecated **required** fields is set.
+	hasAllRequiredRegionalAreaFieldsSet := model.NetworkRanges != nil && model.TransferNetwork != nil
 	hasOptionalRegionalAreaFieldsSet := model.DnsNameServers != nil || model.DefaultPrefixLength != nil || model.MaxPrefixLength != nil || model.MinPrefixLength != nil
 	if hasOptionalRegionalAreaFieldsSet && !hasAllRequiredRegionalAreaFieldsSet {
 		return nil, &cliErr.MultipleFlagsAreMissing{

internal/cmd/network-area/create/create_test.go

@@ -181,25 +181,41 @@ func TestParseInput(t *testing.T) {
 			isValid: false,
 		},
 		{
-			description: "deprecated network ranges missing",
+			description: "set deprecated network ranges - missing transfer network",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
-				delete(flagValues, networkRangesFlag)
+				flagValues[networkRangesFlag] = strings.Join(testNetworkRanges, ",")
 			}),
-			isValid: true,
-			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.NetworkRanges = nil
+			isValid: false,
+		},
+		{
+			description: "set deprecated transfer network - missing network ranges",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[transferNetworkFlag] = testTransferNetwork
 			}),
+			isValid: false,
 		},
 		{
-			description: "deprecated transfer network missing",
+			description: "set deprecated transfer network and network ranges",
 			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
-				delete(flagValues, transferNetworkFlag)
+				flagValues[networkRangesFlag] = strings.Join(testNetworkRanges, ",")
+				flagValues[transferNetworkFlag] = testTransferNetwork
 			}),
 			isValid: true,
 			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.TransferNetwork = nil
+				model.NetworkRanges = utils.Ptr(testNetworkRanges)
+				model.TransferNetwork = utils.Ptr(testTransferNetwork)
 			}),
 		},
+		{
+			description: "set deprecated optional flags",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[dnsNameServersFlag] = strings.Join(testDnsNameservers, ",")
+				flagValues[defaultPrefixLengthFlag] = strconv.FormatInt(testDefaultPrefixLength, 10)
+				flagValues[maxPrefixLengthFlag] = strconv.FormatInt(testMaxPrefixLength, 10)
+				flagValues[minPrefixLengthFlag] = strconv.FormatInt(testMinPrefixLength, 10)
+			}),
+			isValid: false,
+		},
 		{
 			description: "no values",
 			flagValues:  map[string]string{},

internal/cmd/network-area/route/describe/describe.go

@@ -111,10 +111,13 @@ func outputResult(p *print.Printer, outputFormat string, route iaas.Route) error
 		table.AddSeparator()
 		if destination := route.Destination; destination != nil {
 			if destination.DestinationCIDRv4 != nil {
+				table.AddRow("DESTINATION TYPE", utils.PtrString(destination.DestinationCIDRv4.Type))
+				table.AddSeparator()
 				table.AddRow("DESTINATION", utils.PtrString(destination.DestinationCIDRv4.Value))
 				table.AddSeparator()
-			}
-			if destination.DestinationCIDRv6 != nil {
+			} else if destination.DestinationCIDRv6 != nil {
+				table.AddRow("DESTINATION TYPE", utils.PtrString(destination.DestinationCIDRv6.Type))
+				table.AddSeparator()
 				table.AddRow("DESTINATION", utils.PtrString(destination.DestinationCIDRv6.Value))
 				table.AddSeparator()
 			}

internal/cmd/network-area/update/update.go

@@ -118,7 +118,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			if resp == nil || resp.Id == nil {
-				return fmt.Errorf("create network area: empty response")
+				return fmt.Errorf("update network area: empty response")
 			}
 
 			responses := NetworkAreaResponses{
@@ -128,9 +128,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			if hasDeprecatedFlagsSet(model) {
 				deprecatedFlags := getConfiguredDeprecatedFlags(model)
 				params.Printer.Warn("the flags %q are deprecated and will be removed after April 2026. Use `$ stackit network-area region` to configure these options for a network area.\n", strings.Join(deprecatedFlags, ","))
-				if resp == nil || resp.Id == nil {
-					return fmt.Errorf("create network area: empty response")
-				}
 				reqNetworkArea := buildRequestNetworkAreaRegion(ctx, model, apiClient)
 				respNetworkArea, err := reqNetworkArea.Execute()
 				if err != nil {