Merge branch 'master' into legacy_move

nyaruka · Mar 15, 2018 · d50f3ac · d50f3ac
2 parents a1010ff + 5246eda
commit d50f3ac
Show file tree

Hide file tree

Showing 284 changed files with 136 additions and 77,983 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -29,10 +29,6 @@
   name = "github.com/antlr/antlr4"
   version = "4.7.1"
 
-[[constraint]]
-  name = "github.com/aws/aws-sdk-go"
-  version = "1.13.8"
-
 [[constraint]]
   branch = "master"
   name = "github.com/buger/jsonparser"
@@ -41,30 +37,10 @@
   branch = "master"
   name = "github.com/dustin/go-humanize"
 
-[[constraint]]
-  name = "github.com/garyburd/redigo"
-  version = "1.6.0"
-
-[[constraint]]
-  name = "github.com/gorilla/mux"
-  version = "1.6.1"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/jmoiron/sqlx"
-
 [[constraint]]
   name = "github.com/karlseguin/ccache"
   version = "2.0.2"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/koding/multiconfig"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/lib/pq"
-
 [[constraint]]
   branch = "master"
   name = "github.com/nyaruka/ezconf"
@@ -81,10 +57,6 @@
   name = "github.com/go-chi/chi"
   version = "3.3.2"
 
-[[constraint]]
-  name = "github.com/pressly/lg"
-  version = "1.0.2"
-
 [[constraint]]
   name = "github.com/rakyll/statik"
   version = "0.1.1"

diff --git a/cmd/flowrunner/testdata/flows/all_actions_test.json b/cmd/flowrunner/testdata/flows/all_actions_test.json
@@ -724,9 +724,9 @@
                             "gender": {
                                 "category": "Male",
                                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                "input": "",
                                 "name": "Gender",
                                 "node_uuid": "a58be63b-907d-4a1a-856b-0bb5579d7507",
+                                "operand": "",
                                 "value": "m"
                             }
                         },

diff --git a/cmd/flowrunner/testdata/flows/brochure_test.json b/cmd/flowrunner/testdata/flows/brochure_test.json
@@ -172,9 +172,9 @@
                     "event": {
                         "category": "",
                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                        "input": "Ryan Lewis",
                         "name": "Name",
                         "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
+                        "operand": "Ryan Lewis",
                         "type": "run_result_changed",
                         "value": "Ryan Lewis"
                     },
@@ -322,9 +322,9 @@
                                     {
                                         "category": "",
                                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                        "input": "Ryan Lewis",
                                         "name": "Name",
                                         "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
+                                        "operand": "Ryan Lewis",
                                         "type": "run_result_changed",
                                         "value": "Ryan Lewis"
                                     }
@@ -376,9 +376,9 @@
                         "results": {
                             "name": {
                                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                "input": "Ryan Lewis",
                                 "name": "Name",
                                 "node_uuid": "3dcccbb4-d29c-41dd-a01f-16d814c9ab82",
+                                "operand": "Ryan Lewis",
                                 "value": "Ryan Lewis"
                             }
                         },

diff --git a/cmd/flowrunner/testdata/flows/date_parse_test.json b/cmd/flowrunner/testdata/flows/date_parse_test.json
@@ -163,9 +163,9 @@
                     "event": {
                         "category": "Valid",
                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                        "input": "I was born on 1977.06.23 at 3:34 pm",
                         "name": "Birth Date",
                         "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
+                        "operand": "I was born on 1977.06.23 at 3:34 pm",
                         "type": "run_result_changed",
                         "value": "1977-06-23T15:34:00.000000-05:00"
                     },
@@ -291,9 +291,9 @@
                                     {
                                         "category": "Valid",
                                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                        "input": "I was born on 1977.06.23 at 3:34 pm",
                                         "name": "Birth Date",
                                         "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
+                                        "operand": "I was born on 1977.06.23 at 3:34 pm",
                                         "type": "run_result_changed",
                                         "value": "1977-06-23T15:34:00.000000-05:00"
                                     }
@@ -338,9 +338,9 @@
                             "birth_date": {
                                 "category": "Valid",
                                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                "input": "I was born on 1977.06.23 at 3:34 pm",
                                 "name": "Birth Date",
                                 "node_uuid": "46d51f50-58de-49da-8d13-dadbf322685d",
+                                "operand": "I was born on 1977.06.23 at 3:34 pm",
                                 "value": "1977-06-23T15:34:00.000000-05:00"
                             }
                         },

diff --git a/cmd/flowrunner/testdata/flows/default_result_test.json b/cmd/flowrunner/testdata/flows/default_result_test.json
@@ -159,9 +159,9 @@
                     "event": {
                         "category": "All Responses",
                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                        "input": "Ryan Lewis",
                         "name": "Contact Name",
                         "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
+                        "operand": "Ryan Lewis",
                         "type": "run_result_changed",
                         "value": "Ryan Lewis"
                     },
@@ -299,9 +299,9 @@
                                     {
                                         "category": "All Responses",
                                         "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                        "input": "Ryan Lewis",
                                         "name": "Contact Name",
                                         "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
+                                        "operand": "Ryan Lewis",
                                         "type": "run_result_changed",
                                         "value": "Ryan Lewis"
                                     }
@@ -352,9 +352,9 @@
                             "contact_name": {
                                 "category": "All Responses",
                                 "created_on": "2000-01-01T00:00:00.000000000-00:00",
-                                "input": "Ryan Lewis",
                                 "name": "Contact Name",
                                 "node_uuid": "3a430844-e259-4dcd-9a1d-7bef3168d43f",
+                                "operand": "Ryan Lewis",
                                 "value": "Ryan Lewis"
                             }
                         },