Skip to content

Commit 630a052

Browse files
norkans7norkans7
committed
Rename ErrResponseUnexpectedUnlogged to ErrResponseContent
1 parent 5bd2c68 commit 630a052

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+69
-69
lines changed

Diff for: ‎handlers/africastalking/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
156156
// was this request successful?
157157
msgStatus, _ := jsonparser.GetString(respBody, "SMSMessageData", "Recipients", "[0]", "status")
158158
if msgStatus != "Success" {
159-
return courier.ErrResponseUnexpectedUnlogged
159+
return courier.ErrResponseContent
160160
}
161161

162162
// grab the external id if we can

Diff for: ‎handlers/africastalking/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ var outgoingCases = []OutgoingTestCase{
153153
ExpectedRequests: []ExpectedRequest{
154154
{Form: url.Values{"message": {`Hi`}, "username": {"Username"}, "to": {"+250788383383"}, "from": {"2020"}}},
155155
},
156-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
156+
ExpectedError: courier.ErrResponseContent,
157157
},
158158
{
159159
Label: "Missing status value",

Diff for: ‎handlers/arabiacell/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
100100
if response.Code == "204" {
101101
res.AddExternalID(response.MessageID)
102102
} else {
103-
return courier.ErrResponseUnexpectedUnlogged
103+
return courier.ErrResponseContent
104104
}
105105
}
106106

Diff for: ‎handlers/arabiacell/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var outgoingCases = []OutgoingTestCase{
8888
httpx.NewMockResponse(200, nil, []byte(`<response><code>501</code><text>failure</text><message_id></message_id></response>`)),
8989
},
9090
},
91-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
91+
ExpectedError: courier.ErrResponseContent,
9292
},
9393
{
9494
Label: "Error Sending",

Diff for: ‎handlers/bongolive/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
166166

167167
msgStatus, _ := jsonparser.GetString(respBody, "results", "[0]", "status")
168168
if msgStatus != "0" {
169-
return courier.ErrResponseUnexpectedUnlogged
169+
return courier.ErrResponseContent
170170
}
171171

172172
// grab the external id if we can

Diff for: ‎handlers/bongolive/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ var outgoingCases = []OutgoingTestCase{
128128
},
129129
},
130130
},
131-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
131+
ExpectedError: courier.ErrResponseContent,
132132
},
133133
{
134134
Label: "Error status 403",

Diff for: ‎handlers/burstsms/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
9494
if response.MessageID != 0 {
9595
res.AddExternalID(fmt.Sprintf("%d", response.MessageID))
9696
} else {
97-
return courier.ErrResponseUnexpectedUnlogged
97+
return courier.ErrResponseContent
9898
}
9999
}
100100

Diff for: ‎handlers/burstsms/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ var outgoingCases = []OutgoingTestCase{
114114
},
115115
},
116116
},
117-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
117+
ExpectedError: courier.ErrResponseContent,
118118
},
119119
{
120120
Label: "Error Sending",

Diff for: ‎handlers/clickatell/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
188188
if externalID != "" {
189189
res.AddExternalID(externalID)
190190
} else {
191-
return courier.ErrResponseUnexpectedUnlogged
191+
return courier.ErrResponseContent
192192
}
193193
}
194194

Diff for: ‎handlers/clickatell/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ var outgoingCases = []OutgoingTestCase{
224224
ExpectedRequests: []ExpectedRequest{
225225
{Params: url.Values{"content": {"Error Message"}, "to": {"250788383383"}, "from": {"2020"}, "apiKey": {"API-KEY"}}},
226226
},
227-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
227+
ExpectedError: courier.ErrResponseContent,
228228
},
229229
}
230230

Diff for: ‎handlers/clickmobile/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
146146

147147
responseCode, _ := jsonparser.GetString(respBody, "code")
148148
if responseCode != "000" {
149-
return courier.ErrResponseUnexpectedUnlogged
149+
return courier.ErrResponseContent
150150
}
151151
}
152152

Diff for: ‎handlers/clickmobile/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var outgoingCases = []OutgoingTestCase{
221221
Body: `{"app_id":"001-app","org_id":"001-org","user_id":"Username","timestamp":"20180411182430","auth_key":"3e1347ddb444d13aa23d11e097602be0","operation":"send","reference":"10","message_type":"1","src_address":"2020","dst_address":"+250788383383","message":"Simple Message"}`,
222222
},
223223
},
224-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
224+
ExpectedError: courier.ErrResponseContent,
225225
},
226226
}
227227

