add uuid service support

errors/panos.go

@@ -5,8 +5,6 @@ import (
 	stderr "errors"
 	"fmt"
 	"strings"
-
-	"github.com/PaloAltoNetworks/pango/util"
 )
 
 var InvalidFilterError = stderr.New("filter is improperly formatted")
@@ -67,8 +65,12 @@ type errorCheck struct {
 }
 
 type errorCheckMsg struct {
-	Line    []util.CdataText `xml:"line"`
-	Message string           `xml:",chardata"`
+	Line    []errLine `xml:"line"`
+	Message string    `xml:",chardata"`
+}
+
+type errLine struct {
+	Text string `xml:",cdata"`
 }
 
 func (e *errorCheck) Failed() bool {

filtering/parse.go

@@ -9,12 +9,12 @@ import (
 )
 
 func Parse(s string, quote string) (*Group, error) {
-	if len(quote) != 1 {
+	if s == "" {
+		return nil, nil
+	} else if len(quote) != 1 {
 		return nil, fmt.Errorf("quote character should be one character")
 	} else if quote == "&" || quote == "|" || quote == "(" || quote == ")" || quote == " " || quote == `\` || quote == "!" || quote == "." || quote == "<" || quote == ">" || quote == "=" || quote == "-" || quote == "_" {
 		return nil, fmt.Errorf("quote character cannot be a reserved character")
-	} else if s == "" {
-		return nil, nil
 	}
 
 	var ch rune

objects/address/entry.go

@@ -136,27 +136,27 @@ func SpecMatches(a, b *Entry) bool {
 
 	// Don't compare Name.
 
-	if !util.OptionalStringsMatch(a.Description, b.Description) {
+	if !util.StringsMatch(a.Description, b.Description) {
 		return false
 	}
 
 	if !util.OrderedListsMatch(a.Tags, b.Tags) {
 		return false
 	}
 
-	if !util.OptionalStringsMatch(a.IpNetmask, b.IpNetmask) {
+	if !util.StringsMatch(a.IpNetmask, b.IpNetmask) {
 		return false
 	}
 
-	if !util.OptionalStringsMatch(a.IpRange, b.IpRange) {
+	if !util.StringsMatch(a.IpRange, b.IpRange) {
 		return false
 	}
 
-	if !util.OptionalStringsMatch(a.Fqdn, b.Fqdn) {
+	if !util.StringsMatch(a.Fqdn, b.Fqdn) {
 		return false
 	}
 
-	if !util.OptionalStringsMatch(a.IpWildcard, b.IpWildcard) {
+	if !util.StringsMatch(a.IpWildcard, b.IpWildcard) {
 		return false
 	}