Merge

fix

unifi/firewall_zone.go

@@ -0,0 +1,51 @@
+package unifi
+
+import (
+	"context"
+	"fmt"
+)
+
+type FirewallZone struct {
+	ID string `json:"_id,omitempty"`
+
+	// Hidden   bool   `json:"attr_hidden,omitempty"`
+	// HiddenID string `json:"attr_hidden_id,omitempty"`
+	// NoDelete bool   `json:"attr_no_delete,omitempty"`
+	// NoEdit   bool   `json:"attr_no_edit,omitempty"`
+
+	Name        string   `json:"name"`
+	DefaultZone bool     `json:default_zone,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 {
+		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
+}
+
+func (c *Client) GetFirewallZone(ctx context.Context, site, id string) (*FirewallZone, error) {
+	firewallzones, err := c.ListFirewallZones(ctx, site)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, z := range firewallzones {
+		if z.ID == id {
+			return &z, nil
+		}
+	}
+
+	return nil, &NotFoundError{}
+}

unifi/unifi.go

@@ -213,7 +213,11 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
 		return fmt.Errorf("unable to parse URL: %s %s %w", method, relativeURL, err)
 	}
 	if !strings.HasPrefix(relativeURL, "/") && !reqURL.IsAbs() {
-		reqURL.Path = path.Join(c.apiPath, reqURL.Path)
+	        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)