Diff for: ‎handlers/clicksend/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
9393

9494
s, _ := jsonparser.GetString(respBody, "data", "messages", "[0]", "status")
9595
if s != "SUCCESS" {
96-
return courier.ErrResponseUnexpectedUnlogged
96+
return courier.ErrResponseContent
9797
}
9898

9999
id, _ := jsonparser.GetString(respBody, "data", "messages", "[0]", "message_id")
100100
if id != "" {
101101
res.AddExternalID(id)
102102
} else {
103-
return courier.ErrResponseUnexpectedUnlogged
103+
return courier.ErrResponseContent
104104
}
105105
}
106106

Diff for: ‎handlers/clicksend/handler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ var outgoingCases = []OutgoingTestCase{
215215
Body: `{"messages":[{"to":"+250788383383","from":"2020","body":"Error Sending","source":"courier"}]}`,
216216
},
217217
},
218-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
218+
ExpectedError: courier.ErrResponseContent,
219219
},
220220
{
221221
Label: "Failure Response",
@@ -232,7 +232,7 @@ var outgoingCases = []OutgoingTestCase{
232232
Body: `{"messages":[{"to":"+250788383383","from":"2020","body":"Error Sending","source":"courier"}]}`,
233233
},
234234
},
235-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
235+
ExpectedError: courier.ErrResponseContent,
236236
},
237237
}
238238

Diff for: ‎handlers/dmark/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
142142
// grab the external id
143143
externalID, err := jsonparser.GetString(respBody, "sms_id")
144144
if err != nil {
145-
return courier.ErrResponseUnexpectedUnlogged
145+
return courier.ErrResponseContent
146146
}
147147

148148
res.AddExternalID(externalID)

Diff for: ‎handlers/dmark/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var defaultSendTestCases = []OutgoingTestCase{
131131
"dlr_url": {"https://localhost/c/dk/8eb23e93-5ecb-45ba-b726-3b064e0c56ab/status?id=10&status=%s"},
132132
},
133133
}},
134-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
134+
ExpectedError: courier.ErrResponseContent,
135135
},
136136
{
137137
Label: "Error Sending",

Diff for: ‎handlers/external/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
366366
}
367367

368368
if responseCheck != "" && !strings.Contains(string(respBody), responseCheck) {
369-
return courier.ErrResponseUnexpectedUnlogged
369+
return courier.ErrResponseContent
370370
}
371371
}
372372

Diff for: ‎handlers/external/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ var xmlSendWithResponseContentTestCases = []OutgoingTestCase{
834834
Headers: map[string]string{"Content-Type": "text/xml; charset=utf-8"},
835835
Body: `<msg><to>+250788383383</to><text>Error Message</text><from>2020</from><quick_replies></quick_replies></msg>`,
836836
}},
837-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
837+
ExpectedError: courier.ErrResponseContent,
838838
},
839839
{
840840
Label: "Send Attachment",

Diff for: ‎handlers/firebase/handler.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,12 @@ func (h *handler) sendWithAPIKey(msg courier.MsgOut, res *courier.SendResult, cl
238238
// was this successful
239239
success, _ := jsonparser.GetInt(respBody, "success")
240240
if success != 1 {
241-
return courier.ErrResponseUnexpectedUnlogged
241+
return courier.ErrResponseContent
242242
}
243243

244244
externalID, err := jsonparser.GetInt(respBody, "multicast_id")
245245
if err != nil {
246-
return courier.ErrResponseUnexpectedUnlogged
246+
return courier.ErrResponseContent
247247
}
248248
res.AddExternalID(fmt.Sprintf("%d", externalID))
249249

@@ -319,15 +319,15 @@ func (h *handler) sendWithCredsJSON(msg courier.MsgOut, res *courier.SendResult,
319319

320320
responseName, err := jsonparser.GetString(respBody, "name")
321321
if err != nil {
322-
return courier.ErrResponseUnexpectedUnlogged
322+
return courier.ErrResponseContent
323323
}
324324

325325
if !strings.Contains(responseName, fmt.Sprintf("projects/%s/messages/", projectID)) {
326-
return courier.ErrResponseUnexpectedUnlogged
326+
return courier.ErrResponseContent
327327
}
328328
externalID := strings.TrimLeft(responseName, fmt.Sprintf("projects/%s/messages/", projectID))
329329
if externalID == "" {
330-
return courier.ErrResponseUnexpectedUnlogged
330+
return courier.ErrResponseContent
331331
}
332332

333333
res.AddExternalID(externalID)

Diff for: ‎handlers/firebase/handler_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ var sendAPIkeyTestCases = []OutgoingTestCase{
226226
Headers: map[string]string{"Authorization": "key=FCMKey"},
227227
Body: `{"data":{"type":"rapidpro","title":"FCMTitle","message":"Error","message_id":10,"session_status":""},"content_available":false,"to":"auth1","priority":"high"}`,
228228
}},
229-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
229+
ExpectedError: courier.ErrResponseContent,
230230
},
231231
{
232232
Label: "No Multicast ID",
@@ -242,7 +242,7 @@ var sendAPIkeyTestCases = []OutgoingTestCase{
242242
Headers: map[string]string{"Authorization": "key=FCMKey"},
243243
Body: `{"data":{"type":"rapidpro","title":"FCMTitle","message":"Error","message_id":10,"session_status":""},"content_available":false,"to":"auth1","priority":"high"}`,
244244
}},
245-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
245+
ExpectedError: courier.ErrResponseContent,
246246
},
247247
{
248248
Label: "Request Error",
@@ -353,7 +353,7 @@ var sendTestCases = []OutgoingTestCase{
353353
Headers: map[string]string{"Authorization": "Bearer FCMToken"},
354354
Body: `{"message":{"data":{"type":"rapidpro","title":"FCMTitle","message":"Error","message_id":"10","session_status":""},"token":"auth1","android":{"priority":"high"}}}`,
355355
}},
356-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
356+
ExpectedError: courier.ErrResponseContent,
357357
},
358358
{
359359
Label: "No Multicast ID",
@@ -369,7 +369,7 @@ var sendTestCases = []OutgoingTestCase{
369369
Headers: map[string]string{"Authorization": "Bearer FCMToken"},
370370
Body: `{"message":{"data":{"type":"rapidpro","title":"FCMTitle","message":"Error","message_id":"10","session_status":""},"token":"auth1","android":{"priority":"high"}}}`,
371371
}},
372-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
372+
ExpectedError: courier.ErrResponseContent,
373373
},
374374
{
375375
Label: "Request Error",
@@ -401,7 +401,7 @@ var sendTestCases = []OutgoingTestCase{
401401
Headers: map[string]string{"Authorization": "Bearer FCMToken"},
402402
Body: `{"message":{"data":{"type":"rapidpro","title":"FCMTitle","message":"Simple Message","message_id":"10","session_status":""},"token":"auth1","android":{"priority":"high"}}}`,
403403
}},
404-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
404+
ExpectedError: courier.ErrResponseContent,
405405
},
406406
{
407407
Label: "Response Unexpected",
@@ -417,7 +417,7 @@ var sendTestCases = []OutgoingTestCase{
417417
Headers: map[string]string{"Authorization": "Bearer FCMToken"},
418418
Body: `{"message":{"data":{"type":"rapidpro","title":"FCMTitle","message":"Simple Message","message_id":"10","session_status":""},"token":"auth1","android":{"priority":"high"}}}`,
419419
}},
420-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
420+
ExpectedError: courier.ErrResponseContent,
421421
},
422422
{
423423
Label: "Response Unexpected",
@@ -433,7 +433,7 @@ var sendTestCases = []OutgoingTestCase{
433433
Headers: map[string]string{"Authorization": "Bearer FCMToken"},
434434
Body: `{"message":{"data":{"type":"rapidpro","title":"FCMTitle","message":"Simple Message","message_id":"10","session_status":""},"token":"auth1","android":{"priority":"high"}}}`,
435435
}},
436-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
436+
ExpectedError: courier.ErrResponseContent,
437437
},
438438
}
439439

Diff for: ‎handlers/infobip/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
214214

215215
groupID, err := jsonparser.GetInt(respBody, "messages", "[0]", "status", "groupId")
216216
if err != nil || (groupID != 1 && groupID != 3) {
217-
return courier.ErrResponseUnexpectedUnlogged
217+
return courier.ErrResponseContent
218218
}
219219

220220
externalID, err := jsonparser.GetString(respBody, "messages", "[0]", "messageId")

Diff for: ‎handlers/infobip/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ var defaultSendTestCases = []OutgoingTestCase{
393393
},
394394
Body: `{"messages":[{"from":"2020","destinations":[{"to":"250788383383","messageId":"10"}],"text":"Simple Message","notifyContentType":"application/json","intermediateReport":true,"notifyUrl":"https://localhost/c/ib/8eb23e93-5ecb-45ba-b726-3b064e0c56ab/delivered"}]}`,
395395
}},
396-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
396+
ExpectedError: courier.ErrResponseContent,
397397
},
398398
}
399399

Diff for: ‎handlers/justcall/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
199199
clog.Error(courier.ErrorResponseValueMissing("status"))
200200
}
201201
if respStatus != "success" {
202-
return courier.ErrResponseUnexpectedUnlogged
202+
return courier.ErrResponseContent
203203

204204
}
205205

Diff for: ‎handlers/justcall/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ var defaultSendTestCases = []OutgoingTestCase{
345345
},
346346
Body: `{"from":"2020","to":"+250788383383","body":"Error"}`,
347347
}},
348-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
348+
ExpectedError: courier.ErrResponseContent,
349349
},
350350
{
351351
Label: "Error",

Diff for: ‎handlers/novo/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
115115

116116
// we always get 204 on success
117117
if responseMsgStatus != "FINISHED" || err != nil {
118-
return courier.ErrResponseUnexpectedUnlogged
118+
return courier.ErrResponseContent
119119
}
120120
}
121121

Diff for: ‎handlers/novo/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ var defaultSendTestCases = []OutgoingTestCase{
120120
ExpectedRequests: []ExpectedRequest{{
121121
Params: url.Values{"from": {"2020"}, "to": {"18686846481"}, "msg": {"Invalid Parameters"}, "signature": {"4b640a668fd83223e38d429b15ea737ef58e1ab025b756baaca4743f3adb3f77"}},
122122
}},
123-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
123+
ExpectedError: courier.ErrResponseContent,
124124
},
125125
{
126126
Label: "Error Response",

Diff for: ‎handlers/plivo/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
178178

179179
externalID, err := jsonparser.GetString(respBody, "message_uuid", "[0]")
180180
if err != nil {
181-
return courier.ErrResponseUnexpectedUnlogged
181+
return courier.ErrResponseContent
182182
}
183183

184184
res.AddExternalID(externalID)

Diff for: ‎handlers/plivo/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ var defaultSendTestCases = []OutgoingTestCase{
151151
},
152152
Body: `{"src":"2020","dst":"250788383383","text":"No External ID","url":"https://localhost/c/pl/8eb23e93-5ecb-45ba-b726-3b064e0c56ab/status","method":"POST"}`,
153153
}},
154-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
154+
ExpectedError: courier.ErrResponseContent,
155155
},
156156
{Label: "Error Sending",
157157
MsgText: "Error Message",

Diff for: ‎handlers/rocketchat/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (h *handler) Send(ctx context.Context, msg courier.MsgOut, res *courier.Sen
140140

141141
msgID, err := jsonparser.GetString(respBody, "id")
142142
if err != nil {
143-
return courier.ErrResponseUnexpectedUnlogged
143+
return courier.ErrResponseContent
144144
}
145145
res.AddExternalID(msgID)
146146

Diff for: ‎handlers/rocketchat/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ var sendTestCases = []OutgoingTestCase{
190190
ExpectedRequests: []ExpectedRequest{{
191191
Body: `{"user":"direct:john.doe","bot":"rocket.cat","text":"Simple Message"}`,
192192
}},
193-
ExpectedError: courier.ErrResponseUnexpectedUnlogged,
193+
ExpectedError: courier.ErrResponseContent,
194194
},
195195
}
196196

Diff for: ‎handlers/slack/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,13 @@ func (h *handler) sendTextMsgPart(msg courier.MsgOut, token string, clog *courie
205205

206206
ok, err := jsonparser.GetBoolean(respBody, "ok")
207207
if err != nil {
208-
return courier.ErrResponseUnexpectedUnlogged
208+
return courier.ErrResponseContent
209209
}
210210

211211
if !ok {
212212
errDescription, err := jsonparser.GetString(respBody, "error")
213213
if err != nil {
214-
return courier.ErrResponseUnexpectedUnlogged
214+
return courier.ErrResponseContent
215215
}
216216
clog.Error(clogs.NewLogError("", "", errDescription))
217217
return courier.ErrFailedWithReason("", errDescription)
@@ -284,7 +284,7 @@ func (h *handler) sendFilePart(msg courier.MsgOut, token string, fileParams *Fil
284284
}
285285

286286
if !fr.OK {
287-
return courier.ErrResponseUnexpectedUnlogged
287+
return courier.ErrResponseContent
288288
}
289289

290290
return nil

0 commit comments

Comments
 (0)