Merge branch '2-create-firewall-zone-api'

unifi/firewall_zone.go

@@ -14,25 +14,23 @@ type FirewallZone struct {
 	// NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
 	Name        string   `json:"name"`
-	Description string   `json:"desc"`
+	DefaultZone bool     `json:"default_zone,omitempty"`
-	DefaultZone bool     `json:default_zone,omitempty`
+	NetworkIDs  []string `json:"network_ids,omitempty"`
-	NetworkIDs  []string `json:network_ids,omitempty`
+	ZoneKey     string   `json:"zone_key,omitempty"`
 
 	// Role string `json:"role"`
 }
 
 func (c *Client) ListFirewallZones(ctx context.Context, site string) ([]FirewallZone, error) {
-	var respBody struct {
+	var respBody []FirewallZone
-		Meta meta           `json:"meta"`
+
-		Data []FirewallZone `json:"data"`
-	}
 
 	err := c.do(ctx, "GET", fmt.Sprintf("site/%s/firewall/zone", site), nil, &respBody)
 	if err != nil {
 		return nil, err
 	}
 
-	return respBody.Data, nil
+	return respBody, nil
 }
 
 func (c *Client) GetFirewallZone(ctx context.Context, site, id string) (*FirewallZone, error) {

unifi/unifi.go

@@ -13,6 +13,7 @@ import (
 	"path"
 	"strings"
 	"sync"
+	"log"
 )
 
 const (
@@ -212,12 +213,13 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 	if err != nil {
 		return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
 	}
-	if strings.Contains(relativeURL, "firewall/zone") {
-		c.apiPath = c.apiV2Path
-	}
 	if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
+	        if strings.Contains(relativeURL, "firewall/zone") {
+		     reqURL.Path = path.Join(c.apiV2Path, reqURL.Path)
+		} else {
 		     reqURL.Path = path.Join(c.apiPath, reqURL.Path)
 		}
+	}
 
 	url := c.baseURL.ResolveReference(reqURL)
 	req, err := http.NewRequestWithContext(ctx, method, url.String(), reqReader)
@@ -273,6 +275,8 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 
 	// TODO: check rc in addition to status code?
        
+	log.Printf("%+v", respBody)
+	log.Printf("%+v", resp.Body)
 	err = json.NewDecoder(resp.Body).Decode(respBody)
 	if err != nil {
 		return fmt.Errorf("unable to decode body: %s %s %w", method, relativeURL, err)