From c7fd1e2af3aa4060daed00ded97890cd99eaf9bc Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Mon, 11 Dec 2023 21:51:51 +0000 Subject: [PATCH 1/3] Update to latest version of validator library --- flows/actions/open_ticket.go | 6 +++--- flows/actions/request_optin.go | 2 +- flows/actions/send_msg.go | 2 +- flows/actions/set_contact_channel.go | 2 +- flows/call.go | 2 +- flows/events/dial_ended.go | 2 +- flows/events/ivr_created.go | 2 +- flows/events/msg_created.go | 2 +- flows/events/msg_received.go | 2 +- flows/events/optin_requested.go | 4 ++-- flows/events/ticket_opened.go | 6 +++--- flows/inputs/base.go | 2 +- flows/modifiers/channel.go | 2 +- flows/resumes/dial.go | 2 +- flows/resumes/msg.go | 2 +- flows/routers/waits/base.go | 2 +- flows/runs/run.go | 2 +- flows/runs/summary.go | 2 +- flows/tickets.go | 6 +++--- flows/triggers/campaign.go | 4 ++-- flows/triggers/channel.go | 4 ++-- flows/triggers/manual.go | 2 +- flows/triggers/msg.go | 4 ++-- flows/triggers/optin.go | 4 ++-- flows/triggers/ticket.go | 2 +- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/flows/actions/open_ticket.go b/flows/actions/open_ticket.go index f4a0d3c17..991e114c5 100644 --- a/flows/actions/open_ticket.go +++ b/flows/actions/open_ticket.go @@ -37,10 +37,10 @@ type OpenTicketAction struct { baseAction onlineAction - Ticketer *assets.TicketerReference `json:"ticketer" validate:"required,dive"` - Topic *assets.TopicReference `json:"topic" validate:"omitempty,dive"` + Ticketer *assets.TicketerReference `json:"ticketer" validate:"required"` + Topic *assets.TopicReference `json:"topic" validate:"omitempty"` Body string `json:"body" engine:"evaluated"` - Assignee *assets.UserReference `json:"assignee" validate:"omitempty,dive"` + Assignee *assets.UserReference `json:"assignee" validate:"omitempty"` ResultName string `json:"result_name" validate:"required"` } diff --git a/flows/actions/request_optin.go b/flows/actions/request_optin.go index 183e17088..0622ea86a 100644 --- a/flows/actions/request_optin.go +++ b/flows/actions/request_optin.go @@ -31,7 +31,7 @@ type RequestOptInAction struct { baseAction onlineAction - OptIn *assets.OptInReference `json:"optin" validate:"required,dive"` + OptIn *assets.OptInReference `json:"optin" validate:"required"` } // NewRequestOptIn creates a new request optin action diff --git a/flows/actions/send_msg.go b/flows/actions/send_msg.go index 9ca8f79cd..faf86d969 100644 --- a/flows/actions/send_msg.go +++ b/flows/actions/send_msg.go @@ -46,7 +46,7 @@ type SendMsgAction struct { createMsgAction AllURNs bool `json:"all_urns,omitempty"` - Templating *Templating `json:"templating,omitempty" validate:"omitempty,dive"` + Templating *Templating `json:"templating,omitempty" validate:"omitempty"` Topic flows.MsgTopic `json:"topic,omitempty" validate:"omitempty,msg_topic"` } diff --git a/flows/actions/set_contact_channel.go b/flows/actions/set_contact_channel.go index b243f29e9..e89ad08c6 100644 --- a/flows/actions/set_contact_channel.go +++ b/flows/actions/set_contact_channel.go @@ -30,7 +30,7 @@ type SetContactChannelAction struct { baseAction onlineAction - Channel *assets.ChannelReference `json:"channel" validate:"omitempty,dive"` + Channel *assets.ChannelReference `json:"channel" validate:"omitempty"` } // NewSetContactChannel creates a new set channel action diff --git a/flows/call.go b/flows/call.go index 1ed98df12..d054d531a 100644 --- a/flows/call.go +++ b/flows/call.go @@ -28,7 +28,7 @@ func (c *Call) URN() urns.URN { return c.urn } //------------------------------------------------------------------------------------------ type callEnvelope struct { - Channel *assets.ChannelReference `json:"channel" validate:"required,dive"` + Channel *assets.ChannelReference `json:"channel" validate:"required"` URN urns.URN `json:"urn" validate:"required,urn"` } diff --git a/flows/events/dial_ended.go b/flows/events/dial_ended.go index 4493fd1c8..d36eb9b80 100644 --- a/flows/events/dial_ended.go +++ b/flows/events/dial_ended.go @@ -26,7 +26,7 @@ const TypeDialEnded string = "dial_ended" type DialEndedEvent struct { BaseEvent - Dial *flows.Dial `json:"dial" validate:"required,dive"` + Dial *flows.Dial `json:"dial" validate:"required"` } // NewDialEnded returns a new dial ended event diff --git a/flows/events/ivr_created.go b/flows/events/ivr_created.go index 6526b8fda..034cc39ad 100644 --- a/flows/events/ivr_created.go +++ b/flows/events/ivr_created.go @@ -30,7 +30,7 @@ const TypeIVRCreated string = "ivr_created" type IVRCreatedEvent struct { BaseEvent - Msg *flows.MsgOut `json:"msg" validate:"required,dive"` + Msg *flows.MsgOut `json:"msg" validate:"required"` } // NewIVRCreated creates a new IVR created event diff --git a/flows/events/msg_created.go b/flows/events/msg_created.go index 7f62f951b..ec1795529 100644 --- a/flows/events/msg_created.go +++ b/flows/events/msg_created.go @@ -29,7 +29,7 @@ const TypeMsgCreated string = "msg_created" type MsgCreatedEvent struct { BaseEvent - Msg *flows.MsgOut `json:"msg" validate:"required,dive"` + Msg *flows.MsgOut `json:"msg" validate:"required"` } // NewMsgCreated creates a new outgoing msg event to a single contact diff --git a/flows/events/msg_received.go b/flows/events/msg_received.go index 061d0f57b..02180274b 100644 --- a/flows/events/msg_received.go +++ b/flows/events/msg_received.go @@ -30,7 +30,7 @@ const TypeMsgReceived string = "msg_received" type MsgReceivedEvent struct { BaseEvent - Msg flows.MsgIn `json:"msg" validate:"required,dive"` + Msg flows.MsgIn `json:"msg" validate:"required"` } // NewMsgReceived creates a new incoming msg event for the passed in channel, URN and text diff --git a/flows/events/optin_requested.go b/flows/events/optin_requested.go index 1ae2f956f..48d9cf6b9 100644 --- a/flows/events/optin_requested.go +++ b/flows/events/optin_requested.go @@ -33,8 +33,8 @@ const TypeOptInRequested string = "optin_requested" type OptInRequestedEvent struct { BaseEvent - OptIn *assets.OptInReference `json:"optin" validate:"required,dive"` - Channel *assets.ChannelReference `json:"channel" validate:"required,dive"` + OptIn *assets.OptInReference `json:"optin" validate:"required"` + Channel *assets.ChannelReference `json:"channel" validate:"required"` URN urns.URN `json:"urn" validate:"required"` } diff --git a/flows/events/ticket_opened.go b/flows/events/ticket_opened.go index 0960b25c3..07e619258 100644 --- a/flows/events/ticket_opened.go +++ b/flows/events/ticket_opened.go @@ -14,11 +14,11 @@ const TypeTicketOpened string = "ticket_opened" type Ticket struct { UUID flows.TicketUUID `json:"uuid" validate:"required,uuid4"` - Ticketer *assets.TicketerReference `json:"ticketer" validate:"required,dive"` - Topic *assets.TopicReference `json:"topic" validate:"omitempty,dive"` + Ticketer *assets.TicketerReference `json:"ticketer" validate:"required"` + Topic *assets.TopicReference `json:"topic" validate:"omitempty"` Body string `json:"body"` ExternalID string `json:"external_id,omitempty"` - Assignee *assets.UserReference `json:"assignee,omitempty" validate:"omitempty,dive"` + Assignee *assets.UserReference `json:"assignee,omitempty" validate:"omitempty"` } // TicketOpenedEvent events are created when a new ticket is opened. diff --git a/flows/inputs/base.go b/flows/inputs/base.go index 65026d043..f1f39f0c4 100644 --- a/flows/inputs/base.go +++ b/flows/inputs/base.go @@ -52,7 +52,7 @@ func (i *baseInput) CreatedOn() time.Time { return i.createdOn } type baseInputEnvelope struct { Type string `json:"type" validate:"required"` UUID flows.InputUUID `json:"uuid"` - Channel *assets.ChannelReference `json:"channel,omitempty" validate:"omitempty,dive"` + Channel *assets.ChannelReference `json:"channel,omitempty" validate:"omitempty"` CreatedOn time.Time `json:"created_on" validate:"required"` } diff --git a/flows/modifiers/channel.go b/flows/modifiers/channel.go index 103d258ec..0673c7cd4 100644 --- a/flows/modifiers/channel.go +++ b/flows/modifiers/channel.go @@ -54,7 +54,7 @@ var _ flows.Modifier = (*ChannelModifier)(nil) type channelModifierEnvelope struct { utils.TypedEnvelope - Channel *assets.ChannelReference `json:"channel" validate:"omitempty,dive"` + Channel *assets.ChannelReference `json:"channel" validate:"omitempty"` } func readChannelModifier(assets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Modifier, error) { diff --git a/flows/resumes/dial.go b/flows/resumes/dial.go index 246c98c4a..a6c80a0c4 100644 --- a/flows/resumes/dial.go +++ b/flows/resumes/dial.go @@ -68,7 +68,7 @@ var _ flows.Resume = (*DialResume)(nil) type dialResumeEnvelope struct { baseResumeEnvelope - Dial *flows.Dial `json:"dial" validate:"required,dive"` + Dial *flows.Dial `json:"dial" validate:"required"` } func readDialResume(sessionAssets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Resume, error) { diff --git a/flows/resumes/msg.go b/flows/resumes/msg.go index 80e7f0ec6..58f7f8e1c 100644 --- a/flows/resumes/msg.go +++ b/flows/resumes/msg.go @@ -79,7 +79,7 @@ var _ flows.Resume = (*MsgResume)(nil) type msgResumeEnvelope struct { baseResumeEnvelope - Msg *flows.MsgIn `json:"msg" validate:"required,dive"` + Msg *flows.MsgIn `json:"msg" validate:"required"` } func readMsgResume(sessionAssets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Resume, error) { diff --git a/flows/routers/waits/base.go b/flows/routers/waits/base.go index 677743db5..59fcc0fed 100644 --- a/flows/routers/waits/base.go +++ b/flows/routers/waits/base.go @@ -65,7 +65,7 @@ func (w *baseWait) expiresOn(run flows.Run) *time.Time { type baseWaitEnvelope struct { Type string `json:"type" validate:"required"` - Timeout *Timeout `json:"timeout,omitempty" validate:"omitempty,dive"` + Timeout *Timeout `json:"timeout,omitempty" validate:"omitempty"` } // ReadWait reads a wait from the given JSON diff --git a/flows/runs/run.go b/flows/runs/run.go index 3c3649c3a..3d9159ce0 100644 --- a/flows/runs/run.go +++ b/flows/runs/run.go @@ -395,7 +395,7 @@ var _ flows.RunSummary = (*run)(nil) type runEnvelope struct { UUID flows.RunUUID `json:"uuid" validate:"required,uuid4"` - Flow *assets.FlowReference `json:"flow" validate:"required,dive"` + Flow *assets.FlowReference `json:"flow" validate:"required"` Path []*step `json:"path" validate:"dive"` Events []json.RawMessage `json:"events,omitempty"` Results flows.Results `json:"results,omitempty" validate:"omitempty,dive"` diff --git a/flows/runs/summary.go b/flows/runs/summary.go index 208bad255..69d74e92a 100644 --- a/flows/runs/summary.go +++ b/flows/runs/summary.go @@ -116,7 +116,7 @@ func FormatRunSummary(env envs.Environment, run flows.RunSummary) string { type runSummaryEnvelope struct { UUID flows.RunUUID `json:"uuid" validate:"uuid4"` - Flow *assets.FlowReference `json:"flow" validate:"required,dive"` + Flow *assets.FlowReference `json:"flow" validate:"required"` Contact json.RawMessage `json:"contact"` Status flows.RunStatus `json:"status" validate:"required"` Results flows.Results `json:"results"` diff --git a/flows/tickets.go b/flows/tickets.go index b933e7f2e..6354d3e0c 100644 --- a/flows/tickets.go +++ b/flows/tickets.go @@ -69,11 +69,11 @@ func (t *Ticket) Context(env envs.Environment) map[string]types.XValue { type ticketEnvelope struct { UUID TicketUUID `json:"uuid" validate:"required,uuid4"` - Ticketer *assets.TicketerReference `json:"ticketer" validate:"omitempty,dive"` - Topic *assets.TopicReference `json:"topic" validate:"omitempty,dive"` + Ticketer *assets.TicketerReference `json:"ticketer" validate:"omitempty"` + Topic *assets.TopicReference `json:"topic" validate:"omitempty"` Body string `json:"body"` ExternalID string `json:"external_id,omitempty"` - Assignee *assets.UserReference `json:"assignee,omitempty" validate:"omitempty,dive"` + Assignee *assets.UserReference `json:"assignee,omitempty" validate:"omitempty"` } // ReadTicket decodes a contact from the passed in JSON. If the ticketer or assigned user can't diff --git a/flows/triggers/campaign.go b/flows/triggers/campaign.go index b527148f5..1a4488cbc 100644 --- a/flows/triggers/campaign.go +++ b/flows/triggers/campaign.go @@ -46,7 +46,7 @@ func (c *CampaignReference) Context(env envs.Environment) map[string]types.XValu // CampaignEvent describes the specific event in the campaign that triggered the session type CampaignEvent struct { UUID CampaignEventUUID `json:"uuid" validate:"required,uuid4"` - Campaign *CampaignReference `json:"campaign" validate:"required,dive"` + Campaign *CampaignReference `json:"campaign" validate:"required"` } // CampaignTrigger is used when a session was triggered by a campaign event @@ -111,7 +111,7 @@ func (b *CampaignBuilder) Build() *CampaignTrigger { type campaignTriggerEnvelope struct { baseTriggerEnvelope - Event *CampaignEvent `json:"event" validate:"required,dive"` + Event *CampaignEvent `json:"event" validate:"required"` } func readCampaignTrigger(sessionAssets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Trigger, error) { diff --git a/flows/triggers/channel.go b/flows/triggers/channel.go index 0291b1c58..fcb817638 100644 --- a/flows/triggers/channel.go +++ b/flows/triggers/channel.go @@ -32,7 +32,7 @@ const ( // ChannelEvent describes the specific event on the channel that triggered the session type ChannelEvent struct { Type ChannelEventType `json:"type" validate:"required"` - Channel *assets.ChannelReference `json:"channel" validate:"required,dive"` + Channel *assets.ChannelReference `json:"channel" validate:"required"` } // ChannelTrigger is used when a session was triggered by a channel event @@ -102,7 +102,7 @@ func (b *ChannelBuilder) Build() *ChannelTrigger { type channelTriggerEnvelope struct { baseTriggerEnvelope - Event *ChannelEvent `json:"event" validate:"required,dive"` + Event *ChannelEvent `json:"event" validate:"required"` } func readChannelTrigger(sessionAssets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Trigger, error) { diff --git a/flows/triggers/manual.go b/flows/triggers/manual.go index 1a173b176..15d4bc523 100644 --- a/flows/triggers/manual.go +++ b/flows/triggers/manual.go @@ -109,7 +109,7 @@ func (b *ManualBuilder) Build() *ManualTrigger { type manualTriggerEnvelope struct { baseTriggerEnvelope - User *assets.UserReference `json:"user,omitempty" validate:"omitempty,dive"` + User *assets.UserReference `json:"user,omitempty" validate:"omitempty"` Origin string `json:"origin,omitempty"` } diff --git a/flows/triggers/msg.go b/flows/triggers/msg.go index 7db42db16..c4194acf2 100644 --- a/flows/triggers/msg.go +++ b/flows/triggers/msg.go @@ -136,8 +136,8 @@ func (b *MsgBuilder) Build() *MsgTrigger { type msgTriggerEnvelope struct { baseTriggerEnvelope - Msg *flows.MsgIn `json:"msg" validate:"required,dive"` - Match *KeywordMatch `json:"keyword_match,omitempty" validate:"omitempty,dive"` + Msg *flows.MsgIn `json:"msg" validate:"required"` + Match *KeywordMatch `json:"keyword_match,omitempty" validate:"omitempty"` } func readMsgTrigger(sessionAssets flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Trigger, error) { diff --git a/flows/triggers/optin.go b/flows/triggers/optin.go index 88ca9c830..a3396b717 100644 --- a/flows/triggers/optin.go +++ b/flows/triggers/optin.go @@ -98,12 +98,12 @@ func (b *OptInBuilder) Build() *OptInTrigger { type optInEventEnvelope struct { Type OptInEventType `json:"type" validate:"required"` - OptIn *assets.OptInReference `json:"optin" validate:"required,dive"` + OptIn *assets.OptInReference `json:"optin" validate:"required"` } type optInTriggerEnvelope struct { baseTriggerEnvelope - Event *optInEventEnvelope `json:"event" validate:"required,dive"` + Event *optInEventEnvelope `json:"event" validate:"required"` } func readOptInTrigger(sa flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Trigger, error) { diff --git a/flows/triggers/ticket.go b/flows/triggers/ticket.go index d32b2454f..fa5eaee37 100644 --- a/flows/triggers/ticket.go +++ b/flows/triggers/ticket.go @@ -105,7 +105,7 @@ type ticketEventEnvelope struct { type ticketTriggerEnvelope struct { baseTriggerEnvelope - Event ticketEventEnvelope `json:"event" validate:"required,dive"` + Event ticketEventEnvelope `json:"event" validate:"required"` } func readTicketTrigger(sa flows.SessionAssets, data json.RawMessage, missing assets.MissingCallback) (flows.Trigger, error) { diff --git a/go.mod b/go.mod index 8d5c248fe..ecddeb641 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,15 @@ require ( github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 github.com/blevesearch/segment v0.9.1 github.com/buger/jsonparser v1.1.1 - github.com/go-playground/validator/v10 v10.14.1 + github.com/go-playground/validator/v10 v10.16.0 github.com/nyaruka/gocommon v1.42.6 github.com/olivere/elastic/v7 v7.0.32 github.com/pkg/errors v0.9.1 github.com/sergi/go-diff v1.3.1 github.com/shopspring/decimal v1.3.1 github.com/stretchr/testify v1.8.4 - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa - golang.org/x/net v0.18.0 + golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb + golang.org/x/net v0.19.0 golang.org/x/text v0.14.0 ) @@ -33,8 +33,8 @@ require ( github.com/nyaruka/null/v2 v2.0.3 // indirect github.com/nyaruka/phonenumbers v1.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.15.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/crypto v0.16.0 // indirect + golang.org/x/sys v0.15.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 6ae32e988..fa1d8557a 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o 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.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= -github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE= +github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -71,14 +71,14 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 716052ddf7d42ce64ed7c090839ca8e2df68a265 Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Tue, 12 Dec 2023 09:24:38 -0500 Subject: [PATCH 2/3] Update CHANGELOG.md for v0.197.7 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da0c23780..bd314c79e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +v0.197.7 (2023-12-12) +------------------------- + * Merge pull request #1198 from nyaruka/trim_attachments + * Trim whitespace from evaluated message attachments + v0.197.6 (2023-11-27) ------------------------- * Update to latest gocommon From 6a75e0e07528d4c83acc6c8cfdd85c98d0e48221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:07:12 +0000 Subject: [PATCH 3/3] Bump golang.org/x/crypto from 0.16.0 to 0.17.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.16.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ecddeb641..eb9fee246 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/nyaruka/null/v2 v2.0.3 // indirect github.com/nyaruka/phonenumbers v1.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/sys v0.15.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect diff --git a/go.sum b/go.sum index fa1d8557a..7888ca084 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=