Replace apache pulsar client go repo on 3.0 branch (#1205)

* Support status check for pulsarctl command (#1200) * Support read config from env * Add site toc content (cherry picked from commit be22457) * Migrate pulsar-admin-go to apache pulsar client go (#1170) (cherry picked from commit 811717e) Replace streamnative admin go repo use apache admin go repo
streamnative · Sep 11, 2023 · d3dec24 · d3dec24
1 parent 0aad200
commit d3dec24
Show file tree

Hide file tree

Showing 263 changed files with 737 additions and 558 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/streamnative/pulsarctl
 go 1.18
 
 require (
-	github.com/apache/pulsar-client-go v0.9.0
+	github.com/apache/pulsar-client-go v0.9.1-0.20230816081803-fbee610ddcbf
 	github.com/docker/go-connections v0.4.0
 	github.com/fatih/color v1.7.0
 	github.com/ghodss/yaml v1.0.0
@@ -17,7 +17,6 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
-	github.com/streamnative/pulsar-admin-go v0.1.0
 	github.com/stretchr/testify v1.8.0
 	github.com/testcontainers/testcontainers-go v0.0.10
 	gopkg.in/yaml.v2 v2.4.0
@@ -62,7 +61,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
 	google.golang.org/grpc v1.38.0 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

diff --git a/go.sum b/go.sum
diff --git a/pkg/bookkeeper/admin.go b/pkg/bookkeeper/admin.go
@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"path"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/rest"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/rest"
 
 	"github.com/streamnative/pulsarctl/pkg/bookkeeper/bkdata"
 )

diff --git a/pkg/bookkeeper/ledger.go b/pkg/bookkeeper/ledger.go
@@ -20,7 +20,7 @@ package bookkeeper
 import (
 	"strconv"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/rest"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/rest"
 
 	"github.com/streamnative/pulsarctl/pkg/bookkeeper/bkdata"
 )

diff --git a/pkg/cmdutils/cmdutils.go b/pkg/cmdutils/cmdutils.go
@@ -26,11 +26,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/rest"
 	"github.com/kris-nova/logger"
 	"github.com/spf13/cobra"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/rest"
 
 	"github.com/streamnative/pulsarctl/pkg/bookkeeper"
 )

diff --git a/pkg/cmdutils/config.go b/pkg/cmdutils/config.go
@@ -22,13 +22,14 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"strconv"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/kris-nova/logger"
 	"github.com/magiconair/properties"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 	"gopkg.in/yaml.v2"
 
 	"github.com/streamnative/pulsarctl/pkg/bookkeeper"
@@ -235,6 +236,28 @@ func LoadFromEnv() *ClusterConfig {
 			config.AuthPlugin = props.GetString("authPlugin", "")
 			config.TLSEnableHostnameVerification = props.GetBool("tlsEnableHostnameVerification", false)
 		}
+	} else if clientFromEnv, ok := os.LookupEnv("PULSAR_CLIENT_FROM_ENV"); ok && clientFromEnv == "true" {
+		if webServiceURL, ok := os.LookupEnv("webServiceUrl"); ok {
+			config.WebServiceURL = webServiceURL
+		}
+		if tlsAllowInsecureConnection, ok := os.LookupEnv("tlsAllowInsecureConnection"); ok {
+			config.TLSAllowInsecureConnection, _ = strconv.ParseBool(tlsAllowInsecureConnection)
+		}
+		if tlsTrustCertsFilePath, ok := os.LookupEnv("tlsTrustCertsFilePath"); ok {
+			config.TLSTrustCertsFilePath = tlsTrustCertsFilePath
+		}
+		if brokerServiceURL, ok := os.LookupEnv("brokerServiceUrl"); ok {
+			config.BKWebServiceURL = brokerServiceURL
+		}
+		if authParams, ok := os.LookupEnv("authParams"); ok {
+			config.AuthParams = authParams
+		}
+		if authPlugin, ok := os.LookupEnv("authPlugin"); ok {
+			config.AuthPlugin = authPlugin
+		}
+		if tlsEnableHostnameVerification, ok := os.LookupEnv("tlsEnableHostnameVerification"); ok {
+			config.TLSEnableHostnameVerification, _ = strconv.ParseBool(tlsEnableHostnameVerification)
+		}
 	} else {
 		ctxConf, err := readConfigFile()
 		if err != nil {

diff --git a/pkg/ctl/brokers/config_test.go b/pkg/ctl/brokers/config_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/brokers/delete_dynamic_config.go b/pkg/ctl/brokers/delete_dynamic_config.go
@@ -18,9 +18,9 @@
 package brokers
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/brokers/namespaces.go b/pkg/ctl/brokers/namespaces.go
@@ -20,9 +20,9 @@ package brokers
 import (
 	"errors"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/brokers/namespaces_test.go b/pkg/ctl/brokers/namespaces_test.go
@@ -24,7 +24,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/brokers/update_dynamic_config.go b/pkg/ctl/brokers/update_dynamic_config.go
@@ -18,9 +18,9 @@
 package brokers
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/brokerstats/allocator_stats_test.go b/pkg/ctl/brokerstats/allocator_stats_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/brokerstats/load_report_test.go b/pkg/ctl/brokerstats/load_report_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/brokerstats/mbeans_test.go b/pkg/ctl/brokerstats/mbeans_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/create.go b/pkg/ctl/cluster/create.go
@@ -18,8 +18,8 @@
 package cluster
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/create_failure_domain.go b/pkg/ctl/cluster/create_failure_domain.go
@@ -18,9 +18,9 @@
 package cluster
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/delete_failure_domain.go b/pkg/ctl/cluster/delete_failure_domain.go
@@ -18,7 +18,7 @@
 package cluster
 
 import (
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/get_failure_domain_test.go b/pkg/ctl/cluster/get_failure_domain_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/get_test.go b/pkg/ctl/cluster/get_test.go
@@ -22,7 +22,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/list_failure_domain_test.go b/pkg/ctl/cluster/list_failure_domain_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/tls_test.go b/pkg/ctl/cluster/tls_test.go
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//go:build tls
 // +build tls
 
 package cluster

diff --git a/pkg/ctl/cluster/update.go b/pkg/ctl/cluster/update.go
@@ -18,8 +18,8 @@
 package cluster
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/update_failure_domain.go b/pkg/ctl/cluster/update_failure_domain.go
@@ -18,9 +18,9 @@
 package cluster
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/update_failure_domain_test.go b/pkg/ctl/cluster/update_failure_domain_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/update_peer_clusters.go b/pkg/ctl/cluster/update_peer_clusters.go
@@ -18,8 +18,8 @@
 package cluster
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/cluster/update_peer_clusters_test.go b/pkg/ctl/cluster/update_peer_clusters_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/cluster/update_test.go b/pkg/ctl/cluster/update_test.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/context/create_context.go b/pkg/ctl/context/create_context.go
@@ -18,8 +18,8 @@
 package context
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin"
 
 	"github.com/streamnative/pulsarctl/pkg/bookkeeper"
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"

diff --git a/pkg/ctl/context/create_context_test.go b/pkg/ctl/context/create_context_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"

diff --git a/pkg/ctl/context/delete_context_test.go b/pkg/ctl/context/delete_context_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/context/internal/loader.go b/pkg/ctl/context/internal/loader.go
@@ -30,7 +30,7 @@ import (
 	"github.com/imdario/mergo"
 	"gopkg.in/yaml.v2"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/context/rename_context_test.go b/pkg/ctl/context/rename_context_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/ctl/functions/create.go b/pkg/ctl/functions/create.go
@@ -18,9 +18,9 @@
 package functions
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 	"github.com/streamnative/pulsarctl/pkg/ctl/utils"

diff --git a/pkg/ctl/functions/delete.go b/pkg/ctl/functions/delete.go
@@ -18,9 +18,9 @@
 package functions
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )

diff --git a/pkg/ctl/functions/download.go b/pkg/ctl/functions/download.go
@@ -18,9 +18,9 @@
 package functions
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )