Merge pull request #544 from nyaruka/latest_goflow

Update to latest goflow that changes webhook services

Author: rowanseymour

core/crons/end_incidents_test.go

@@ -35,7 +35,7 @@ func TestEndIncidents(t *testing.T) {
 		for i := range evts {
 			req, _ := http.NewRequest("GET", "http://example.com", nil)
 			trace := &httpx.Trace{Request: req, StartTime: dates.Now(), EndTime: dates.Now().Add(elapsed)}
-			evts[i] = events.NewWebhookCalled(&flows.WebhookCall{Trace: trace}, flows.CallStatusSuccess, "")
+			evts[i] = events.NewWebhookCalled(trace, flows.CallStatusSuccess, "")
 		}
 		return evts
 	}

core/handlers/webhook_called_test.go

@@ -102,16 +102,14 @@ type failingWebhookService struct {
 	delay time.Duration
 }
 
-func (s *failingWebhookService) Call(request *http.Request) (*flows.WebhookCall, error) {
-	return &flows.WebhookCall{
-		Trace: &httpx.Trace{
-			Request:       request,
-			RequestTrace:  []byte(`GET http://rapidpro.io/`),
-			Response:      nil,
-			ResponseTrace: nil,
-			StartTime:     dates.Now(),
-			EndTime:       dates.Now().Add(s.delay),
-		},
+func (s *failingWebhookService) Call(request *http.Request) (*httpx.Trace, error) {
+	return &httpx.Trace{
+		Request:       request,
+		RequestTrace:  []byte(`GET http://rapidpro.io/`),
+		Response:      nil,
+		ResponseTrace: nil,
+		StartTime:     dates.Now(),
+		EndTime:       dates.Now().Add(s.delay),
 	}, nil
 }
 

core/models/incident_test.go

@@ -112,7 +112,7 @@ func TestWebhookNode(t *testing.T) {
 		for i := range evts {
 			req, _ := http.NewRequest("GET", "http://example.com", nil)
 			trace := &httpx.Trace{Request: req, StartTime: dates.Now(), EndTime: dates.Now().Add(elapsed)}
-			evts[i] = events.NewWebhookCalled(&flows.WebhookCall{Trace: trace}, flows.CallStatusSuccess, "")
+			evts[i] = events.NewWebhookCalled(trace, flows.CallStatusSuccess, "")
 		}
 		return evts
 	}

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/nyaruka/ezconf v0.3.0
 	github.com/nyaruka/gocommon v1.61.1
-	github.com/nyaruka/goflow v0.235.4
+	github.com/nyaruka/goflow v0.236.0
 	github.com/nyaruka/null/v3 v3.0.0
 	github.com/nyaruka/redisx v0.9.0
 	github.com/nyaruka/rp-indexer/v10 v10.1.1

go.sum

@@ -210,8 +210,8 @@ github.com/nyaruka/ezconf v0.3.0 h1:kGvJqVN8AHowb4HdaHAviJ0Z3yI5Pyekp1WqibFEaGk=
 github.com/nyaruka/ezconf v0.3.0/go.mod h1:89GUW6EPRNLIxT7lC4LWnjWTgZeQwRoX7lBmc8ralAU=
 github.com/nyaruka/gocommon v1.61.1 h1:qulMx0jHDWoDagCJbVs7CMLZA33jfa5kYutlXR66pHM=
 github.com/nyaruka/gocommon v1.61.1/go.mod h1:HcwpCzwt8XK7SxmGHYRF1R9viOAvlU7VtXTGuEmJx/8=
-github.com/nyaruka/goflow v0.235.4 h1:9LDmUQc47rn3p91At2JbnGbJs6FOngGVMG3o4eT8Qoo=
-github.com/nyaruka/goflow v0.235.4/go.mod h1:m0bwl9WfJhBQHeabOGnWoyy6n5GXaoU27iE7X3hDkeg=
+github.com/nyaruka/goflow v0.236.0 h1:5B4+sGH5PncG7vc+mxNh2wSu8fklwdJI4i34dqiU+CY=
+github.com/nyaruka/goflow v0.236.0/go.mod h1:m0bwl9WfJhBQHeabOGnWoyy6n5GXaoU27iE7X3hDkeg=
 github.com/nyaruka/null/v2 v2.0.3 h1:rdmMRQyVzrOF3Jff/gpU/7BDR9mQX0lcLl4yImsA3kw=
 github.com/nyaruka/null/v2 v2.0.3/go.mod h1:OCVeCkCXwrg5/qE6RU0c1oUVZBy+ZDrT+xYg1XSaIWA=
 github.com/nyaruka/null/v3 v3.0.0 h1:JvOiNuKmRBFHxzZFt4sWii+ewmMkCQ1vO7X0clTNn6E=