More omitempty

unifi/firewall_policy.go

@@ -5,6 +5,46 @@ import (
 	"fmt"
 )
 
+type FirewallDestination         struct {
+		IPGroupID          string   `json:"ip_group_id"`
+		IPs                []string `json:"ips"`
+		MatchOppositeIPs   bool     `json:"match_opposite_ips"`
+		MatchOppositePorts bool     `json:"match_opposite_ports"`
+		MatchingTarget     string   `json:"matching_target"`
+		MatchingTargetType    string   `json:"matching_target_type"`
+		NetworkIDs         [] string   `json:"network_ids,omitempty"`
+		Port               string   `json:"port"`
+		PortGroupID        string   `json:"port_group_id"`
+		PortMatchingType   string   `json:"port_matching_type"`
+		Regions            []string `json:"regions,omitempty"`
+		ZoneID             string   `json:"zone_id"`
+	} 
+
+type FirewallSource struct {
+		ClientMacs            []string `json:"client_macs,omitempty"`
+		IPs                   []string `json:"ips,omitempty"`
+		MatchMac              bool     `json:"match_mac"`
+		MatchOppositeIPs      bool     `json:"match_opposite_ips"`
+		MatchOppositeNetworks bool     `json:"match_opposite_networks"`
+		MatchOppositePorts    bool     `json:"match_opposite_ports"`
+		MatchingTarget        string   `json:"matching_target"`
+		MatchingTargetType    string   `json:"matching_target_type,omitempty"`
+		NetworkIDs            []string `json:"network_ids,omitempty"`
+		Port                  string   `json:"port"`
+		PortMatchingType      string   `json:"port_matching_type"`
+		ZoneID                string   `json:"zone_id"`
+	}
+
+type FirewallSchedule              struct {
+		Mode         string        `json:"mode"`
+		DateStart     string  `json:"date_start,omitempty"`
+		DateEnd     string  `json:"date_end,omitempty"`
+		RepeatOnDays []string `json:"repeat_on_days"`
+		TimeAllDay   bool          `json:"time_all_day"`
+		TimeRangeStart string      `json:"time_range_start,omitempty"`
+		TimeRangeEnd string      `json:"time_range_end,omitempty"`
+	}
+
 type FirewallPolicy struct {
 	ID string `json:"_id,omitempty"`
 
@@ -18,56 +58,23 @@ type FirewallPolicy struct {
 	ConnectionStates    []string `json:"connection_states"`
 	CreateAllowRespond  bool     `json:"create_allow_respond"`
 	Description         string   `json:"description"`
-	Destination         struct {
+	Destination FirewallDestination `json:"destination"`
-		IPGroupID          string   `json:"ip_group_id"`
-		Ips                []string `json:"ips"`
-		MatchOppositeIps   bool     `json:"match_opposite_ips"`
-		MatchOppositePorts bool     `json:"match_opposite_ports"`
-		MatchingTarget     string   `json:"matching_target"`
-		NetworkIDs         [] string   `json:"network_ids"`
-		Port               string   `json:"port"`
-		PortGroupID        string   `json:"port_group_id"`
-		PortMatchingType   string   `json:"port_matching_type"`
-		Regions            []string `json:"regions"`
-		ZoneID             string   `json:"zone_id"`
-	} `json:"destination"`
 	Enabled               bool   `json:"enabled"`
-	IcmpTypename          string `json:"icmp_typename"`
+	ICMPTypename          string `json:"icmp_typename"`
-	IcmpV6Typename        string `json:"icmp_v6_typename"`
+	ICMPV6Typename        string `json:"icmp_v6_typename"`
 	Index                 int64  `json:"index"`
 	IPVersion             string `json:"ip_version"`
 	Logging               bool   `json:"logging"`
 	MatchIPSec            bool   `json:"match_ip_sec"`
-	MatchIPSecType        string `json:"match_ip_sec_type"`
+	MatchIPSecType        string `json:"match_ip_sec_type,omitempty"`
 	MatchOppositeProtocol bool   `json:"match_opposite_protocol"`
 	Name                  string `json:"name"`
-	OriginID              string `json:"origin_id"`
+	OriginID              string `json:"origin_id,omitempty"`
-	OriginType            string `json:"origin_type"`
+	OriginType            string `json:"origin_type,omitempty"`
 	Predefined            bool   `json:"predefined"`
 	Protocol              string `json:"protocol"`
-	Schedule              struct {
+	Schedule              FirewallSchedule `json:"schedule"`
-		Mode         string        `json:"mode"`
+	Source FirewallSource `json:"source"`
-		DateStart     string  `json:"date_start"`
-		DateEnd     string  `json:"date_end"`
-		RepeatOnDays []string `json:"repeat_on_days"`
-		TimeAllDay   bool          `json:"time_all_day"`
-		TimeRangeStart string      `json:"time_range_start"`
-		TimeRangeEnd string      `json:"time_range_end"`
-	} `json:"schedule"`
-	Source struct {
-		ClientMacs            []string `json:"client_macs"`
-		Ips                   []string `json:"ips"`
-		MatchMac              bool     `json:"match_mac"`
-		MatchOppositeIps      bool     `json:"match_opposite_ips"`
-		MatchOppositeNetworks bool     `json:"match_opposite_networks"`
-		MatchOppositePorts    bool     `json:"match_opposite_ports"`
-		MatchingTarget        string   `json:"matching_target"`
-		MatchingTargetType    string   `json:"matching_target_type"`
-		NetworkIDs            []string `json:"network_ids"`
-		Port                  string   `json:"port"`
-		PortMatchingType      string   `json:"port_matching_type"`
-		ZoneID                string   `json:"zone_id"`
-	} `json:"source"`
 
 	// Role string `json:"role"`
 }
@@ -105,7 +112,7 @@ func (c *Client) DeleteFirewallPolicy(ctx context.Context, site, id string) erro
         return nil
 }
 
-func (c *Client) CreaateFirewallPolicy(ctx context.Context, site string, d *FirewallPolicy) (*FirewallPolicy, error) {
+func (c *Client) CreateFirewallPolicy(ctx context.Context, site string, d *FirewallPolicy) (*FirewallPolicy, error) {
         var respBody FirewallPolicy
 
         err := c.do_versioned(ctx, "V2", "POST", fmt.Sprintf("site/%s/firewall-policies", site), d, &respBody)