Move pkg stuff under pulsar/internal (#132)
* Move pkg stuff under pulsar/internal
* Fixed exclude path
diff --git a/integration-tests/license_test.go b/integration-tests/license_test.go
index 2613e25..02794de 100644
--- a/integration-tests/license_test.go
+++ b/integration-tests/license_test.go
@@ -65,7 +65,7 @@
`)
var skip = map[string]bool{
- "../pkg/pb/PulsarApi.pb.go": true,
+ "../pulsar/internal/pb/PulsarApi.pb.go": true,
}
func TestLicense(t *testing.T) {
diff --git a/pulsar/client.go b/pulsar/client.go
index 6916371..36c69a6 100644
--- a/pulsar/client.go
+++ b/pulsar/client.go
@@ -20,7 +20,7 @@
import (
"time"
- "github.com/apache/pulsar-client-go/pkg/auth"
+ "github.com/apache/pulsar-client-go/pulsar/internal/auth"
)
func NewClient(options ClientOptions) (Client, error) {
diff --git a/pulsar/client_impl.go b/pulsar/client_impl.go
index d0c36fe..6e8a910 100644
--- a/pulsar/client_impl.go
+++ b/pulsar/client_impl.go
@@ -26,9 +26,9 @@
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/auth"
- "github.com/apache/pulsar-client-go/pkg/pb"
"github.com/apache/pulsar-client-go/pulsar/internal"
+ "github.com/apache/pulsar-client-go/pulsar/internal/auth"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
type client struct {
diff --git a/pulsar/consumer_impl.go b/pulsar/consumer_impl.go
index 752b0f3..61c27a7 100644
--- a/pulsar/consumer_impl.go
+++ b/pulsar/consumer_impl.go
@@ -27,8 +27,8 @@
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/pb"
"github.com/apache/pulsar-client-go/pulsar/internal"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
var ErrConsumerClosed = errors.New("consumer closed")
diff --git a/pulsar/consumer_partition.go b/pulsar/consumer_partition.go
index 68ee7af..81cb9ad 100644
--- a/pulsar/consumer_partition.go
+++ b/pulsar/consumer_partition.go
@@ -26,9 +26,9 @@
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/compression"
- "github.com/apache/pulsar-client-go/pkg/pb"
"github.com/apache/pulsar-client-go/pulsar/internal"
+ "github.com/apache/pulsar-client-go/pulsar/internal/compression"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
var (
diff --git a/pulsar/helper.go b/pulsar/helper.go
index 2591f52..5c9b54d 100644
--- a/pulsar/helper.go
+++ b/pulsar/helper.go
@@ -24,8 +24,8 @@
"github.com/golang/protobuf/proto"
- "github.com/apache/pulsar-client-go/pkg/pb"
"github.com/apache/pulsar-client-go/pulsar/internal"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
// NewUnexpectedErrMsg instantiates an ErrUnexpectedMsg error.
diff --git a/pulsar/impl_message.go b/pulsar/impl_message.go
index b79f346..cbd5c5d 100644
--- a/pulsar/impl_message.go
+++ b/pulsar/impl_message.go
@@ -25,7 +25,7 @@
"github.com/golang/protobuf/proto"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
type messageID struct {
diff --git a/pkg/auth/disabled.go b/pulsar/internal/auth/disabled.go
similarity index 100%
rename from pkg/auth/disabled.go
rename to pulsar/internal/auth/disabled.go
diff --git a/pkg/auth/provider.go b/pulsar/internal/auth/provider.go
similarity index 100%
rename from pkg/auth/provider.go
rename to pulsar/internal/auth/provider.go
diff --git a/pkg/auth/tls.go b/pulsar/internal/auth/tls.go
similarity index 100%
rename from pkg/auth/tls.go
rename to pulsar/internal/auth/tls.go
diff --git a/pkg/auth/token.go b/pulsar/internal/auth/token.go
similarity index 100%
rename from pkg/auth/token.go
rename to pulsar/internal/auth/token.go
diff --git a/pulsar/internal/batch_builder.go b/pulsar/internal/batch_builder.go
index c3dffbd..4b19438 100644
--- a/pulsar/internal/batch_builder.go
+++ b/pulsar/internal/batch_builder.go
@@ -21,8 +21,8 @@
"fmt"
"time"
- "github.com/apache/pulsar-client-go/pkg/compression"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/compression"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
diff --git a/pulsar/internal/commands.go b/pulsar/internal/commands.go
index 2880170..874d4cd 100644
--- a/pulsar/internal/commands.go
+++ b/pulsar/internal/commands.go
@@ -25,7 +25,7 @@
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
const (
diff --git a/pkg/compression/compression.go b/pulsar/internal/compression/compression.go
similarity index 100%
rename from pkg/compression/compression.go
rename to pulsar/internal/compression/compression.go
diff --git a/pkg/compression/compression_test.go b/pulsar/internal/compression/compression_test.go
similarity index 100%
rename from pkg/compression/compression_test.go
rename to pulsar/internal/compression/compression_test.go
diff --git a/pkg/compression/lz4.go b/pulsar/internal/compression/lz4.go
similarity index 100%
rename from pkg/compression/lz4.go
rename to pulsar/internal/compression/lz4.go
diff --git a/pkg/compression/noop.go b/pulsar/internal/compression/noop.go
similarity index 100%
rename from pkg/compression/noop.go
rename to pulsar/internal/compression/noop.go
diff --git a/pkg/compression/zlib.go b/pulsar/internal/compression/zlib.go
similarity index 100%
rename from pkg/compression/zlib.go
rename to pulsar/internal/compression/zlib.go
diff --git a/pkg/compression/zstd.go b/pulsar/internal/compression/zstd.go
similarity index 100%
rename from pkg/compression/zstd.go
rename to pulsar/internal/compression/zstd.go
diff --git a/pulsar/internal/connection.go b/pulsar/internal/connection.go
index 35835ab..e18840c 100644
--- a/pulsar/internal/connection.go
+++ b/pulsar/internal/connection.go
@@ -32,8 +32,8 @@
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/auth"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/auth"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
type TLSOptions struct {
diff --git a/pulsar/internal/connection_pool.go b/pulsar/internal/connection_pool.go
index 4802e23..e07b23b 100644
--- a/pulsar/internal/connection_pool.go
+++ b/pulsar/internal/connection_pool.go
@@ -21,7 +21,7 @@
"net/url"
"sync"
- "github.com/apache/pulsar-client-go/pkg/auth"
+ "github.com/apache/pulsar-client-go/pulsar/internal/auth"
log "github.com/sirupsen/logrus"
)
diff --git a/pulsar/internal/connection_reader.go b/pulsar/internal/connection_reader.go
index ffca7a7..d6e19c1 100644
--- a/pulsar/internal/connection_reader.go
+++ b/pulsar/internal/connection_reader.go
@@ -21,7 +21,7 @@
"bufio"
"io"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
)
diff --git a/pulsar/internal/lookup_service.go b/pulsar/internal/lookup_service.go
index d5da829..0b54c07 100644
--- a/pulsar/internal/lookup_service.go
+++ b/pulsar/internal/lookup_service.go
@@ -22,7 +22,7 @@
"fmt"
"net/url"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
"github.com/golang/protobuf/proto"
log "github.com/sirupsen/logrus"
diff --git a/pulsar/internal/lookup_service_test.go b/pulsar/internal/lookup_service_test.go
index 576745e..9a9f053 100644
--- a/pulsar/internal/lookup_service_test.go
+++ b/pulsar/internal/lookup_service_test.go
@@ -21,7 +21,7 @@
"net/url"
"testing"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/pb/PulsarApi.pb.go b/pulsar/internal/pb/PulsarApi.pb.go
similarity index 100%
rename from pkg/pb/PulsarApi.pb.go
rename to pulsar/internal/pb/PulsarApi.pb.go
diff --git a/pulsar/internal/rpc_client.go b/pulsar/internal/rpc_client.go
index 7e5bae3..860681d 100644
--- a/pulsar/internal/rpc_client.go
+++ b/pulsar/internal/rpc_client.go
@@ -22,7 +22,7 @@
"sync"
"sync/atomic"
- "github.com/apache/pulsar-client-go/pkg/pb"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
"github.com/golang/protobuf/proto"
)
diff --git a/pulsar/producer_partition.go b/pulsar/producer_partition.go
index b9b50b0..c38766a 100644
--- a/pulsar/producer_partition.go
+++ b/pulsar/producer_partition.go
@@ -27,8 +27,8 @@
log "github.com/sirupsen/logrus"
- "github.com/apache/pulsar-client-go/pkg/pb"
"github.com/apache/pulsar-client-go/pulsar/internal"
+ "github.com/apache/pulsar-client-go/pulsar/internal/pb"
)
type producerState int
