Update project to twilio-go 0.55

Use new saintpete/twilio-go import path and change vendor.json. Update tests to handle new client request.
saintpete · Dec 8, 2016 · f2d754f · f2d754f
1 parent dcce7f8
commit f2d754f
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 49 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,20 +4,17 @@ before submitting changes; run `make race-test` to run the tests.
 The project has gotten really far without using Javascript, and I would like to
 keep it that way.
 
-## Working with Godep
+## Working with govendor
 
 The dependencies for this project move frequently. To add a new dependency,
 check out the dependency locally using `go get <dependency-name>`. Then start
 using it in the project - just add the dependency where you would use it - and
 run `make deps`. This should add the dependency to the `vendor` directory.
 
-To update a dependency, say, `github.com/kevinburke/twilio-go` - update the
-project on your local fork, `$GOPATH/src/github.com/kevinburke/twilio-go` to
+To update a dependency, say, `github.com/saintpete/twilio-go` - update the
+project on your local fork, `$GOPATH/src/github.com/saintpete/twilio-go` to
 the new version you want. Then in the logrole project, run
 
 ```
-godep update github.com/kevinburke/twilio-go
+govendor update github.com/saintpete/twilio-go
 ```
-
-This should update the version of the project in the `vendor` directory, and
-update Godeps.json to the latest version.
diff --git a/cache/cache_test.go b/cache/cache_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/test"
 )
 

diff --git a/commands/logrole_server/main.go b/commands/logrole_server/main.go
@@ -13,7 +13,7 @@ import (
 
 	log "github.com/inconshreveable/log15"
 	"github.com/kevinburke/handlers"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/server"
 	"github.com/saintpete/logrole/services"

diff --git a/config/settings.go b/config/settings.go
@@ -11,7 +11,7 @@ import (
 
 	log "github.com/inconshreveable/log15"
 	"github.com/kevinburke/handlers"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/services"
 	yaml "gopkg.in/yaml.v2"
 )

diff --git a/server/alerts.go b/server/alerts.go
@@ -14,7 +14,7 @@ import (
 	log "github.com/inconshreveable/log15"
 	types "github.com/kevinburke/go-types"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/server/audio.go b/server/audio.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"regexp"
 
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/views"
 )
 

diff --git a/server/calls.go b/server/calls.go
@@ -14,7 +14,7 @@ import (
 	log "github.com/inconshreveable/log15"
 	types "github.com/kevinburke/go-types"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/server/calls_test.go b/server/calls_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestGetFiltersGeneratesCorrectQuery(t *testing.T) {
 	t.Parallel()
-	expected := "/Accounts/AC123/Calls.json?PageSize=1&StartTime%3C=2016-10-28&StartTime%3E=2016-10-27"
+	expected := "/2010-04-01/Accounts/AC123/Calls.json?PageSize=1&StartTime%3C=2016-10-28&StartTime%3E=2016-10-27"
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.String() != expected {
 			t.Errorf("expected URL to be %s, got %s", expected, r.URL.String())
@@ -40,7 +40,7 @@ func TestGetFiltersGeneratesCorrectQuery(t *testing.T) {
 
 func TestNoEndGeneratesCorrectQuery(t *testing.T) {
 	t.Parallel()
-	expected := "/Accounts/AC123/Calls.json?PageSize=1&StartTime%3E=2016-10-27"
+	expected := "/2010-04-01/Accounts/AC123/Calls.json?PageSize=1&StartTime%3E=2016-10-27"
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.String() != expected {
 			t.Errorf("expected URL to be %s, got %s", expected, r.URL.String())

diff --git a/server/conferences.go b/server/conferences.go
@@ -13,7 +13,7 @@ import (
 	log "github.com/inconshreveable/log15"
 	types "github.com/kevinburke/go-types"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/server/conferences_test.go b/server/conferences_test.go
@@ -49,7 +49,7 @@ func TestUnauthorizedUserCantViewConferenceInstance(t *testing.T) {
 
 func TestGetConferenceFiltersGeneratesCorrectQuery(t *testing.T) {
 	t.Parallel()
-	expected := "/Accounts/AC123/Conferences.json?DateCreated%3C=2016-10-28&DateCreated%3E=2016-10-27&PageSize=1"
+	expected := "/2010-04-01/Accounts/AC123/Conferences.json?DateCreated%3C=2016-10-28&DateCreated%3E=2016-10-27&PageSize=1"
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.String() != expected {
 			t.Errorf("expected URL to be %s, got %s", expected, r.URL.String())

diff --git a/server/images.go b/server/images.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/kevinburke/handlers"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/services"
 )
 

diff --git a/server/messages.go b/server/messages.go
@@ -13,7 +13,7 @@ import (
 	log "github.com/inconshreveable/log15"
 	types "github.com/kevinburke/go-types"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/server/messages_test.go b/server/messages_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	log "github.com/inconshreveable/log15"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/test"

diff --git a/server/page.go b/server/page.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/services"
 )
 

diff --git a/server/phonenumbers.go b/server/phonenumbers.go
@@ -15,7 +15,7 @@ import (
 	log "github.com/inconshreveable/log15"
 	types "github.com/kevinburke/go-types"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/server/search.go b/server/search.go
@@ -7,7 +7,7 @@ import (
 
 	log "github.com/inconshreveable/log15"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 )
 
 type searchServer struct {

diff --git a/templates/opensource.html b/templates/opensource.html
@@ -71,7 +71,7 @@
     licenses follow.
     </p>
     <ul>
-      <li><a href="https://github.com/kevinburke/twilio-go">kevinburke/twilio-go</a>
+      <li><a href="https://github.com/saintpete/twilio-go">saintpete/twilio-go</a>
       <li><a href="https://github.com/kevinburke/rest">kevinburke/rest</a>
       <li><a href="https://github.com/kevinburke/handlers">kevinburke/handlers</a>
     </ul>

diff --git a/test/harness/harness.go b/test/harness/harness.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	log "github.com/inconshreveable/log15"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -44,19 +44,19 @@
 			"revisionTime": "2016-08-03T20:04:08Z"
 		},
 		{
-			"checksumSHA1": "oJGkod8y/3GTbKfazzQM+nQOPR0=",
+			"checksumSHA1": "G1efmMBnHBurWXQ/Vnq9WrcfXPs=",
 			"path": "github.com/golang/protobuf/proto",
 			"revision": "2bc9827a78f95c6665b5fe0abd1fd66b496ae2d8",
 			"revisionTime": "2016-11-03T22:44:32Z"
 		},
 		{
-			"checksumSHA1": "N1DR/GS+xQn4Mu99EPZcxuLaU1s=",
+			"checksumSHA1": "mrmfY0cVu7jvgoIuTRaR8yVVh/M=",
 			"path": "github.com/inconshreveable/log15",
 			"revision": "46a701a619de90c65a78c04d1a58bf02585e9701",
 			"revisionTime": "2016-10-26T22:19:13Z"
 		},
 		{
-			"checksumSHA1": "6wyoe7o8yazamauC+zbnYkkErgA=",
+			"checksumSHA1": "h6Z9k1TFjDjY4ktETMw8LlXygW8=",
 			"path": "github.com/inconshreveable/log15/term",
 			"revision": "46a701a619de90c65a78c04d1a58bf02585e9701",
 			"revisionTime": "2016-10-26T22:19:13Z"
@@ -85,24 +85,24 @@
 			"revision": "3e1a181ba70d885d80a05a330225d01e36d1ff23",
 			"revisionTime": "2016-10-29T15:46:50Z"
 		},
-		{
-			"checksumSHA1": "nJGwVYHYDkRurEGGuORh7U6EDH8=",
-			"path": "github.com/kevinburke/twilio-go",
-			"revision": "32554d294f151c6f43ac35b9051c31ef98feee05",
-			"revisionTime": "2016-11-09T08:31:54Z"
-		},
 		{
 			"checksumSHA1": "I4njd26dG5hxFT2nawuByM4pxzY=",
 			"path": "github.com/mattn/go-colorable",
 			"revision": "d228849504861217f796da67fae4f6e347643f15",
 			"revisionTime": "2016-11-03T16:00:40Z"
 		},
 		{
-			"checksumSHA1": "xZuhljnmBysJPta/lMyYmJdujCg=",
+			"checksumSHA1": "1otkAg+0Q9NksNSuQ3ijCW0xHxE=",
 			"path": "github.com/mattn/go-isatty",
 			"revision": "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8",
 			"revisionTime": "2016-08-06T12:27:52Z"
 		},
+		{
+			"checksumSHA1": "Fzu1HJOTox+yuh6q6ODDnqGqV44=",
+			"path": "github.com/saintpete/twilio-go",
+			"revision": "9a4eeb51fa469e798d925730b7d969093081b72b",
+			"revisionTime": "2016-12-08T01:18:00Z"
+		},
 		{
 			"checksumSHA1": "zmC8/3V4ls53DJlNTKDZwPSC/dA=",
 			"path": "github.com/satori/go.uuid",
@@ -128,13 +128,13 @@
 			"revisionTime": "2016-10-31T15:37:30Z"
 		},
 		{
-			"checksumSHA1": "x7EiaCEsuaZ3jc8r+8KBmYwESmA=",
+			"checksumSHA1": "fhDMA7oZvXw3IVdRZEs9YIsrPFk=",
 			"path": "golang.org/x/crypto/poly1305",
 			"revision": "9477e0b78b9ac3d0b03822fd95422e2fe07627cd",
 			"revisionTime": "2016-10-31T15:37:30Z"
 		},
 		{
-			"checksumSHA1": "w8PESKJweP+BCAxCYPU1QC08qUU=",
+			"checksumSHA1": "eN6qQZ8zw3N4v1keW4IUCKRsZWk=",
 			"path": "golang.org/x/crypto/salsa20/salsa",
 			"revision": "9477e0b78b9ac3d0b03822fd95422e2fe07627cd",
 			"revisionTime": "2016-10-31T15:37:30Z"
@@ -152,13 +152,13 @@
 			"revisionTime": "2016-11-01T21:56:08Z"
 		},
 		{
-			"checksumSHA1": "XH7CgbL5Z8COUc+MKrYqS3FFosY=",
+			"checksumSHA1": "hyK05cmzm+vPH1OO+F1AkvES3sw=",
 			"path": "golang.org/x/oauth2",
 			"revision": "d5040cddfc0da40b408c9a1da4728662435176a9",
 			"revisionTime": "2016-11-03T22:50:36Z"
 		},
 		{
-			"checksumSHA1": "PoyV7Nub4q+mUX6Jo/TSYcqn8sk=",
+			"checksumSHA1": "oecZumjzvtTWER8GcKRiSMsQtzY=",
 			"path": "golang.org/x/oauth2/google",
 			"revision": "d5040cddfc0da40b408c9a1da4728662435176a9",
 			"revisionTime": "2016-11-03T22:50:36Z"
@@ -194,7 +194,7 @@
 			"revisionTime": "2016-11-07T22:51:02Z"
 		},
 		{
-			"checksumSHA1": "gYHoPrPncGO926bN0jr1rzDxBQU=",
+			"checksumSHA1": "KSDkO914wpcLrriyQpbW8yFuv98=",
 			"path": "google.golang.org/appengine/internal",
 			"revision": "c7b8227c83007befd67b324a64c969ebc1d7475d",
 			"revisionTime": "2016-11-07T22:51:02Z"

diff --git a/views/alert.go b/views/alert.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/alert_test.go b/views/alert_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/call.go b/views/call.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/client.go b/views/client.go
@@ -18,7 +18,7 @@ import (
 	"github.com/golang/groupcache/singleflight"
 	log "github.com/inconshreveable/log15"
 	"github.com/kevinburke/rest"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/cache"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"

diff --git a/views/conference.go b/views/conference.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/example_test.go b/views/example_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/kevinburke/handlers"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 	"github.com/saintpete/logrole/views"

diff --git a/views/message.go b/views/message.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/numbers.go b/views/numbers.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 )
 

diff --git a/views/recording.go b/views/recording.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	types "github.com/kevinburke/go-types"
-	twilio "github.com/kevinburke/twilio-go"
+	twilio "github.com/saintpete/twilio-go"
 	"github.com/saintpete/logrole/config"
 	"github.com/saintpete/logrole/services"
 )