reorder v5

mtryfoss · Mar 7, 2020 · 35a3fea · 35a3fea
1 parent f72edf5
commit 35a3fea
Show file tree

Hide file tree

Showing 181 changed files with 83 additions and 10,868 deletions.
diff --git a/README.md b/README.md
@@ -55,29 +55,19 @@ You may need to explicitly install dependencies for this to work
 
 ## Client library
 
-`ari-proxy` uses semantic versioning and [dep](https://github.com/golang/dep).
-To use it in your own Go package, simply reference the
-`github.com/CyCoreSystems/ari-proxy/client` package, and your dependency management
-tool should be able to manage it.
-
-For manual dependency management:
-
-```
-  go get github.com/CyCoreSystems/ari-proxy
-  cd $GOPATH/github.com/CyCoreSystems/ari-proxy
-  dep ensure
-```
-
-`master` should be the latest stable, so a simple `go get` is required:
+`ari-proxy` uses semantic versioning and standard Go modules.  To use it in your
+own Go package, simply reference the
+`github.com/CyCoreSystems/ari-proxy/client/v5` package, and your dependency
+management tool should be able to manage it.
 
 ### Usage
 
 Connecting the client to NATS is simple:
 
 ```go
 import (
-   "github.com/CyCoreSystems/ari"
-   "github.com/CyCoreSystems/ari-proxy/client"
+   "github.com/CyCoreSystems/ari/v5"
+   "github.com/CyCoreSystems/ari-proxy/v5/client"
 )
 
 func connect(ctx context.Context, appName string) (ari.Client,error) {

diff --git a/_examples/bridge/main.go b/_examples/bridge/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari-proxy/client"
+	"github.com/CyCoreSystems/ari-proxy/v5/client"
 	rid "github.com/CyCoreSystems/ari-rid"
 	"github.com/CyCoreSystems/ari/v5"
 	"github.com/CyCoreSystems/ari/v5/ext/play"

diff --git a/_examples/play/main.go b/_examples/play/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari-proxy/client"
+	"github.com/CyCoreSystems/ari-proxy/v5/client"
 	"github.com/CyCoreSystems/ari/v5"
 	"github.com/CyCoreSystems/ari/v5/ext/play"
 )

diff --git a/_examples/record/main.go b/_examples/record/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/inconshreveable/log15"
 
-	"github.com/CyCoreSystems/ari-proxy/client"
+	"github.com/CyCoreSystems/ari-proxy/v5/client"
 	"github.com/CyCoreSystems/ari/v5"
 	"github.com/CyCoreSystems/ari/v5/ext/record"
 )

diff --git a/_examples/stasisStart/main.go b/_examples/stasisStart/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/CyCoreSystems/ari-proxy/client"
+	"github.com/CyCoreSystems/ari-proxy/v5/client"
 	"github.com/CyCoreSystems/ari/v5"
 	"github.com/CyCoreSystems/ari/v5/client/native"
 

diff --git a/client/application.go b/client/application.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/application_test.go b/client/application_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestApplicationList(t *testing.T) {

diff --git a/client/asterisk.go b/client/asterisk.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/asterisk_test.go b/client/asterisk_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestAsteriskInfo(t *testing.T) {

diff --git a/client/bridge.go b/client/bridge.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	rid "github.com/CyCoreSystems/ari-rid"
 	"github.com/CyCoreSystems/ari/v5"
 )

diff --git a/client/bridge_test.go b/client/bridge_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestBridgeCreate(t *testing.T) {

diff --git a/client/channel.go b/client/channel.go
@@ -3,7 +3,7 @@ package client
 import (
 	"time"
 
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	rid "github.com/CyCoreSystems/ari-rid"
 	"github.com/CyCoreSystems/ari/v5"
 )

diff --git a/client/channel_test.go b/client/channel_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestChannelData(t *testing.T) {

diff --git a/client/client.go b/client/client.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/CyCoreSystems/ari-proxy/client/bus"
-	"github.com/CyCoreSystems/ari-proxy/client/cluster"
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/client/bus"
+	"github.com/CyCoreSystems/ari-proxy/v5/client/cluster"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	rid "github.com/CyCoreSystems/ari-rid"
 	"github.com/CyCoreSystems/ari/v5"
 

diff --git a/client/clientserver_test.go b/client/clientserver_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/CyCoreSystems/ari-proxy/server"
+	"github.com/CyCoreSystems/ari-proxy/v5/server"
 	rid "github.com/CyCoreSystems/ari-rid"
 	"github.com/CyCoreSystems/ari/v5"
 	"github.com/nats-io/nats.go"

diff --git a/client/config.go b/client/config.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/config_test.go b/client/config_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestConfigData(t *testing.T) {

diff --git a/client/device.go b/client/device.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/device_test.go b/client/device_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestDeviceData(t *testing.T) {

diff --git a/client/endpoint.go b/client/endpoint.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/endpoint_test.go b/client/endpoint_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestEndpointList(t *testing.T) {

diff --git a/client/liveRecording.go b/client/liveRecording.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/liveRecording_test.go b/client/liveRecording_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestLiveRecordingData(t *testing.T) {

diff --git a/client/logging.go b/client/logging.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/logging_test.go b/client/logging_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestLoggingList(t *testing.T) {

diff --git a/client/mailbox.go b/client/mailbox.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/mailbox_test.go b/client/mailbox_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestMailboxList(t *testing.T) {

diff --git a/client/modules.go b/client/modules.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/modules_test.go b/client/modules_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestModulesData(t *testing.T) {

diff --git a/client/playback.go b/client/playback.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/playback_test.go b/client/playback_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestPlaybackData(t *testing.T) {

diff --git a/client/sound.go b/client/sound.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/client/sound_test.go b/client/sound_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestSoundData(t *testing.T) {

diff --git a/client/storedRecording.go b/client/storedRecording.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 	"github.com/CyCoreSystems/ari/v5"
 )
 

diff --git a/cmd.go b/cmd.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/CyCoreSystems/ari-proxy/server"
+	"github.com/CyCoreSystems/ari-proxy/v5/server"
 	"github.com/CyCoreSystems/ari/v5/client/native"
 
 	"github.com/inconshreveable/log15"

diff --git a/docker_login b/docker_login
diff --git a/go.mod b/go.mod
@@ -1,11 +1,11 @@
-module github.com/CyCoreSystems/ari-proxy
+module github.com/CyCoreSystems/ari-proxy/v5
 
 go 1.13
 
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/CyCoreSystems/ari-rid v0.1.0
-	github.com/CyCoreSystems/ari/v5 v5.0.1
+	github.com/CyCoreSystems/ari/v5 v5.0.3
 	github.com/fsnotify/fsnotify v0.0.0-20170329110642-4da3e2cfbabc // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/hashicorp/hcl v0.0.0-20170509225359-392dba7d905e // indirect

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/CyCoreSystems/ari-rid v0.1.0 h1:QSn7/1Jc0b3Se/LIaMa9taGxC9n/zyBlCEw9Conrdrk=
 github.com/CyCoreSystems/ari-rid v0.1.0/go.mod h1:vFD6moqOBGXaUM28Yck9X16+5cj+NbFmiyCvpUYuKr4=
-github.com/CyCoreSystems/ari/v5 v5.0.1 h1:TfJOwETj6MumVBJPnZJoYqLtfUAo7W8FKnnssMlQ8PM=
-github.com/CyCoreSystems/ari/v5 v5.0.1/go.mod h1:5fdxhNmHG+sUJkeIgPfMafi7d7Ec1B8QpPSCFvDDVc0=
+github.com/CyCoreSystems/ari/v5 v5.0.3 h1:WF0J0lA4uSgV5Sk9t3V0vtRh6NPonYeRoHTJVXMMMzE=
+github.com/CyCoreSystems/ari/v5 v5.0.3/go.mod h1:5fdxhNmHG+sUJkeIgPfMafi7d7Ec1B8QpPSCFvDDVc0=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/server/application.go b/server/application.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/CyCoreSystems/ari-proxy/proxy"
+	"github.com/CyCoreSystems/ari-proxy/v5/proxy"
 )
 
 func (s *Server) applicationData(ctx context.Context, reply string, req *proxy.Request) {

diff --git a/server/application_test.go b/server/application_test.go
@@ -3,7 +3,7 @@ package server
 import (
 	"testing"
 
-	"github.com/CyCoreSystems/ari-proxy/internal/integration"
+	"github.com/CyCoreSystems/ari-proxy/v5/internal/integration"
 )
 
 func TestApplicationList(t *testing.T) {