From 6dd6bd848a2fafa8899bad34b1c43e5bfa8c77b0 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Wed, 29 Jan 2020 16:07:19 +0100 Subject: [PATCH] unexport jsch --- {jsch => internal/jsch}/README.md | 0 {jsch => internal/jsch}/consumers.go | 0 {jsch => internal/jsch}/consumers_test.go | 2 +- {jsch => internal/jsch}/events.go | 0 {jsch => internal/jsch}/events_test.go | 2 +- {jsch => internal/jsch}/jsch.go | 0 {jsch => internal/jsch}/jsch_test.go | 2 +- {jsch => internal/jsch}/msginfo.go | 0 {jsch => internal/jsch}/msginfo_test.go | 2 +- {jsch => internal/jsch}/streams.go | 0 {jsch => internal/jsch}/streams_test.go | 2 +- {jsch => internal/jsch}/template_test.go | 2 +- {jsch => internal/jsch}/templates.go | 0 jsm/act_command.go | 2 +- jsm/con_command.go | 2 +- jsm/events_command.go | 2 +- jsm/jsm_test.go | 2 +- jsm/str_command.go | 2 +- jsm/util.go | 2 +- 19 files changed, 12 insertions(+), 12 deletions(-) rename {jsch => internal/jsch}/README.md (100%) rename {jsch => internal/jsch}/consumers.go (100%) rename {jsch => internal/jsch}/consumers_test.go (99%) rename {jsch => internal/jsch}/events.go (100%) rename {jsch => internal/jsch}/events_test.go (97%) rename {jsch => internal/jsch}/jsch.go (100%) rename {jsch => internal/jsch}/jsch_test.go (99%) rename {jsch => internal/jsch}/msginfo.go (100%) rename {jsch => internal/jsch}/msginfo_test.go (93%) rename {jsch => internal/jsch}/streams.go (100%) rename {jsch => internal/jsch}/streams_test.go (99%) rename {jsch => internal/jsch}/template_test.go (98%) rename {jsch => internal/jsch}/templates.go (100%) diff --git a/jsch/README.md b/internal/jsch/README.md similarity index 100% rename from jsch/README.md rename to internal/jsch/README.md diff --git a/jsch/consumers.go b/internal/jsch/consumers.go similarity index 100% rename from jsch/consumers.go rename to internal/jsch/consumers.go diff --git a/jsch/consumers_test.go b/internal/jsch/consumers_test.go similarity index 99% rename from jsch/consumers_test.go rename to internal/jsch/consumers_test.go index 4311c09..aba793f 100644 --- a/jsch/consumers_test.go +++ b/internal/jsch/consumers_test.go @@ -7,7 +7,7 @@ import ( "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func setupConsumerTest(t *testing.T) (*server.Server, *nats.Conn, *jsch.Stream) { diff --git a/jsch/events.go b/internal/jsch/events.go similarity index 100% rename from jsch/events.go rename to internal/jsch/events.go diff --git a/jsch/events_test.go b/internal/jsch/events_test.go similarity index 97% rename from jsch/events_test.go rename to internal/jsch/events_test.go index 72b25ee..07dfca4 100644 --- a/jsch/events_test.go +++ b/internal/jsch/events_test.go @@ -6,7 +6,7 @@ import ( "github.com/nats-io/nats-server/v2/server" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func TestSchemaForEvent(t *testing.T) { diff --git a/jsch/jsch.go b/internal/jsch/jsch.go similarity index 100% rename from jsch/jsch.go rename to internal/jsch/jsch.go diff --git a/jsch/jsch_test.go b/internal/jsch/jsch_test.go similarity index 99% rename from jsch/jsch_test.go rename to internal/jsch/jsch_test.go index df5eff7..a74cf4c 100644 --- a/jsch/jsch_test.go +++ b/internal/jsch/jsch_test.go @@ -23,7 +23,7 @@ import ( natsd "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func startJSServer(t *testing.T) (*natsd.Server, *nats.Conn) { diff --git a/jsch/msginfo.go b/internal/jsch/msginfo.go similarity index 100% rename from jsch/msginfo.go rename to internal/jsch/msginfo.go diff --git a/jsch/msginfo_test.go b/internal/jsch/msginfo_test.go similarity index 93% rename from jsch/msginfo_test.go rename to internal/jsch/msginfo_test.go index 6d05083..a3b08d8 100644 --- a/jsch/msginfo_test.go +++ b/internal/jsch/msginfo_test.go @@ -5,7 +5,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func TestParseJSMsgMetadata(t *testing.T) { diff --git a/jsch/streams.go b/internal/jsch/streams.go similarity index 100% rename from jsch/streams.go rename to internal/jsch/streams.go diff --git a/jsch/streams_test.go b/internal/jsch/streams_test.go similarity index 99% rename from jsch/streams_test.go rename to internal/jsch/streams_test.go index 3e0c8ff..b96c5f5 100644 --- a/jsch/streams_test.go +++ b/internal/jsch/streams_test.go @@ -6,7 +6,7 @@ import ( "github.com/nats-io/nats-server/v2/server" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func TestNewStreamFromDefault(t *testing.T) { diff --git a/jsch/template_test.go b/internal/jsch/template_test.go similarity index 98% rename from jsch/template_test.go rename to internal/jsch/template_test.go index 59efc06..d8143f7 100644 --- a/jsch/template_test.go +++ b/internal/jsch/template_test.go @@ -3,7 +3,7 @@ package jsch_test import ( "testing" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func TestNewStreamTemplate(t *testing.T) { diff --git a/jsch/templates.go b/internal/jsch/templates.go similarity index 100% rename from jsch/templates.go rename to internal/jsch/templates.go diff --git a/jsm/act_command.go b/jsm/act_command.go index c1f1fb1..4be7cac 100644 --- a/jsm/act_command.go +++ b/jsm/act_command.go @@ -19,7 +19,7 @@ import ( "github.com/dustin/go-humanize" "gopkg.in/alecthomas/kingpin.v2" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) type actCmd struct { diff --git a/jsm/con_command.go b/jsm/con_command.go index 6a567bf..8b642d2 100644 --- a/jsm/con_command.go +++ b/jsm/con_command.go @@ -26,7 +26,7 @@ import ( "github.com/nats-io/nats.go" "gopkg.in/alecthomas/kingpin.v2" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) type consumerCmd struct { diff --git a/jsm/events_command.go b/jsm/events_command.go index ed7226a..43c921a 100644 --- a/jsm/events_command.go +++ b/jsm/events_command.go @@ -13,7 +13,7 @@ import ( "github.com/nats-io/nats.go" "gopkg.in/alecthomas/kingpin.v2" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) type eventsCmd struct { diff --git a/jsm/jsm_test.go b/jsm/jsm_test.go index e4f1c76..4fc9422 100644 --- a/jsm/jsm_test.go +++ b/jsm/jsm_test.go @@ -27,7 +27,7 @@ import ( "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func runJsmCli(t *testing.T, args ...string) (output []byte) { diff --git a/jsm/str_command.go b/jsm/str_command.go index ccb4678..7eceea4 100644 --- a/jsm/str_command.go +++ b/jsm/str_command.go @@ -28,7 +28,7 @@ import ( "github.com/xlab/tablewriter" "gopkg.in/alecthomas/kingpin.v2" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) type streamCmd struct { diff --git a/jsm/util.go b/jsm/util.go index e01d75a..9432b6d 100644 --- a/jsm/util.go +++ b/jsm/util.go @@ -25,7 +25,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/nats-io/nats.go" - "github.com/nats-io/jetstream/jsch" + "github.com/nats-io/jetstream/internal/jsch" ) func selectConsumer(stream string, consumer string) (string, error) {