Merge

unifi/firewall_zone.go

@@ -14,9 +14,9 @@ type FirewallZone struct {
 	// NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
 	Name        string   `json:"name"`
-	Description string   `json:"desc"`
 	DefaultZone bool     `json:default_zone,omitempty`
 	NetworkIDs  []string `json:network_ids,omitempty`
+	ZoneKey     string   `json:"zone_key,omitempty"`
 
 	// Role string `json:"role"`
 }

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)