diff --git a/codegen/v2/FirewallZonePolicy.json b/codegen/v2/FirewallZonePolicy.json index f6ccfa0..9f59dfe 100644 --- a/codegen/v2/FirewallZonePolicy.json +++ b/codegen/v2/FirewallZonePolicy.json @@ -16,7 +16,7 @@ "match_opposite_ports": "true|false", "matching_target": "ANY|APP|APP_CATEGORY|IP|REGION|WEB", "matching_target_type": "ANY|OBJECT|SPECIFIC", - "port": "^[0-9][0-9]?$|^", + "port": "^[0-9]+(?:-[0-9]+)?(?:,[0-9]+(?:-[0-9]+)?)*$", "port_group_id": "", "port_matching_type": "ANY|SPECIFIC|OBJECT", "regions": [""], @@ -53,7 +53,7 @@ "matching_target": "ANY|CLIENT|NETWORK|IP|MAC", "matching_target_type": "OBJECT|SPECIFIC", "network_ids": [""], - "port": "^[0-9][0-9]?$|^", + "port": "^[0-9]+(?:-[0-9]+)?(?:,[0-9]+(?:-[0-9]+)?)*$", "port_group_id": "", "port_matching_type": "ANY|SPECIFIC|OBJECT", "zone_id": "" diff --git a/unifi/firewall_zone_policy.generated.go b/unifi/firewall_zone_policy.generated.go index 7e677bd..ea3a3f6 100644 --- a/unifi/firewall_zone_policy.generated.go +++ b/unifi/firewall_zone_policy.generated.go @@ -73,7 +73,7 @@ type FirewallZonePolicyDestination struct { MatchOppositePorts bool `json:"match_opposite_ports"` MatchingTarget string `json:"matching_target,omitempty" validate:"omitempty,oneof=ANY APP APP_CATEGORY IP REGION WEB"` // ANY|APP|APP_CATEGORY|IP|REGION|WEB MatchingTargetType string `json:"matching_target_type,omitempty" validate:"omitempty,oneof=ANY OBJECT SPECIFIC"` // ANY|OBJECT|SPECIFIC - Port int `json:"port,omitempty"` // ^[0-9][0-9]?$|^ + Port string `json:"port,omitempty"` // ^[0-9]+(?:-[0-9]+)?(?:,[0-9]+(?:-[0-9]+)?)*$ PortGroupID string `json:"port_group_id,omitempty"` PortMatchingType string `json:"port_matching_type,omitempty" validate:"omitempty,oneof=ANY SPECIFIC OBJECT"` // ANY|SPECIFIC|OBJECT Regions []string `json:"regions,omitempty"` @@ -84,8 +84,6 @@ type FirewallZonePolicyDestination struct { func (dst *FirewallZonePolicyDestination) UnmarshalJSON(b []byte) error { type Alias FirewallZonePolicyDestination aux := &struct { - Port emptyStringInt `json:"port"` - *Alias }{ Alias: (*Alias)(dst), @@ -95,7 +93,6 @@ func (dst *FirewallZonePolicyDestination) UnmarshalJSON(b []byte) error { if err != nil { return fmt.Errorf("unable to unmarshal alias: %w", err) } - dst.Port = int(aux.Port) return nil } @@ -140,7 +137,7 @@ type FirewallZonePolicySource struct { MatchingTarget string `json:"matching_target,omitempty" validate:"omitempty,oneof=ANY CLIENT NETWORK IP MAC"` // ANY|CLIENT|NETWORK|IP|MAC MatchingTargetType string `json:"matching_target_type,omitempty" validate:"omitempty,oneof=OBJECT SPECIFIC"` // OBJECT|SPECIFIC NetworkIDs []string `json:"network_ids,omitempty"` - Port int `json:"port,omitempty"` // ^[0-9][0-9]?$|^ + Port string `json:"port,omitempty"` // ^[0-9]+(?:-[0-9]+)?(?:,[0-9]+(?:-[0-9]+)?)*$ PortGroupID string `json:"port_group_id,omitempty"` PortMatchingType string `json:"port_matching_type,omitempty" validate:"omitempty,oneof=ANY SPECIFIC OBJECT"` // ANY|SPECIFIC|OBJECT ZoneID string `json:"zone_id"` @@ -149,8 +146,6 @@ type FirewallZonePolicySource struct { func (dst *FirewallZonePolicySource) UnmarshalJSON(b []byte) error { type Alias FirewallZonePolicySource aux := &struct { - Port emptyStringInt `json:"port"` - *Alias }{ Alias: (*Alias)(dst), @@ -160,7 +155,6 @@ func (dst *FirewallZonePolicySource) UnmarshalJSON(b []byte) error { if err != nil { return fmt.Errorf("unable to unmarshal alias: %w", err) } - dst.Port = int(aux.Port) return nil }