Update nats references to go-nats

Signed-off-by: Tyler Schultz <tschultz@pivotal.io>

.gitmodules

@@ -145,9 +145,6 @@
 [submodule "src/github.com/nats-io/go-nats"]
 	path = src/github.com/nats-io/go-nats
 	url = https://github.com/nats-io/go-nats
-[submodule "src/github.com/nats-io/nats"]
-	path = src/github.com/nats-io/nats
-	url = https://github.com/nats-io/nats
 [submodule "src/github.com/nats-io/nuid"]
 	path = src/github.com/nats-io/nuid
 	url = https://github.com/nats-io/nuid

packages/performance-test-sd/spec

@@ -13,14 +13,14 @@ files:
   - github.com/nats-io/gnatsd/vendor/golang.org/x/crypto/bcrypt/*.go # gosub
   - github.com/nats-io/gnatsd/vendor/golang.org/x/crypto/blowfish/*.go # gosub
   - github.com/nats-io/go-nats/*.go # gosub
+  - github.com/nats-io/go-nats/bench/*.go # gosub
   - github.com/nats-io/go-nats/encoders/builtin/*.go # gosub
   - github.com/nats-io/go-nats/util/*.go # gosub
   - github.com/nats-io/nats-top/util/*.go # gosub
   - github.com/nats-io/nats-top/vendor/github.com/nats-io/gnatsd/conf/*.go # gosub
   - github.com/nats-io/nats-top/vendor/github.com/nats-io/gnatsd/server/*.go # gosub
   - github.com/nats-io/nats-top/vendor/github.com/nats-io/gnatsd/server/pse/*.go # gosub
   - github.com/nats-io/nats-top/vendor/github.com/nats-io/gnatsd/vendor/github.com/nats-io/nuid/*.go # gosub
-  - github.com/nats-io/nats/bench/*.go # gosub
   - github.com/nats-io/nuid/*.go # gosub
   - github.com/onsi/ginkgo/*.go # gosub
   - github.com/onsi/ginkgo/config/*.go # gosub

packages/policy-server/spec

@@ -62,6 +62,7 @@ files:
   - policy-server/cmd/policy-server/*.go # gosub
   - policy-server/cmd/policy-server-internal/*.go # gosub
   - policy-server/config/*.go # gosub
+  - policy-server/db/*.go # gosub
   - policy-server/handlers/*.go # gosub
   - policy-server/middleware/*.go # gosub
   - policy-server/server_metrics/*.go # gosub

packages/service-discovery-controller/spec

@@ -30,9 +30,9 @@ files:
   - github.com/gogo/protobuf/gogoproto/*.go # gosub
   - github.com/gogo/protobuf/proto/*.go # gosub
   - github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub
+  - github.com/nats-io/go-nats/*.go # gosub
   - github.com/nats-io/go-nats/encoders/builtin/*.go # gosub
   - github.com/nats-io/go-nats/util/*.go # gosub
-  - github.com/nats-io/nats/*.go # gosub
   - github.com/nats-io/nuid/*.go # gosub
   - github.com/nu7hatch/gouuid/*.go # gosub
   - github.com/pivotal-cf/paraphernalia/secure/tlsconfig/*.go # gosub

src/policy-server/store/migrations/migrate_adapter_test.go

@@ -28,12 +28,5 @@ var _ = Describe("MigrateAdapter", func() {
 				Expect(err).To(MatchError("down migration not supported"))
 			})
 		})
-		Context("when the passed in database is not a sqlx.DB", func() {
-			It("returns an error", func() {
-				fakeMigrationDb := &fakes.MigrationDb{}
-				_, err := migrateAdapter.ExecMax(fakeMigrationDb, "some-dialect", migrate.MemoryMigrationSource{}, migrate.Up, 0)
-				Expect(err).To(MatchError("unable to adapt for db migration"))
-			})
-		})
 	})
 })

src/route_populator/main.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/nats-io/nats"
+	"github.com/nats-io/go-nats"
 )
 
 var natsEndpoint = flag.String(

src/service-discovery-controller/main_test.go

@@ -19,7 +19,7 @@ import (
 
 	"code.cloudfoundry.org/cf-networking-helpers/testsupport/ports"
 	"github.com/nats-io/gnatsd/server"
-	"github.com/nats-io/nats"
+	"github.com/nats-io/go-nats"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"

src/service-discovery-controller/mbus/nats_conn_provider.go

@@ -1,6 +1,6 @@
 package mbus
 
-import "github.com/nats-io/nats"
+import "github.com/nats-io/go-nats"
 
 type NatsConnWithUrlProvider struct {
 	Url string

src/service-discovery-controller/mbus/nats_conn_provider_test.go

@@ -3,7 +3,7 @@ package mbus_test
 import (
 	"code.cloudfoundry.org/cf-networking-helpers/testsupport/ports"
 	"github.com/nats-io/gnatsd/server"
-	"github.com/nats-io/nats"
+	"github.com/nats-io/go-nats"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "service-discovery-controller/mbus"

src/service-discovery-controller/mbus/subscriber.go

@@ -14,14 +14,10 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	"code.cloudfoundry.org/lager"
-	"github.com/nats-io/nats"
+	"github.com/nats-io/go-nats"
 	"github.com/pkg/errors"
 )
 
-const (
-	registerMessagesReceived = "registerMessagesReceived"
-)
-
 type ServiceDiscoveryStartMessage struct {
 	Id                               string `json:"id"`
 	Host                             string `json:"host"`

src/service-discovery-controller/mbus/subscriber_test.go

@@ -13,7 +13,7 @@ import (
 	"code.cloudfoundry.org/clock/fakeclock"
 	"code.cloudfoundry.org/lager"
 	"github.com/nats-io/gnatsd/server"
-	"github.com/nats-io/nats"
+	"github.com/nats-io/go-nats"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"

src/test/performance-sd/nats_performance_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/montanaflynn/stats"
 	"github.com/nats-io/gnatsd/server"
 	"github.com/nats-io/go-nats"
+	"github.com/nats-io/go-nats/bench"
 	"github.com/nats-io/nats-top/util"
-	"github.com/nats-io/nats/bench"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )