diff --git a/exerr/builder.go b/exerr/builder.go new file mode 100644 index 0000000..ab982fa --- /dev/null +++ b/exerr/builder.go @@ -0,0 +1,416 @@ +package exerr + +import ( + "bytes" + "encoding/json" + "fmt" + "github.com/rs/zerolog" + "go.mongodb.org/mongo-driver/bson/primitive" + "gogs.mikescher.com/BlackForestBytes/goext/langext" + "net/http" + "os" + "runtime/debug" + "strings" + "time" +) + +// +// ==== USAGE ===== +// +// If some method returns an error _always wrap it into an bmerror: +// value, err := do_something(..) +// if err != nil { +// return nil, bmerror.Wrap(err, "do something failed").Build() +// } +// +// If possible add metadata to the error (eg the id that was not found, ...), the methods are the same as in zerolog +// return nil, bmerror.Wrap(err, "do something failed").Str("someid", id).Int("count", in.Count).Build() +// +// You can change the errortype with `.User()` and `.System()` (User-errors are 400 and System-errors 500) +// You can also manually set the statuscode with `.WithStatuscode(http.NotFound)` +// You can set the type with `WithType(..)` +// +// New Errors (that don't wrap an existing err object) are created with New +// return nil, bmerror.New(bmerror.ErrInternal, "womethign wen horrible wrong").Build() +// You can eitehr use an existing ErrorType, the "catch-all" ErrInternal, or add you own ErrType in consts.go +// +// All errors should be handled one of the following four ways: +// - return the error to the caller and let him handle it: +// (also auto-prints the error to the log) +// => Wrap/New + Build +// - Print the error +// (also auto-sends it to the error-service) +// This is useful for errors that happen asynchron or are non-fatal for the current request +// => Wrap/New + Print +// - Return the error to the Rest-API caller +// (also auto-prints the error to the log) +// (also auto-sends it to the error-service) +// => Wrap/New + Output +// - Print and stop the service +// (also auto-sends it to the error-service) +// => Wrap/New + Fatal +// + +var stackSkipLogger zerolog.Logger + +func init() { + cw := zerolog.ConsoleWriter{ + Out: os.Stdout, + TimeFormat: "2006-01-02 15:04:05 Z07:00", + } + + multi := zerolog.MultiLevelWriter(cw) + stackSkipLogger = zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger() +} + +type Builder struct { + bmerror *bringmanError + + containsGinData bool +} + +func Get(err error) *Builder { + return &Builder{bmerror: fromError(err)} +} + +func New(t ErrorType, msg string) *Builder { + return &Builder{bmerror: newBringmanErr(CatSystem, t, msg)} +} + +func Wrap(err error, msg string) *Builder { + return &Builder{bmerror: fromError(err).wrap(msg, CatWrap, 1)} +} + +// ---------------------------------------------------------------------------- + +func (b *Builder) WithType(t ErrorType) *Builder { + b.bmerror.Type = t + return b +} + +func (b *Builder) WithStatuscode(status int) *Builder { + b.bmerror.StatusCode = status + return b +} + +func (b *Builder) WithMessage(msg string) *Builder { + b.bmerror.Message = msg + return b +} + +// ---------------------------------------------------------------------------- + +// Err changes the Severity to ERROR (default) +// The error will be: +// +// - On Build(): +// +// - Short-Logged as Err +// +// - On Print(): +// +// - Logged as Err +// +// - Send to the error-service +// +// - On Output(): +// +// - Logged as Err +// +// - Send to the error-service +func (b *Builder) Err() *Builder { + b.bmerror.Severity = SevErr + return b +} + +// Warn changes the Severity to WARN +// The error will be: +// +// - On Build(): +// +// - -(nothing)- +// +// - On Print(): +// +// - Short-Logged as Warn +// +// - On Output(): +// +// - Logged as Warn +func (b *Builder) Warn() *Builder { + b.bmerror.Severity = SevWarn + return b +} + +// Info changes the Severity to INFO +// The error will be: +// +// - On Build(): +// +// - -(nothing)- +// +// - On Print(): +// +// - -(nothing)- +// +// - On Output(): +// +// - -(nothing)- +func (b *Builder) Info() *Builder { + b.bmerror.Severity = SevInfo + return b +} + +// ---------------------------------------------------------------------------- + +// User sets the Category to CatUser +// +// Errors with category +func (b *Builder) User() *Builder { + b.bmerror.Category = CatUser + return b +} + +func (b *Builder) System() *Builder { + b.bmerror.Category = CatSystem + return b +} + +// ---------------------------------------------------------------------------- + +func (b *Builder) Id(key string, val fmt.Stringer) *Builder { + return b.addMeta(key, MDTID, newIDWrap(val)) +} + +func (b *Builder) StrPtr(key string, val *string) *Builder { + return b.addMeta(key, MDTStringPtr, val) +} + +func (b *Builder) Str(key string, val string) *Builder { + return b.addMeta(key, MDTString, val) +} + +func (b *Builder) Int(key string, val int) *Builder { + return b.addMeta(key, MDTInt, val) +} + +func (b *Builder) Int8(key string, val int8) *Builder { + return b.addMeta(key, MDTInt8, val) +} + +func (b *Builder) Int16(key string, val int16) *Builder { + return b.addMeta(key, MDTInt16, val) +} + +func (b *Builder) Int32(key string, val int32) *Builder { + return b.addMeta(key, MDTInt32, val) +} + +func (b *Builder) Int64(key string, val int64) *Builder { + return b.addMeta(key, MDTInt64, val) +} + +func (b *Builder) Float32(key string, val float32) *Builder { + return b.addMeta(key, MDTFloat32, val) +} + +func (b *Builder) Float64(key string, val float64) *Builder { + return b.addMeta(key, MDTFloat64, val) +} + +func (b *Builder) Bool(key string, val bool) *Builder { + return b.addMeta(key, MDTBool, val) +} + +func (b *Builder) Bytes(key string, val []byte) *Builder { + return b.addMeta(key, MDTBytes, val) +} + +func (b *Builder) ObjectID(key string, val primitive.ObjectID) *Builder { + return b.addMeta(key, MDTObjectID, val) +} + +func (b *Builder) Time(key string, val time.Time) *Builder { + return b.addMeta(key, MDTTime, val) +} + +func (b *Builder) Dur(key string, val time.Duration) *Builder { + return b.addMeta(key, MDTDuration, val) +} + +func (b *Builder) Strs(key string, val []string) *Builder { + return b.addMeta(key, MDTStringArray, val) +} + +func (b *Builder) Ints(key string, val []int) *Builder { + return b.addMeta(key, MDTIntArray, val) +} + +func (b *Builder) Ints32(key string, val []int32) *Builder { + return b.addMeta(key, MDTInt32Array, val) +} + +func (b *Builder) Type(key string, cls interface{}) *Builder { + return b.addMeta(key, MDTString, fmt.Sprintf("%T", cls)) +} + +func (b *Builder) Interface(key string, val interface{}) *Builder { + return b.addMeta(key, MDTAny, newAnyWrap(val)) +} + +func (b *Builder) Any(key string, val any) *Builder { + return b.addMeta(key, MDTAny, newAnyWrap(val)) +} + +func (b *Builder) Stack() *Builder { + return b.addMeta("@Stack", MDTString, string(debug.Stack())) +} + +func (b *Builder) Errs(key string, val []error) *Builder { + for i, valerr := range val { + b.addMeta(fmt.Sprintf("%v[%v]", key, i), MDTString, Get(valerr).toBMError().FormatLog(LogPrintFull)) + } + return b +} + +func (b *Builder) GinReq(ctx context.Context, g *gin.Context, req *http.Request) *Builder { + if v := ctx.Value("start_timestamp"); v != nil { + if t, ok := v.(time.Time); ok { + b.Time("ctx.startTimestamp", t) + b.Time("ctx.endTimestamp", time.Now()) + } + } + b.Str("gin.method", req.Method) + b.Str("gin.path", g.FullPath()) + b.Str("gin.header", formatHeader(g.Request.Header)) + if req.URL != nil { + b.Str("gin.url", req.URL.String()) + } + if ctxVal := g.GetString("apiversion"); ctxVal != "" { + b.Str("gin.context.apiversion", ctxVal) + } + if ctxVal := g.GetString("uid"); ctxVal != "" { + b.Str("gin.context.uid", ctxVal) + } + if ctxVal := g.GetString("fcmId"); ctxVal != "" { + b.Str("gin.context.fcmid", ctxVal) + } + if ctxVal := g.GetString("reqid"); ctxVal != "" { + b.Str("gin.context.reqid", ctxVal) + } + if req.Method != "GET" && req.Body != nil && req.Header.Get("Content-Type") == "application/json" { + if brc, ok := req.Body.(langext.BufferedReadCloser); ok { + if bin, err := brc.BufferedAll(); err == nil { + if len(bin) < 16*1024 { + var prettyJSON bytes.Buffer + err = json.Indent(&prettyJSON, bin, "", " ") + if err == nil { + b.Str("gin.body", string(prettyJSON.Bytes())) + } else { + b.Bytes("gin.body", bin) + } + } else { + b.Str("gin.body", fmt.Sprintf("[[%v bytes]]", len(bin))) + } + } + } + } + + b.containsGinData = true + return b +} + +func formatHeader(header map[string][]string) string { + ml := 1 + for k, _ := range header { + if len(k) > ml { + ml = len(k) + } + } + r := "" + for k, v := range header { + if r != "" { + r += "\n" + } + for _, hval := range v { + value := hval + value = strings.ReplaceAll(value, "\n", "\\n") + value = strings.ReplaceAll(value, "\r", "\\r") + value = strings.ReplaceAll(value, "\t", "\\t") + r += langext.StrPadRight(k, " ", ml) + " := " + value + } + } + return r +} + +// ---------------------------------------------------------------------------- + +// Build creates a new error, ready to pass up the stack +// If the errors is not SevWarn or SevInfo it gets also logged (in short form, without stacktrace) onto stdout +func (b *Builder) Build() error { + if b.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal { + b.bmerror.ShortLog(stackSkipLogger.Error()) + } + + b.CallListener(MethodBuild) + + return b.bmerror.ToGrpcError() +} + +// Output prints the error onto the gin stdout. +// The error also gets printed to stdout/stderr +// If the error is SevErr|SevFatal we also send it to the error-service +func (b *Builder) Output(ctx context.Context, g *gin.Context) { + if !b.containsGinData && g.Request != nil { + // Auto-Add gin metadata if the caller hasn't already done it + b.GinReq(ctx, g, g.Request) + } + + b.bmerror.Output(ctx, g) + + if b.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal { + b.bmerror.Log(stackSkipLogger.Error()) + } else if b.bmerror.Severity == SevWarn { + b.bmerror.Log(stackSkipLogger.Warn()) + } + + b.CallListener(MethodOutput) +} + +// Print prints the error +// If the error is SevErr we also send it to the error-service +func (b *Builder) Print() { + if b.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal { + b.bmerror.Log(stackSkipLogger.Error()) + } else if b.bmerror.Severity == SevWarn { + b.bmerror.ShortLog(stackSkipLogger.Warn()) + } + + b.CallListener(MethodPrint) +} + +func (b *Builder) Format(level LogPrintLevel) string { + return b.bmerror.FormatLog(level) +} + +// Fatal prints the error and terminates the program +// If the error is SevErr we also send it to the error-service +func (b *Builder) Fatal() { + b.bmerror.Severity = SevFatal + b.bmerror.Log(stackSkipLogger.WithLevel(zerolog.FatalLevel)) + + b.CallListener(MethodFatal) + + os.Exit(1) +} + +// ---------------------------------------------------------------------------- + +func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder { + b.bmerror.Meta.add(key, mdtype, val) + return b +} + +func (b *Builder) toBMError() BMError { + return b.bmerror.ToBMError() +} diff --git a/exerr/data.go b/exerr/data.go new file mode 100644 index 0000000..d4996fa --- /dev/null +++ b/exerr/data.go @@ -0,0 +1,32 @@ +package exerr + +type ErrorCategory struct{ Category string } + +var ( + CatWrap = ErrorCategory{"Wrap"} // The error is simply wrapping another error (e.g. when a grpc call returns an error) + CatSystem = ErrorCategory{"System"} // An internal system error (e.g. connection to db failed) + CatUser = ErrorCategory{"User"} // The user (the API caller) did something wrong (e.g. he has no permissions to do this) + CatForeign = ErrorCategory{"Foreign"} // A foreign error that some component threw (e.g. an unknown mongodb error), happens if we call Wrap(..) on an non-bmerror value +) + +var AllCategories = []ErrorCategory{CatWrap, CatSystem, CatUser, CatForeign} + +type ErrorSeverity struct{ Severity string } + +var ( + SevTrace = ErrorSeverity{"Trace"} + SevDebug = ErrorSeverity{"Debug"} + SevInfo = ErrorSeverity{"Info"} + SevWarn = ErrorSeverity{"Warn"} + SevErr = ErrorSeverity{"Err"} + SevFatal = ErrorSeverity{"Fatal"} +) + +var AllSeverities = []ErrorSeverity{SevTrace, SevDebug, SevInfo, SevWarn, SevErr, SevFatal} + +type ErrorType struct{ Key string } + +var ( + TypeInternal = ErrorType{"Internal"} + // other values come from pkgconfig +) diff --git a/exerr/errinit.go b/exerr/errinit.go new file mode 100644 index 0000000..8330d25 --- /dev/null +++ b/exerr/errinit.go @@ -0,0 +1,50 @@ +package exerr + +type ErrorPackageConfig struct { + ZeroLogTraces bool // autom print zerolog logs on CreateError + RecursiveErrors bool // errors contains their Origin-Error + Types []ErrorType // all available error-types +} + +type ErrorPackageConfigInit struct { + LogTraces bool + RecursiveErrors bool + InitTypes func(_ func(_ string) ErrorType) +} + +var initialized = false + +var pkgconfig = ErrorPackageConfig{ + ZeroLogTraces: true, + RecursiveErrors: true, + Types: []ErrorType{TypeInternal}, +} + +// Init initializes the exerr packages +// Must be called at the program start, before (!) any errors +// Is not thread-safe +func Init(cfg ErrorPackageConfigInit) { + if initialized { + panic("Cannot re-init error package") + } + + types := pkgconfig.Types + + fnAddType := func(v string) ErrorType { + et := ErrorType{v} + types = append(types, et) + return et + } + + if cfg.InitTypes != nil { + cfg.InitTypes(fnAddType) + } + + pkgconfig = ErrorPackageConfig{ + ZeroLogTraces: cfg.LogTraces, + RecursiveErrors: cfg.RecursiveErrors, + Types: types, + } + + initialized = true +} diff --git a/exerr/exerr.go b/exerr/exerr.go new file mode 100644 index 0000000..bc3e832 --- /dev/null +++ b/exerr/exerr.go @@ -0,0 +1,33 @@ +package exerr + +import ( + "time" +) + +type ExErr struct { + UniqueID string `json:"uniqueID"` + + Timestamp time.Time `json:"timestamp"` + Category ErrorCategory `json:"category"` + Severity ErrorSeverity `json:"severity"` + Type ErrorType `json:"type"` + + Message string `json:"message"` + Caller string `json:"caller"` + + OriginalError *ExErr + + Meta MetaMap `json:"meta"` +} + +func (ee ExErr) Error() string { + +} + +func (ee ExErr) Unwrap() error { + +} + +func (ee ExErr) Is(err error) bool { + +} diff --git a/exerr/listener.go b/exerr/listener.go new file mode 100644 index 0000000..b996be4 --- /dev/null +++ b/exerr/listener.go @@ -0,0 +1,37 @@ +package exerr + +import ( + "sync" +) + +type Method string + +const ( + MethodOutput Method = "OUTPUT" + MethodPrint Method = "PRINT" + MethodBuild Method = "BUILD" + MethodFatal Method = "FATAL" +) + +type Listener = func(method Method, v ExErr) + +var listenerLock = sync.Mutex{} +var listener = make([]Listener, 0) + +func RegisterListener(l Listener) { + listenerLock.Lock() + defer listenerLock.Unlock() + + listener = append(listener, l) +} + +func (b *Builder) CallListener(m Method) { + valErr := b.toBMError() + + listenerLock.Lock() + defer listenerLock.Unlock() + + for _, v := range listener { + v(m, valErr) + } +} diff --git a/exerr/meta.go b/exerr/meta.go new file mode 100644 index 0000000..2eee44c --- /dev/null +++ b/exerr/meta.go @@ -0,0 +1,697 @@ +package exerr + +import ( + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + "gogs.mikescher.com/BlackForestBytes/goext/langext" + "strconv" + "strings" + "time" +) + +type MetaMap map[string]MetaValue + +type metaDataType string + +const ( + MDTString metaDataType = "String" + MDTStringPtr metaDataType = "StringPtr" + MDTInt metaDataType = "Int" + MDTInt8 metaDataType = "Int8" + MDTInt16 metaDataType = "Int16" + MDTInt32 metaDataType = "Int32" + MDTInt64 metaDataType = "Int64" + MDTFloat32 metaDataType = "Float32" + MDTFloat64 metaDataType = "Float64" + MDTBool metaDataType = "Bool" + MDTBytes metaDataType = "Bytes" + MDTObjectID metaDataType = "ObjectID" + MDTTime metaDataType = "Time" + MDTDuration metaDataType = "Duration" + MDTStringArray metaDataType = "StringArr" + MDTIntArray metaDataType = "IntArr" + MDTInt32Array metaDataType = "Int32Arr" + MDTID metaDataType = "ID" + MDTAny metaDataType = "Interface" + MDTNil metaDataType = "Nil" +) + +type MetaValue struct { + DataType metaDataType `json:"dataType"` + Value interface{} `json:"value"` +} + +type metaValueSerialization struct { + DataType metaDataType `bson:"dataType"` + Value string `bson:"value"` + Raw interface{} `bson:"raw"` +} + +func (v MetaValue) SerializeValue() (string, error) { + switch v.DataType { + case MDTString: + return v.Value.(string), nil + case MDTID: + return v.Value.(IDWrap).Serialize(), nil + case MDTAny: + return v.Value.(AnyWrap).Serialize(), nil + case MDTStringPtr: + if langext.IsNil(v.Value) { + return "#", nil + } + r := v.Value.(*string) + if r != nil { + return "*" + *r, nil + } else { + return "#", nil + } + case MDTInt: + return strconv.Itoa(v.Value.(int)), nil + case MDTInt8: + return strconv.FormatInt(int64(v.Value.(int8)), 10), nil + case MDTInt16: + return strconv.FormatInt(int64(v.Value.(int16)), 10), nil + case MDTInt32: + return strconv.FormatInt(int64(v.Value.(int32)), 10), nil + case MDTInt64: + return strconv.FormatInt(v.Value.(int64), 10), nil + case MDTFloat32: + return strconv.FormatFloat(float64(v.Value.(float32)), 'X', -1, 32), nil + case MDTFloat64: + return strconv.FormatFloat(v.Value.(float64), 'X', -1, 64), nil + case MDTBool: + if v.Value.(bool) { + return "true", nil + } else { + return "false", nil + } + case MDTBytes: + return hex.EncodeToString(v.Value.([]byte)), nil + case MDTObjectID: + return v.Value.(primitive.ObjectID).Hex(), nil + case MDTTime: + return strconv.FormatInt(v.Value.(time.Time).Unix(), 10) + "|" + strconv.FormatInt(int64(v.Value.(time.Time).Nanosecond()), 10), nil + case MDTDuration: + return v.Value.(time.Duration).String(), nil + case MDTStringArray: + if langext.IsNil(v.Value) { + return "#", nil + } + r, err := json.Marshal(v.Value.([]string)) + if err != nil { + return "", err + } + return string(r), nil + case MDTIntArray: + if langext.IsNil(v.Value) { + return "#", nil + } + r, err := json.Marshal(v.Value.([]int)) + if err != nil { + return "", err + } + return string(r), nil + case MDTInt32Array: + if langext.IsNil(v.Value) { + return "#", nil + } + r, err := json.Marshal(v.Value.([]int32)) + if err != nil { + return "", err + } + return string(r), nil + case MDTNil: + return "", nil + } + return "", errors.New("Unknown type: " + string(v.DataType)) +} + +func (v MetaValue) ShortString(lim int) string { + switch v.DataType { + case MDTString: + r := strings.ReplaceAll(v.Value.(string), "\r", "") + r = strings.ReplaceAll(r, "\n", "\\n") + r = strings.ReplaceAll(r, "\t", "\\t") + return langext.StrLimit(r, lim, "...") + case MDTID: + return v.Value.(IDWrap).String() + case MDTAny: + return v.Value.(AnyWrap).String() + case MDTStringPtr: + if langext.IsNil(v.Value) { + return "<>" + } + r := langext.CoalesceString(v.Value.(*string), "<>") + r = strings.ReplaceAll(r, "\r", "") + r = strings.ReplaceAll(r, "\n", "\\n") + r = strings.ReplaceAll(r, "\t", "\\t") + return langext.StrLimit(r, lim, "...") + case MDTInt: + return strconv.Itoa(v.Value.(int)) + case MDTInt8: + return strconv.FormatInt(int64(v.Value.(int8)), 10) + case MDTInt16: + return strconv.FormatInt(int64(v.Value.(int16)), 10) + case MDTInt32: + return strconv.FormatInt(int64(v.Value.(int32)), 10) + case MDTInt64: + return strconv.FormatInt(v.Value.(int64), 10) + case MDTFloat32: + return strconv.FormatFloat(float64(v.Value.(float32)), 'g', 4, 32) + case MDTFloat64: + return strconv.FormatFloat(v.Value.(float64), 'g', 4, 64) + case MDTBool: + return fmt.Sprintf("%v", v.Value.(bool)) + case MDTBytes: + return langext.StrLimit(hex.EncodeToString(v.Value.([]byte)), lim, "...") + case MDTObjectID: + return v.Value.(primitive.ObjectID).Hex() + case MDTTime: + return v.Value.(time.Time).Format(time.RFC3339) + case MDTDuration: + return v.Value.(time.Duration).String() + case MDTStringArray: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.Marshal(v.Value.([]string)) + if err != nil { + return "(err)" + } + return langext.StrLimit(string(r), lim, "...") + case MDTIntArray: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.Marshal(v.Value.([]int)) + if err != nil { + return "(err)" + } + return langext.StrLimit(string(r), lim, "...") + case MDTInt32Array: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.Marshal(v.Value.([]int32)) + if err != nil { + return "(err)" + } + return langext.StrLimit(string(r), lim, "...") + case MDTNil: + return "<>" + } + return "(err)" +} + +func (v MetaValue) Apply(key string, evt *zerolog.Event) *zerolog.Event { + switch v.DataType { + case MDTString: + return evt.Str(key, v.Value.(string)) + case MDTID: + return evt.Str(key, v.Value.(IDWrap).Value) + case MDTAny: + if v.Value.(AnyWrap).IsError { + return evt.Str(key, "(err)") + } else { + return evt.Str(key, v.Value.(AnyWrap).Json) + } + case MDTStringPtr: + if langext.IsNil(v.Value) { + return evt.Str(key, "<>") + } + return evt.Str(key, langext.CoalesceString(v.Value.(*string), "<>")) + case MDTInt: + return evt.Int(key, v.Value.(int)) + case MDTInt8: + return evt.Int8(key, v.Value.(int8)) + case MDTInt16: + return evt.Int16(key, v.Value.(int16)) + case MDTInt32: + return evt.Int32(key, v.Value.(int32)) + case MDTInt64: + return evt.Int64(key, v.Value.(int64)) + case MDTFloat32: + return evt.Float32(key, v.Value.(float32)) + case MDTFloat64: + return evt.Float64(key, v.Value.(float64)) + case MDTBool: + return evt.Bool(key, v.Value.(bool)) + case MDTBytes: + return evt.Bytes(key, v.Value.([]byte)) + case MDTObjectID: + return evt.Str(key, v.Value.(primitive.ObjectID).Hex()) + case MDTTime: + return evt.Time(key, v.Value.(time.Time)) + case MDTDuration: + return evt.Dur(key, v.Value.(time.Duration)) + case MDTStringArray: + if langext.IsNil(v.Value) { + return evt.Strs(key, nil) + } + return evt.Strs(key, v.Value.([]string)) + case MDTIntArray: + if langext.IsNil(v.Value) { + return evt.Ints(key, nil) + } + return evt.Ints(key, v.Value.([]int)) + case MDTInt32Array: + if langext.IsNil(v.Value) { + return evt.Ints32(key, nil) + } + return evt.Ints32(key, v.Value.([]int32)) + case MDTNil: + return evt.Str(key, "<>") + } + return evt.Str(key, "(err)") +} + +func (v MetaValue) MarshalJSON() ([]byte, error) { + str, err := v.SerializeValue() + if err != nil { + return nil, err + } + return json.Marshal(string(v.DataType) + ":" + str) +} + +func (v *MetaValue) UnmarshalJSON(data []byte) error { + var str = "" + err := json.Unmarshal(data, &str) + if err != nil { + return err + } + + split := strings.SplitN(str, ":", 2) + if len(split) != 2 { + return errors.New("failed to decode MetaValue: '" + str + "'") + } + + return v.Deserialize(split[1], metaDataType(split[0])) +} + +func (v MetaValue) MarshalBSON() ([]byte, error) { + serval, err := v.SerializeValue() + if err != nil { + return nil, Wrap(err, "failed to bson-marshal MetaValue (serialize)").Build() + } + + // this is an kinda ugly hack - but serialization to mongodb and back can loose the correct type information.... + bin, err := bson.Marshal(metaValueSerialization{ + DataType: v.DataType, + Value: serval, + Raw: v.Value, + }) + if err != nil { + return nil, Wrap(err, "failed to bson-marshal MetaValue (marshal)").Build() + } + + return bin, nil +} + +func (v *MetaValue) UnmarshalBSON(bytes []byte) error { + var serval metaValueSerialization + err := bson.Unmarshal(bytes, &serval) + if err != nil { + return Wrap(err, "failed to bson-unmarshal MetaValue (unmarshal)").Build() + } + + err = v.Deserialize(serval.Value, serval.DataType) + if err != nil { + return Wrap(err, "failed to deserialize MetaValue from bson").Str("raw", serval.Value).Build() + } + + return nil +} + +func (v *MetaValue) Deserialize(value string, datatype metaDataType) error { + switch datatype { + case MDTString: + v.Value = value + v.DataType = datatype + return nil + case MDTID: + v.Value = deserializeIDWrap(value) + v.DataType = datatype + return nil + case MDTAny: + v.Value = deserializeAnyWrap(value) + v.DataType = datatype + return nil + case MDTStringPtr: + if len(value) <= 0 || (value[0] != '*' && value[0] != '#') { + return errors.New("Invalid StringPtr: " + value) + } else if value == "#" { + v.Value = nil + v.DataType = datatype + return nil + } else { + r, err := valueFromProto(value[1:], MDTString) + if err != nil { + return err + } + v.Value = langext.Ptr(r.Value.(string)) + v.DataType = datatype + return nil + } + case MDTInt: + pv, err := strconv.ParseInt(value, 10, 0) + if err != nil { + return err + } + v.Value = int(pv) + v.DataType = datatype + return nil + case MDTInt8: + pv, err := strconv.ParseInt(value, 10, 8) + if err != nil { + return err + } + v.Value = int8(pv) + v.DataType = datatype + return nil + case MDTInt16: + pv, err := strconv.ParseInt(value, 10, 16) + if err != nil { + return err + } + v.Value = int16(pv) + v.DataType = datatype + return nil + case MDTInt32: + pv, err := strconv.ParseInt(value, 10, 32) + if err != nil { + return err + } + v.Value = int32(pv) + v.DataType = datatype + return nil + case MDTInt64: + pv, err := strconv.ParseInt(value, 10, 64) + if err != nil { + return err + } + v.Value = pv + v.DataType = datatype + return nil + case MDTFloat32: + pv, err := strconv.ParseFloat(value, 64) + if err != nil { + return err + } + v.Value = float32(pv) + v.DataType = datatype + return nil + case MDTFloat64: + pv, err := strconv.ParseFloat(value, 64) + if err != nil { + return err + } + v.Value = pv + v.DataType = datatype + return nil + case MDTBool: + if value == "true" { + v.Value = true + v.DataType = datatype + return nil + } + if value == "false" { + v.Value = false + v.DataType = datatype + return nil + } + return errors.New("invalid bool value: " + value) + case MDTBytes: + r, err := hex.DecodeString(value) + if err != nil { + return err + } + v.Value = r + v.DataType = datatype + return nil + case MDTObjectID: + r, err := primitive.ObjectIDFromHex(value) + if err != nil { + return err + } + v.Value = r + v.DataType = datatype + return nil + case MDTTime: + ps := strings.Split(value, "|") + if len(ps) != 2 { + return errors.New("invalid time.time: " + value) + } + p1, err := strconv.ParseInt(ps[0], 10, 64) + if err != nil { + return err + } + p2, err := strconv.ParseInt(ps[1], 10, 32) + if err != nil { + return err + } + v.Value = time.Unix(p1, p2) + v.DataType = datatype + return nil + case MDTDuration: + r, err := time.ParseDuration(value) + if err != nil { + return err + } + v.Value = r + v.DataType = datatype + return nil + case MDTStringArray: + if value == "#" { + v.Value = nil + v.DataType = datatype + return nil + } + pj := make([]string, 0) + err := json.Unmarshal([]byte(value), &pj) + if err != nil { + return err + } + v.Value = pj + v.DataType = datatype + return nil + case MDTIntArray: + if value == "#" { + v.Value = nil + v.DataType = datatype + return nil + } + pj := make([]int, 0) + err := json.Unmarshal([]byte(value), &pj) + if err != nil { + return err + } + v.Value = pj + v.DataType = datatype + return nil + case MDTInt32Array: + if value == "#" { + v.Value = nil + v.DataType = datatype + return nil + } + pj := make([]int32, 0) + err := json.Unmarshal([]byte(value), &pj) + if err != nil { + return err + } + v.Value = pj + v.DataType = datatype + return nil + case MDTNil: + v.Value = nil + v.DataType = datatype + return nil + } + return errors.New("Unknown type: " + string(datatype)) +} + +func (v MetaValue) ValueString() string { + switch v.DataType { + case MDTString: + return v.Value.(string) + case MDTID: + return v.Value.(IDWrap).String() + case MDTAny: + return v.Value.(AnyWrap).String() + case MDTStringPtr: + if langext.IsNil(v.Value) { + return "<>" + } + return langext.CoalesceString(v.Value.(*string), "<>") + case MDTInt: + return strconv.Itoa(v.Value.(int)) + case MDTInt8: + return strconv.FormatInt(int64(v.Value.(int8)), 10) + case MDTInt16: + return strconv.FormatInt(int64(v.Value.(int16)), 10) + case MDTInt32: + return strconv.FormatInt(int64(v.Value.(int32)), 10) + case MDTInt64: + return strconv.FormatInt(v.Value.(int64), 10) + case MDTFloat32: + return strconv.FormatFloat(float64(v.Value.(float32)), 'g', 4, 32) + case MDTFloat64: + return strconv.FormatFloat(v.Value.(float64), 'g', 4, 64) + case MDTBool: + return fmt.Sprintf("%v", v.Value.(bool)) + case MDTBytes: + return hex.EncodeToString(v.Value.([]byte)) + case MDTObjectID: + return v.Value.(primitive.ObjectID).Hex() + case MDTTime: + return v.Value.(time.Time).Format(time.RFC3339Nano) + case MDTDuration: + return v.Value.(time.Duration).String() + case MDTStringArray: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.MarshalIndent(v.Value.([]string), "", " ") + if err != nil { + return "(err)" + } + return string(r) + case MDTIntArray: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.MarshalIndent(v.Value.([]int), "", " ") + if err != nil { + return "(err)" + } + return string(r) + case MDTInt32Array: + if langext.IsNil(v.Value) { + return "<>" + } + r, err := json.MarshalIndent(v.Value.([]int32), "", " ") + if err != nil { + return "(err)" + } + return string(r) + case MDTNil: + return "<>" + } + return "(err)" +} + +func valueFromProto(value string, datatype metaDataType) (MetaValue, error) { + obj := MetaValue{} + err := obj.Deserialize(value, datatype) + if err != nil { + return MetaValue{}, err + } + return obj, nil +} + +func metaFromProto(proto []*spbmodels.CustomError_MetaValue) MetaMap { + r := make(MetaMap) + + for _, v := range proto { + mval, err := valueFromProto(v.Value, metaDataType(v.Type)) + if err != nil { + log.Warn().Err(err).Msg("metaFromProto failed for " + v.Key) + continue + } + r[v.Key] = mval + } + + return r +} + +func (mm MetaMap) ToProto() []*spbmodels.CustomError_MetaValue { + if mm == nil { + return make([]*spbmodels.CustomError_MetaValue, 0) + } + r := make([]*spbmodels.CustomError_MetaValue, 0, len(mm)) + for k, v := range mm { + strval, err := v.SerializeValue() + if err != nil { + log.Warn().Err(err).Msg("MetaMap.ToProto failed for " + k) + continue + } + + r = append(r, &spbmodels.CustomError_MetaValue{ + Key: k, + Type: string(v.DataType), + Value: strval, + }) + } + return r +} + +func (mm MetaMap) FormatOneLine(singleMaxLen int) string { + r := "" + + i := 0 + for key, val := range mm { + if i > 0 { + r += ", " + } + + r += "\"" + key + "\"" + r += ": " + r += "\"" + val.ShortString(singleMaxLen) + "\"" + + i++ + } + + return r +} + +func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenValue int) string { + r := "" + + r += indentFront + "{" + "\n" + for key, val := range mm { + if key == "gin.body" { + continue + } + + r += indentFront + r += indentKeys + r += "\"" + key + "\"" + r += ": " + r += "\"" + val.ShortString(maxLenValue) + "\"" + r += ",\n" + } + r += indentFront + "}" + + return r +} + +func (mm MetaMap) Any() bool { + return len(mm) > 0 +} + +func (mm MetaMap) Apply(evt *zerolog.Event) *zerolog.Event { + for key, val := range mm { + evt = val.Apply(key, evt) + } + return evt +} + +func (mm MetaMap) add(key string, mdtype metaDataType, val interface{}) { + if _, ok := mm[key]; !ok { + mm[key] = MetaValue{DataType: mdtype, Value: val} + return + } + for i := 2; ; i++ { + realkey := key + "-" + strconv.Itoa(i) + if _, ok := mm[realkey]; !ok { + mm[realkey] = MetaValue{DataType: mdtype, Value: val} + return + } + } +} diff --git a/exerr/wrapper.go b/exerr/wrapper.go new file mode 100644 index 0000000..0880fef --- /dev/null +++ b/exerr/wrapper.go @@ -0,0 +1,133 @@ +package exerr + +import ( + "encoding/json" + "fmt" + "github.com/rs/zerolog/log" + "gogs.mikescher.com/BlackForestBytes/goext/langext" + "strings" +) + +// +// These are wrapper objects, because for some metadata-types we need to serialize a bit more complex data +// (eg thy actual type for ID objects, or the json representation for any types) +// + +type IDWrap struct { + Type string + Value string + IsNil bool +} + +func newIDWrap(val fmt.Stringer) IDWrap { + t := fmt.Sprintf("%T", val) + arr := strings.Split(t, ".") + if len(arr) > 0 { + t = arr[len(arr)-1] + } + + if langext.IsNil(val) { + return IDWrap{Type: t, Value: "", IsNil: true} + } + + v := val.String() + return IDWrap{Type: t, Value: v, IsNil: false} +} + +func (w IDWrap) Serialize() string { + if w.IsNil { + return "!nil" + ":" + w.Type + } + return w.Type + ":" + w.Value +} + +func (w IDWrap) String() string { + if w.IsNil { + return w.Type + "<>" + } + return w.Type + "(" + w.Value + ")" +} + +func deserializeIDWrap(v string) IDWrap { + r := strings.SplitN(v, ":", 2) + + if len(r) == 2 && r[0] == "!nil" { + return IDWrap{Type: r[1], Value: v, IsNil: true} + } + + if len(r) == 0 { + return IDWrap{} + } else if len(r) == 1 { + return IDWrap{Type: "", Value: v, IsNil: false} + } else { + return IDWrap{Type: r[0], Value: r[1], IsNil: false} + } +} + +type AnyWrap struct { + Type string + Json string + IsError bool + IsNil bool +} + +func newAnyWrap(val any) (result AnyWrap) { + result = AnyWrap{Type: "", Json: "", IsError: true, IsNil: false} // ensure a return in case of recover() + + defer func() { + if err := recover(); err != nil { + // send error should never crash our program + log.Error().Interface("err", err).Msg("Panic while trying to marshal anywrap ( bmerror.Interface )") + } + }() + + t := fmt.Sprintf("%T", val) + + if langext.IsNil(val) { + return AnyWrap{Type: t, Json: "", IsError: false, IsNil: true} + } + + j, err := json.Marshal(val) + if err == nil { + return AnyWrap{Type: t, Json: string(j), IsError: false, IsNil: false} + } else { + return AnyWrap{Type: t, Json: "", IsError: true, IsNil: false} + } +} + +func (w AnyWrap) Serialize() string { + if w.IsError { + return "ERR" + ":" + w.Type + ":" + w.Json + } else if w.IsNil { + return "NIL" + ":" + w.Type + ":" + w.Json + } else { + return "OK" + ":" + w.Type + ":" + w.Json + } +} + +func (w AnyWrap) String() string { + if w.IsError { + return "(error)" + } else if w.IsNil { + return "(nil)" + } else { + return w.Json + } +} + +func deserializeAnyWrap(v string) AnyWrap { + r := strings.SplitN(v, ":", 3) + if len(r) != 3 { + return AnyWrap{IsError: true, Type: "", Json: "", IsNil: false} + } else { + if r[0] == "OK" { + return AnyWrap{IsError: false, Type: r[1], Json: r[2], IsNil: false} + } else if r[0] == "ERR" { + return AnyWrap{IsError: true, Type: r[1], Json: r[2], IsNil: false} + } else if r[0] == "NIL" { + return AnyWrap{IsError: false, Type: r[1], Json: "", IsNil: true} + } else { + return AnyWrap{IsError: true, Type: "", Json: "", IsNil: false} + } + } +} diff --git a/go.mod b/go.mod index c9d14c6..64de253 100644 --- a/go.mod +++ b/go.mod @@ -3,47 +3,25 @@ module gogs.mikescher.com/BlackForestBytes/goext go 1.19 require ( - github.com/gin-gonic/gin v1.9.1 - github.com/jmoiron/sqlx v1.3.5 - github.com/rs/zerolog v1.29.1 - go.mongodb.org/mongo-driver v1.12.0 - golang.org/x/crypto v0.11.0 - golang.org/x/sys v0.10.0 - golang.org/x/term v0.10.0 + golang.org/x/sys v0.5.0 + golang.org/x/term v0.3.0 ) require ( - github.com/bytedance/sonic v1.10.0-rc2 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.1 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/jmoiron/sqlx v1.3.5 // indirect + github.com/klauspost/compress v1.13.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/montanaflynn/stats v0.7.1 // indirect - github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect + github.com/rs/zerolog v1.29.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect - github.com/xdg-go/scram v1.1.2 // indirect - github.com/xdg-go/stringprep v1.0.4 // indirect - github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - golang.org/x/arch v0.4.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/text v0.11.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + github.com/xdg-go/scram v1.1.1 // indirect + github.com/xdg-go/stringprep v1.0.3 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + go.mongodb.org/mongo-driver v1.11.2 // indirect + golang.org/x/crypto v0.4.0 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/text v0.5.0 // indirect ) diff --git a/go.sum b/go.sum index 5385017..a7e5151 100644 --- a/go.sum +++ b/go.sum @@ -1,240 +1,78 @@ -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= -github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= -github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.0-rc2 h1:oDfRZ+4m6AYCOC0GFeOCeYqvBmucy1isvouS2K0cPzo= -github.com/bytedance/sonic v1.10.0-rc2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= -github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= -github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= -github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= -github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= -github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= -github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= -github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= -github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= -github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= -github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= -github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= +github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= -github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= -github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= -github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= -github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= -github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8= -go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= -go.mongodb.org/mongo-driver v1.11.7 h1:LIwYxASDLGUg/8wOhgOOZhX8tQa/9tgZPgzZoVqJvcs= -go.mongodb.org/mongo-driver v1.11.7/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY= -go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE= -go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= -golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= -golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +go.mongodb.org/mongo-driver v1.11.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw= +go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/langext/array.go b/langext/array.go index 0395130..0701cfd 100644 --- a/langext/array.go +++ b/langext/array.go @@ -1,8 +1,6 @@ package langext import ( - "errors" - "fmt" "reflect" ) @@ -219,15 +217,6 @@ func ArrFirst[T any](arr []T, comp func(v T) bool) (T, bool) { return *new(T), false } -func ArrFirstOrNil[T any](arr []T, comp func(v T) bool) *T { - for _, v := range arr { - if comp(v) { - return Ptr(v) - } - } - return nil -} - func ArrLast[T any](arr []T, comp func(v T) bool) (T, bool) { found := false result := *new(T) @@ -240,22 +229,6 @@ func ArrLast[T any](arr []T, comp func(v T) bool) (T, bool) { return result, found } -func ArrLastOrNil[T any](arr []T, comp func(v T) bool) *T { - found := false - result := *new(T) - for _, v := range arr { - if comp(v) { - found = true - result = v - } - } - if found { - return Ptr(result) - } else { - return nil - } -} - func ArrFirstIndex[T comparable](arr []T, needle T) int { for i, v := range arr { if v == needle { @@ -292,46 +265,6 @@ func ArrMap[T1 any, T2 any](arr []T1, conv func(v T1) T2) []T2 { return r } -func MapMap[TK comparable, TV any, TR any](inmap map[TK]TV, conv func(k TK, v TV) TR) []TR { - r := make([]TR, 0, len(inmap)) - for k, v := range inmap { - r = append(r, conv(k, v)) - } - return r -} - -func MapMapErr[TK comparable, TV any, TR any](inmap map[TK]TV, conv func(k TK, v TV) (TR, error)) ([]TR, error) { - r := make([]TR, 0, len(inmap)) - for k, v := range inmap { - elem, err := conv(k, v) - if err != nil { - return nil, err - } - r = append(r, elem) - } - return r, nil -} - -func ArrMapExt[T1 any, T2 any](arr []T1, conv func(idx int, v T1) T2) []T2 { - r := make([]T2, len(arr)) - for i, v := range arr { - r[i] = conv(i, v) - } - return r -} - -func ArrMapErr[T1 any, T2 any](arr []T1, conv func(v T1) (T2, error)) ([]T2, error) { - var err error - r := make([]T2, len(arr)) - for i, v := range arr { - r[i], err = conv(v) - if err != nil { - return nil, err - } - } - return r, nil -} - func ArrFilterMap[T1 any, T2 any](arr []T1, filter func(v T1) bool, conv func(v T1) T2) []T2 { r := make([]T2, 0, len(arr)) for _, v := range arr { @@ -342,16 +275,6 @@ func ArrFilterMap[T1 any, T2 any](arr []T1, filter func(v T1) bool, conv func(v return r } -func ArrFilter[T any](arr []T, filter func(v T) bool) []T { - r := make([]T, 0, len(arr)) - for _, v := range arr { - if filter(v) { - r = append(r, v) - } - } - return r -} - func ArrSum[T NumberConstraint](arr []T) T { var r T = 0 for _, v := range arr { @@ -360,83 +283,10 @@ func ArrSum[T NumberConstraint](arr []T) T { return r } -func ArrFlatten[T1 any, T2 any](arr []T1, conv func(v T1) []T2) []T2 { - r := make([]T2, 0, len(arr)) - for _, v1 := range arr { - r = append(r, conv(v1)...) +func ArrRemove[T comparable](arr []T, needle T) []T { + idx := ArrFirstIndex(arr, needle) + if idx >= 0 { + return append(arr[:idx], arr[idx+1:]...) } - return r -} - -func ArrFlattenDirect[T1 any](arr [][]T1) []T1 { - r := make([]T1, 0, len(arr)) - for _, v1 := range arr { - r = append(r, v1...) - } - return r -} - -func ArrCastToAny[T1 any](arr []T1) []any { - r := make([]any, len(arr)) - for i, v := range arr { - r[i] = any(v) - } - return r -} - -func ArrCastSafe[T1 any, T2 any](arr []T1) []T2 { - r := make([]T2, 0, len(arr)) - for _, v := range arr { - if vcast, ok := any(v).(T2); ok { - r = append(r, vcast) - } - } - return r -} - -func ArrCastErr[T1 any, T2 any](arr []T1) ([]T2, error) { - r := make([]T2, len(arr)) - for i, v := range arr { - if vcast, ok := any(v).(T2); ok { - r[i] = vcast - } else { - return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) - } - } - return r, nil -} - -func ArrCastPanic[T1 any, T2 any](arr []T1) []T2 { - r := make([]T2, len(arr)) - for i, v := range arr { - if vcast, ok := any(v).(T2); ok { - r[i] = vcast - } else { - panic(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) - } - } - return r -} - -func ArrConcat[T any](arr ...[]T) []T { - c := 0 - for _, v := range arr { - c += len(v) - } - r := make([]T, c) - i := 0 - for _, av := range arr { - for _, v := range av { - r[i] = v - i++ - } - } - return r -} - -// ArrCopy does a shallow copy of the 'in' array -func ArrCopy[T any](in []T) []T { - out := make([]T, len(in)) - copy(out, in) - return out + return arr }