Skip to content

Commit

Permalink
Add support for ULID string format (#80)
Browse files Browse the repository at this point in the history
More details about format:
  https://github.com/ulid/spec

It uses binary underlying implementation:
  https://github.com/oklog/ulid

Signed-off-by: Ilya Pavlov <[email protected]>
  • Loading branch information
elipavlov authored Feb 24, 2021
1 parent a4e46ea commit f0ca575
Show file tree
Hide file tree
Showing 9 changed files with 657 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ It also provides convenient extensions to go-openapi users.
- ssn
- uuid, uuid3, uuid4, uuid5
- cidr (e.g. "192.0.2.1/24", "2001:db8:a0b:12f0::1/32")
- ulid (e.g. "00000PP9HGSBSSDZ1JTEXBJ0PW", [spec](https://github.com/ulid/spec))

> NOTE: as the name stands for, this package is intended to support string formatting only.
> It does not provide validation for numerical values with swagger format extension for JSON types "number" or
Expand Down Expand Up @@ -84,3 +85,4 @@ List of defined types:
- UUID3
- UUID4
- UUID5
- [ULID](https://github.com/ulid/spec)
18 changes: 18 additions & 0 deletions conv/ulid.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package conv

import "github.com/go-openapi/strfmt"

// ULID returns a pointer to of the ULID value passed in.
func ULID(v strfmt.ULID) *strfmt.ULID {
return &v
}

// ULIDValue returns the value of the ULID pointer passed in or
// the default value if the pointer is nil.
func ULIDValue(v *strfmt.ULID) strfmt.ULID {
if v == nil {
return strfmt.ULID{}
}

return *v
}
22 changes: 22 additions & 0 deletions conv/ulid_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package conv

import (
"testing"

"github.com/go-openapi/strfmt"
"github.com/stretchr/testify/assert"
)

const testUlid = string("01EYXZVGBHG26MFTG4JWR4K558")

func TestULIDValue(t *testing.T) {
assert.Equal(t, strfmt.ULID{}, ULIDValue(nil))

value := strfmt.ULID{}
err := value.UnmarshalText([]byte(testUlid))
assert.NoError(t, err)
assert.Equal(t, value, ULIDValue(&value))

ulidRef := ULID(value)
assert.Equal(t, &value, ulidRef)
}
6 changes: 6 additions & 0 deletions format.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ func (f *defaultFormats) MapStructureHookFunc() mapstructure.DecodeHookFunc {
return Base64(data.(string)), nil
case "password":
return Password(data.(string)), nil
case "ulid":
ulid, err := ParseULID(data.(string))
if err != nil {
return nil, err
}
return ulid, nil
default:
return nil, errors.InvalidTypeName(v.Name)
}
Expand Down
43 changes: 43 additions & 0 deletions format_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ type testStruct struct {
Rgbcolor RGBColor `json:"rgbcolor,omitempty"`
B64 Base64 `json:"b64,omitempty"`
Pw Password `json:"pw,omitempty"`
ULID ULID `json:"ulid,omitempty"`
}

func TestDecodeHook(t *testing.T) {
Expand Down Expand Up @@ -179,11 +180,13 @@ func TestDecodeHook(t *testing.T) {
"ssn": "111-11-1111",
"creditcard": "4111-1111-1111-1111",
"b64": "ZWxpemFiZXRocG9zZXk=",
"ulid": "7ZZZZZZZZZZZZZZZZZZZZZZZZZ",
}

date, _ := time.Parse(RFC3339FullDate, "2014-12-15")
dur, _ := ParseDuration("5s")
dt, _ := ParseDateTime("2012-03-02T15:06:05.999999999Z")
ulid, _ := ParseULID("7ZZZZZZZZZZZZZZZZZZZZZZZZZ")

exp := &testStruct{
D: Date(date),
Expand All @@ -209,6 +212,7 @@ func TestDecodeHook(t *testing.T) {
Rgbcolor: RGBColor("rgb(255,255,255)"),
B64: Base64("ZWxpemFiZXRocG9zZXk="),
Pw: Password("super secret stuff here"),
ULID: ulid,
}

test := new(testStruct)
Expand Down Expand Up @@ -261,3 +265,42 @@ func TestDecodeDateTimeHook(t *testing.T) {
})
}
}

func TestDecode_ULID_Hook_Negative(t *testing.T) {
t.Parallel()
testCases := []struct {
Name string
Input string
}{
{
"empty string for ulid",
"",
},
{
"invalid non empty ulid",
"8000000000YYYYYYYYYYYYYYYY",
},
}
registry := NewFormats()
type layout struct {
ULID *ULID `json:"ulid,omitempty"`
}
for i := range testCases {
tc := testCases[i]
t.Run(tc.Name, func(t *testing.T) {
t.Parallel()
test := new(layout)
cfg := &mapstructure.DecoderConfig{
DecodeHook: registry.MapStructureHookFunc(),
WeaklyTypedInput: false,
Result: test,
}
d, err := mapstructure.NewDecoder(cfg)
assert.NoError(t, err)
input := make(map[string]interface{})
input["ulid"] = tc.Input
err = d.Decode(input)
assert.Error(t, err, "error expected got none")
})
}
}
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ require (
github.com/go-openapi/errors v0.19.8
github.com/google/uuid v1.1.1
github.com/mitchellh/mapstructure v1.3.3
github.com/oklog/ulid v1.3.1
github.com/stretchr/testify v1.6.1
go.mongodb.org/mongo-driver v1.4.3
)
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
221 changes: 221 additions & 0 deletions ulid.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
package strfmt

import (
cryptorand "crypto/rand"
"database/sql/driver"
"encoding/json"
"errors"
"fmt"
"io"
"sync"

"github.com/oklog/ulid"
"go.mongodb.org/mongo-driver/bson"
)

// ULID represents a ulid string format
// ref:
// https://github.com/ulid/spec
// impl:
// https://github.com/oklog/ulid
//
// swagger:strfmt ulid
type ULID struct {
ulid.ULID
}

var (
ulidEntropyPool = sync.Pool{
New: func() interface{} {
return cryptorand.Reader
},
}

ULIDScanDefaultFunc = func(raw interface{}) (ULID, error) {
var u ULID = NewULIDZero()
switch x := raw.(type) {
case nil:
// zerp ulid
return u, nil
case string:
if x == "" {
// zero ulid
return u, nil
}
return u, u.UnmarshalText([]byte(x))
case []byte:
return u, u.UnmarshalText(x)
}

return u, fmt.Errorf("cannot sql.Scan() strfmt.ULID from: %#v: %w", raw, ulid.ErrScanValue)
}

// ULIDScanOverrideFunc allows you to override the Scan method of the ULID type
ULIDScanOverrideFunc = ULIDScanDefaultFunc

ULIDValueDefaultFunc = func(u ULID) (driver.Value, error) {
return driver.Value(u.String()), nil
}

// ULIDValueOverrideFunc allows you to override the Value method of the ULID type
ULIDValueOverrideFunc = ULIDValueDefaultFunc
)

func init() {
// register formats in the default registry:
// - ulid
ulid := ULID{}
Default.Add("ulid", &ulid, IsULID)
}

// IsULID checks if provided string is ULID format
// Be noticed that this function considers overflowed ULID as non-ulid.
// For more details see https://github.com/ulid/spec
func IsULID(str string) bool {
_, err := ulid.ParseStrict(str)
return err == nil
}

// ParseULID parses a string that represents an valid ULID
func ParseULID(str string) (ULID, error) {
var u ULID

return u, u.UnmarshalText([]byte(str))
}

// NewULIDZero returns a zero valued ULID type
func NewULIDZero() ULID {
return ULID{}
}

// NewULID generates new unique ULID value and a error if any
func NewULID() (u ULID, err error) {
entropy := ulidEntropyPool.Get().(io.Reader)

id, err := ulid.New(ulid.Now(), entropy)
if err != nil {
return u, err
}
ulidEntropyPool.Put(entropy)

u.ULID = id
return u, nil
}

// GetULID returns underlying instance of ULID
func (u *ULID) GetULID() interface{} {
return u.ULID
}

// MarshalText returns this instance into text
func (u ULID) MarshalText() ([]byte, error) {
return u.ULID.MarshalText()
}

// UnmarshalText hydrates this instance from text
func (u *ULID) UnmarshalText(data []byte) error { // validation is performed later on
return u.ULID.UnmarshalText(data)
}

// Scan reads a value from a database driver
func (u *ULID) Scan(raw interface{}) error {
ul, err := ULIDScanOverrideFunc(raw)
if err == nil {
*u = ul
}
return err
}

// Value converts a value to a database driver value
func (u ULID) Value() (driver.Value, error) {
return ULIDValueOverrideFunc(u)
}

func (u ULID) String() string {
return u.ULID.String()
}

// MarshalJSON returns the ULID as JSON
func (u ULID) MarshalJSON() ([]byte, error) {
return json.Marshal(u.String())
}

// UnmarshalJSON sets the ULID from JSON
func (u *ULID) UnmarshalJSON(data []byte) error {
if string(data) == jsonNull {
return nil
}
var ustr string
if err := json.Unmarshal(data, &ustr); err != nil {
return err
}
id, err := ulid.ParseStrict(ustr)
if err != nil {
return fmt.Errorf("couldn't parse JSON value as ULID: %w", err)
}
u.ULID = id
return nil
}

// MarshalBSON document from this value
func (u ULID) MarshalBSON() ([]byte, error) {
return bson.Marshal(bson.M{"data": u.String()})
}

// UnmarshalBSON document into this value
func (u *ULID) UnmarshalBSON(data []byte) error {
var m bson.M
if err := bson.Unmarshal(data, &m); err != nil {
return err
}

if ud, ok := m["data"].(string); ok {
id, err := ulid.ParseStrict(ud)
if err != nil {
return fmt.Errorf("couldn't parse bson bytes as ULID: %w", err)
}
u.ULID = id
return nil
}
return errors.New("couldn't unmarshal bson bytes as ULID")
}

// DeepCopyInto copies the receiver and writes its value into out.
func (u *ULID) DeepCopyInto(out *ULID) {
*out = *u
}

// DeepCopy copies the receiver into a new ULID.
func (u *ULID) DeepCopy() *ULID {
if u == nil {
return nil
}
out := new(ULID)
u.DeepCopyInto(out)
return out
}

// GobEncode implements the gob.GobEncoder interface.
func (u ULID) GobEncode() ([]byte, error) {
return u.ULID.MarshalBinary()
}

// GobDecode implements the gob.GobDecoder interface.
func (u *ULID) GobDecode(data []byte) error {
return u.ULID.UnmarshalBinary(data)
}

// MarshalBinary implements the encoding.BinaryMarshaler interface.
func (u ULID) MarshalBinary() ([]byte, error) {
return u.ULID.MarshalBinary()
}

// UnmarshalBinary implements the encoding.BinaryUnmarshaler interface.
func (u *ULID) UnmarshalBinary(data []byte) error {
return u.ULID.UnmarshalBinary(data)
}

// Equal checks if two ULID instances are equal by their underlying type
func (u ULID) Equal(other ULID) bool {
return u.ULID == other.ULID
}
Loading

0 comments on commit f0ca575

Please sign in to comment.