ESD-1648: Tighten validation and interactive-prompt gaps

internal/commands/mcr/mcr_prompts.go

@@ -448,6 +448,10 @@ func promptForPrefixFilterListDetails(mcrUID string, noColor bool) (*megaport.Cr
 		},
 	}
 
+	if err := validation.ValidatePrefixFilterListRequest(req); err != nil {
+		return nil, err
+	}
+
 	return req, nil
 }
 

internal/commands/mcr/mcr_prompts_test.go

@@ -503,6 +503,38 @@ func TestPromptForPrefixFilterListDetails_NoEntries(t *testing.T) {
 	assert.Contains(t, err.Error(), "at least one entry is required")
 }
 
+func TestPromptForPrefixFilterListDetails_InvalidPrefix(t *testing.T) {
+	originalPrompt := utils.GetResourcePrompt()
+	defer func() { utils.SetResourcePrompt(originalPrompt) }()
+
+	// Prefix that isn't a CIDR passes the entry prompt but must fail
+	// request-level validation before anything reaches the API.
+	utils.SetResourcePrompt(mockPromptSequence([]string{
+		"My PFL", "IPv4",
+		"banana", "permit", "", "",
+		"", // stop adding entries
+	}))
+
+	_, err := promptForPrefixFilterListDetails("mcr-123", true)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "must be a valid IPv4 CIDR notation")
+}
+
+func TestPromptForPrefixFilterListDetails_WrongFamilyPrefix(t *testing.T) {
+	originalPrompt := utils.GetResourcePrompt()
+	defer func() { utils.SetResourcePrompt(originalPrompt) }()
+
+	utils.SetResourcePrompt(mockPromptSequence([]string{
+		"My PFL", "IPv6",
+		"10.0.0.0/8", "permit", "", "",
+		"", // stop adding entries
+	}))
+
+	_, err := promptForPrefixFilterListDetails("mcr-123", true)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "must be a valid IPv6 CIDR notation")
+}
+
 func TestPromptForIPSecTunnelCount(t *testing.T) {
 	tests := []struct {
 		name        string

internal/commands/mve/mve_prompts.go

@@ -393,6 +393,9 @@ func promptMVEVnics(noColor bool) ([]megaport.MVENetworkInterface, error) {
 			if err != nil {
 				return nil, err
 			}
+			if err := validation.ValidateVLAN(vlan); err != nil {
+				return nil, err
+			}
 		}
 
 		vnics = append(vnics, megaport.MVENetworkInterface{

internal/commands/mve/mve_prompts_test.go

@@ -400,6 +400,17 @@ func TestPromptMVEVnics_InvalidVLAN(t *testing.T) {
 	assert.Contains(t, err.Error(), "invalid VLAN ID")
 }
 
+func TestPromptMVEVnics_OutOfRangeVLAN(t *testing.T) {
+	original := utils.GetResourcePrompt()
+	defer func() { utils.SetResourcePrompt(original) }()
+
+	utils.SetResourcePrompt(mockPromptSequence([]string{"eth0", "4100"}))
+
+	_, err := promptMVEVnics(true)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "VLAN ID")
+}
+
 // promptMVEVendorConfig tests — cisco/palo_alto admin password handling
 
 func TestPromptMVEVendorConfig_Cisco_WithAdminPassword(t *testing.T) {

internal/commands/vxc/vxc_prompts_partner.go

@@ -3,7 +3,6 @@ package vxc
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 
 	"github.com/megaport/megaport-cli/internal/utils"
@@ -98,8 +97,11 @@ func promptAWSConfig(noColor bool) (*megaport.VXCPartnerConfigAWS, error) {
 	if err != nil {
 		return nil, err
 	}
+	if ownerAccount == "" {
+		return nil, fmt.Errorf("owner account ID is required")
+	}
 
-	connectionName, err := utils.ResourcePrompt("vxc", "Enter connection name (required): ", noColor)
+	connectionName, err := utils.ResourcePrompt("vxc", "Enter connection name (optional, defaults to MEGAPORT): ", noColor)
 	if err != nil {
 		return nil, err
 	}
@@ -108,12 +110,12 @@ func promptAWSConfig(noColor bool) (*megaport.VXCPartnerConfigAWS, error) {
 	if err != nil {
 		return nil, err
 	}
-	var asn int
-	if asnStr != "" {
-		asn, err = validation.ParseInt("ASN", asnStr)
-		if err != nil {
-			return nil, err
-		}
+	if asnStr == "" {
+		return nil, fmt.Errorf("ASN is required")
+	}
+	asn, err := validation.ParseInt("ASN", asnStr)
+	if err != nil {
+		return nil, err
 	}
 
 	amazonASNStr, err := utils.ResourcePrompt("vxc", "Enter Amazon ASN (optional): ", noColor)
@@ -177,6 +179,9 @@ func promptAzureConfig(ctx context.Context, svc megaport.VXCService, noColor boo
 	if err != nil {
 		return nil, "", err
 	}
+	if serviceKey == "" {
+		return nil, "", fmt.Errorf("service key is required")
+	}
 
 	portChoice, err := utils.ResourcePrompt("vxc", "Enter port choice (primary/secondary, optional, default value is primary): ", noColor)
 	if err != nil {
@@ -268,9 +273,15 @@ func promptAzurePeeringConfig(noColor bool) (megaport.PartnerOrderAzurePeeringCo
 	if err != nil {
 		return megaport.PartnerOrderAzurePeeringConfig{}, err
 	}
-	vlan, err := strconv.Atoi(vlanStr)
-	if err != nil {
-		vlan = 0
+	var vlan int
+	if vlanStr != "" {
+		vlan, err = validation.ParseInt("VLAN ID", vlanStr)
+		if err != nil {
+			return megaport.PartnerOrderAzurePeeringConfig{}, err
+		}
+		if err := validation.ValidateVLAN(vlan); err != nil {
+			return megaport.PartnerOrderAzurePeeringConfig{}, err
+		}
 	}
 
 	return megaport.PartnerOrderAzurePeeringConfig{
@@ -289,6 +300,9 @@ func promptGoogleConfig(ctx context.Context, svc megaport.VXCService, noColor bo
 	if err != nil {
 		return nil, "", err
 	}
+	if pairingKey == "" {
+		return nil, "", fmt.Errorf("pairing key is required")
+	}
 
 	uid, err := getPartnerPortUID(ctx, svc, pairingKey, "GOOGLE")
 	if err != nil {
@@ -306,6 +320,9 @@ func promptOracleConfig(ctx context.Context, svc megaport.VXCService, noColor bo
 	if err != nil {
 		return nil, "", err
 	}
+	if virtualCircuitId == "" {
+		return nil, "", fmt.Errorf("virtual circuit ID is required")
+	}
 
 	uid, err := getPartnerPortUID(ctx, svc, virtualCircuitId, "ORACLE")
 	if err != nil {
@@ -323,24 +340,25 @@ func promptIBMConfig(noColor bool) (*megaport.VXCPartnerConfigIBM, error) {
 	if err != nil {
 		return nil, err
 	}
+	if accountID == "" {
+		return nil, fmt.Errorf("account ID is required")
+	}
 
-	name, err := utils.ResourcePrompt("vxc", "Enter name (required): ", noColor)
+	name, err := utils.ResourcePrompt("vxc", "Enter name (optional, defaults to MEGAPORT): ", noColor)
 	if err != nil {
 		return nil, err
 	}
-	if name == "" {
-		return nil, fmt.Errorf("name is required")
-	}
-
-	var customerASN int
 
 	customerASNStr, err := utils.ResourcePrompt("vxc", "Enter customer ASN (required if opposite end is not an MCR): ", noColor)
 	if err != nil {
 		return nil, err
 	}
-	customerASN, err = validation.ParseInt("customer ASN", customerASNStr)
-	if err != nil {
-		return nil, err
+	var customerASN int
+	if customerASNStr != "" {
+		customerASN, err = validation.ParseInt("customer ASN", customerASNStr)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	customerIPAddress, err := utils.ResourcePrompt("vxc", "Enter customer IP address (optional): ", noColor)