1 files changed, 65 insertions, 10 deletions

diff --git a/vendor/github.com/leodido/go-urn/urn.go b/vendor/github.com/leodido/go-urn/urn.go
index d51a6c915..894d6258d 100644
--- a/vendor/github.com/leodido/go-urn/urn.go
+++ b/vendor/github.com/leodido/go-urn/urn.go
@@ -16,10 +16,18 @@ const errInvalidURN = "invalid URN: %s"
 //
 // Details at https://tools.ietf.org/html/rfc2141.
 type URN struct {
-	prefix string // Static prefix. Equal to "urn" when empty.
-	ID     string // Namespace identifier
-	SS     string // Namespace specific string
-	norm   string // Normalized namespace specific string
+	prefix     string // Static prefix. Equal to "urn" when empty.
+	ID         string // Namespace identifier (NID)
+	SS         string // Namespace specific string (NSS)
+	norm       string // Normalized namespace specific string
+	kind       Kind
+	scim       *SCIM
+	rComponent string // RFC8141
+	qComponent string // RFC8141
+	fComponent string // RFC8141
+	rStart     bool   // RFC8141
+	qStart     bool   // RFC8141
+	tolower    []int
 }
 
 // Normalize turns the receiving URN into its norm version.
@@ -30,12 +38,21 @@ func (u *URN) Normalize() *URN {
 		prefix: "urn",
 		ID:     strings.ToLower(u.ID),
 		SS:     u.norm,
+		// rComponent: u.rComponent,
+		// qComponent: u.qComponent,
+		// fComponent: u.fComponent,
 	}
 }
 
 // Equal checks the lexical equivalence of the current URN with another one.
 func (u *URN) Equal(x *URN) bool {
-	return *u.Normalize() == *x.Normalize()
+	if x == nil {
+		return false
+	}
+	nu := u.Normalize()
+	nx := x.Normalize()
+
+	return nu.prefix == nx.prefix && nu.ID == nx.ID && nu.SS == nx.SS
 }
 
 // String reassembles the URN into a valid URN string.
@@ -51,14 +68,23 @@ func (u *URN) String() string {
 			res += "urn"
 		}
 		res += u.prefix + ":" + u.ID + ":" + u.SS
+		if u.rComponent != "" {
+			res += "?+" + u.rComponent
+		}
+		if u.qComponent != "" {
+			res += "?=" + u.qComponent
+		}
+		if u.fComponent != "" {
+			res += "#" + u.fComponent
+		}
 	}
 
 	return res
 }
 
-// Parse is responsible to create an URN instance from a byte array matching the correct URN syntax.
-func Parse(u []byte) (*URN, bool) {
-	urn, err := NewMachine().Parse(u)
+// Parse is responsible to create an URN instance from a byte array matching the correct URN syntax (RFC 2141).
+func Parse(u []byte, options ...Option) (*URN, bool) {
+	urn, err := NewMachine(options...).Parse(u)
 	if err != nil {
 		return nil, false
 	}
@@ -71,7 +97,7 @@ func (u URN) MarshalJSON() ([]byte, error) {
 	return json.Marshal(u.String())
 }
 
-// MarshalJSON unmarshals a URN from JSON string form (e.g. `"urn:oid:1.2.3.4"`).
+// UnmarshalJSON unmarshals a URN from JSON string form (e.g. `"urn:oid:1.2.3.4"`).
 func (u *URN) UnmarshalJSON(bytes []byte) error {
 	var str string
 	if err := json.Unmarshal(bytes, &str); err != nil {
@@ -82,5 +108,34 @@ func (u *URN) UnmarshalJSON(bytes []byte) error {
 	} else {
 		*u = *value
 	}
+
 	return nil
-}
\ No newline at end of file
+}
+
+func (u *URN) IsSCIM() bool {
+	return u.kind == RFC7643
+}
+
+func (u *URN) SCIM() *SCIM {
+	if u.kind != RFC7643 {
+		return nil
+	}
+
+	return u.scim
+}
+
+func (u *URN) RFC() Kind {
+	return u.kind
+}
+
+func (u *URN) FComponent() string {
+	return u.fComponent
+}
+
+func (u *URN) QComponent() string {
+	return u.qComponent
+}
+
+func (u *URN) RComponent() string {
+	return u.rComponent
+}