Skip to content

Commit

Permalink
Gorouter uses the updated go-nats client dependency
Browse files Browse the repository at this point in the history
[#152164959]
  • Loading branch information
flawedmatrix committed Dec 5, 2017
1 parent 471dc2e commit 2f297b5
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion common/component.go
Expand Up @@ -18,7 +18,7 @@ import (
"code.cloudfoundry.org/gorouter/logger"
"code.cloudfoundry.org/gorouter/test_util"
"code.cloudfoundry.org/localip"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/uber-go/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion common/component_test.go
Expand Up @@ -5,7 +5,7 @@ import (
"code.cloudfoundry.org/gorouter/common/health"
"code.cloudfoundry.org/gorouter/logger"
"code.cloudfoundry.org/gorouter/test_util"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion main.go
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/cloudfoundry/dropsonde"
"github.com/cloudfoundry/dropsonde/metric_sender"
"github.com/cloudfoundry/dropsonde/metricbatcher"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/uber-go/zap"

"flag"
Expand Down
2 changes: 1 addition & 1 deletion main_test.go
Expand Up @@ -17,7 +17,7 @@ import (
"code.cloudfoundry.org/gorouter/test/common"
"code.cloudfoundry.org/gorouter/test_util"
"code.cloudfoundry.org/localip"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gbytes"
Expand Down
2 changes: 1 addition & 1 deletion mbus/client.go
Expand Up @@ -8,7 +8,7 @@ import (

"code.cloudfoundry.org/gorouter/config"
"code.cloudfoundry.org/gorouter/logger"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/uber-go/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion mbus/fakes/fake_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mbus/subscriber.go
Expand Up @@ -17,7 +17,7 @@ import (
"code.cloudfoundry.org/routing-api/models"

"github.com/mailru/easyjson"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/uber-go/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion mbus/subscriber_test.go
Expand Up @@ -18,7 +18,7 @@ import (
"code.cloudfoundry.org/gorouter/route"
"code.cloudfoundry.org/gorouter/test_util"

"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
2 changes: 1 addition & 1 deletion router/router.go
Expand Up @@ -30,7 +30,7 @@ import (
"code.cloudfoundry.org/gorouter/registry"
"code.cloudfoundry.org/gorouter/varz"
"github.com/armon/go-proxyproto"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/uber-go/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion router/router_drain_test.go
Expand Up @@ -27,7 +27,7 @@ import (
"code.cloudfoundry.org/gorouter/test/common"
"code.cloudfoundry.org/gorouter/test_util"
vvarz "code.cloudfoundry.org/gorouter/varz"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/tedsuo/ifrit"
Expand Down
2 changes: 1 addition & 1 deletion router/router_test.go
Expand Up @@ -35,7 +35,7 @@ import (
"code.cloudfoundry.org/gorouter/test"
"code.cloudfoundry.org/gorouter/test_util"
vvarz "code.cloudfoundry.org/gorouter/varz"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"
Expand Down
2 changes: 1 addition & 1 deletion test/common/app.go
Expand Up @@ -5,7 +5,7 @@ import (

"code.cloudfoundry.org/gorouter/common/uuid"
"code.cloudfoundry.org/gorouter/route"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
. "github.com/onsi/gomega"

"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion test/greet_app.go
Expand Up @@ -7,7 +7,7 @@ import (

"code.cloudfoundry.org/gorouter/route"
"code.cloudfoundry.org/gorouter/test/common"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
)

func NewGreetApp(urls []route.Uri, rPort uint16, mbusClient *nats.Conn, tags map[string]string) *common.TestApp {
Expand Down
2 changes: 1 addition & 1 deletion test/route_service_app.go
Expand Up @@ -6,7 +6,7 @@ import (

"code.cloudfoundry.org/gorouter/route"
"code.cloudfoundry.org/gorouter/test/common"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
)

func NewRouteServiceApp(urls []route.Uri, rPort uint16, mbusClient *nats.Conn, routeService string) *common.TestApp {
Expand Down
2 changes: 1 addition & 1 deletion test/slow_app.go
Expand Up @@ -7,7 +7,7 @@ import (

"code.cloudfoundry.org/gorouter/route"
"code.cloudfoundry.org/gorouter/test/common"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
)

func NewSlowApp(urls []route.Uri, rPort uint16, mbusClient *nats.Conn, delay time.Duration) *common.TestApp {
Expand Down
2 changes: 1 addition & 1 deletion test/sticky_app.go
Expand Up @@ -8,7 +8,7 @@ import (
"code.cloudfoundry.org/gorouter/proxy"
"code.cloudfoundry.org/gorouter/route"
"code.cloudfoundry.org/gorouter/test/common"
"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
)

func NewStickyApp(urls []route.Uri, rPort uint16, mbusClient *nats.Conn, tags map[string]string) *common.TestApp {
Expand Down
2 changes: 1 addition & 1 deletion test/websocket_app.go
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"time"

"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/onsi/ginkgo"

. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test_util/nats_runner.go
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"time"

"github.com/nats-io/nats"
"github.com/nats-io/go-nats"
"github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
Expand Down

0 comments on commit 2f297b5

Please sign in to comment.