Repository: streamnative/pulsarctl
Pull request #1170 (2023-08-17 07:06:33)

Migrate pulsar-admin-go to apache pulsar client go
### Motivation

Migrate project streamnative/pulsar-admin-go dependency to apache/pulsar-client-go.

### Modifications

- Migrate project streamnative/pulsar-admin-go dependency to apache/pulsar-client-go.

### Verifying this change

- [x] Make sure that the change passes the CI checks.

### Documentation

Check the box below.

Need to update docs? 

- [ ] `doc-required` 
  
  (If you need help on updating docs, create a doc issue)
  
- [x] `no-need-doc` 
  
  (Please explain why)
  
- [ ] `doc` 
  
  (If this PR contains doc changes)



github-actions[bot]: @mattisonchao:Thanks for your contribution. For this PR, do we need to update docs?
(The [PR template contains info about doc](https://github.com/apache/pulsar/blob/master/.github/PULL_REQUEST_TEMPLATE.md#documentation), which helps others know more about the changes. Can you provide doc-related info in this and future PR descriptions? Thanks)
github-actions[bot]: @mattisonchao:Thanks for your contribution. For this PR, do we need to update docs?
(The [PR template contains info about doc](https://github.com/apache/pulsar/blob/master/.github/PULL_REQUEST_TEMPLATE.md#documentation), which helps others know more about the changes. Can you provide doc-related info in this and future PR descriptions? Thanks)

Patch:
diff --git a/go.mod b/go.mod
index fc0fc56..cd41949 100644
--- 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.2-0.20230720220908-d28b89a11802
 	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
index 2b55f0f..f290053 100644
--- a/go.sum
+++ b/go.sum
@@ -13,11 +13,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -26,7 +21,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -41,59 +35,33 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
 github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o=
 github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
-github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/pulsar-client-go v0.9.0 h1:L5jvGFXJm0JNA/PgUiJctTVHHttCe4wIEFDv4vojiQM=
-github.com/apache/pulsar-client-go v0.9.0/go.mod h1:fSAcBipgz4KQ/VgwZEJtQ71cCXMKm8ezznstrozrngw=
-github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI=
-github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q=
+github.com/apache/pulsar-client-go v0.9.1-0.20230816081803-fbee610ddcbf h1:k9hqsKPh5ncKf0e3CkzvBTYXLwCYNYFb1Vtk3qnYAvk=
+github.com/apache/pulsar-client-go v0.9.1-0.20230816081803-fbee610ddcbf/go.mod h1:Ea/yiZA7plgiaWRyOuO1B0k5/hjpl1thmiKig+D9PBQ=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible h1:dvc1KSkIYTVjZgHf/CTC2diTYC8PzhaA5sFISRfNVrE=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v0.7.3-0.20190506211059-b20a14b54661 h1:ZuxGvIvF01nfc/G9RJ5Q7Va1zQE2WJyG18Zv3DqCEf4=
@@ -107,37 +75,23 @@ github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-redis/redis v6.15.6+incompatible h1:H9evprGPLI8+ci7fxQx6WNZHJSb7be8FqJQRhdQZ5Sg=
 github.com/go-redis/redis v6.15.6+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -156,7 +110,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -170,12 +123,9 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -185,15 +135,10 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -201,73 +146,32 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
-github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk=
-github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -275,56 +179,28 @@ github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06 h1:vN4d3jSss3ExzU
 github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06/go.mod h1:++9BgZujZd4v0ZTZCb5iPsaomXdZWyxotIAh1IiDm44=
 github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b h1:xYEM2oBUhBEhQjrV+KJ9lEWDWYZoNVZUaBF++Wyljq4=
 github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b/go.mod h1:V0HF/ZBlN86HqewcDC/cVxMmYDiRukWjSrgKLUAn9Js=
-github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
@@ -333,81 +209,36 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
-github.com/streamnative/pulsar-admin-go v0.1.1 h1:giB45yb7IJwhBXXO9JPg08ZD18EaQa7x61sQ5VCc7Kc=
-github.com/streamnative/pulsar-admin-go v0.1.1/go.mod h1:0bfFvDCNjCPXWUbi2KHuGxGAHGMT4leLZZ1CLYw2qN0=
-github.com/streamnative/pulsar-admin-go v0.1.2-0.20230719024852-e69fbabe5628 h1:cbXfZf2DAQqpJ4eyq2qxcQfBxqbyOY05lflqlDMiXhc=
-github.com/streamnative/pulsar-admin-go v0.1.2-0.20230719024852-e69fbabe5628/go.mod h1:0bfFvDCNjCPXWUbi2KHuGxGAHGMT4leLZZ1CLYw2qN0=
-github.com/streamnative/pulsar-admin-go v0.1.2-0.20230720220908-d28b89a11802 h1:PwuADM+Tknr6SadyThtUh9SljFNsj7HQbV/0KDuLqB4=
-github.com/streamnative/pulsar-admin-go v0.1.2-0.20230720220908-d28b89a11802/go.mod h1:0bfFvDCNjCPXWUbi2KHuGxGAHGMT4leLZZ1CLYw2qN0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/testcontainers/testcontainers-go v0.0.10 h1:WP99DOGWmkr+RXHURyAXnvZqZO0x3VXkRYAzQ+mwtpQ=
 github.com/testcontainers/testcontainers-go v0.0.10/go.mod h1:2kePcwMHd3ix/BU3cTDuhvggUgMBAit+qcWwadeMXok=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -415,26 +246,15 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -459,7 +279,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -469,15 +288,10 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -485,7 +299,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -499,22 +312,12 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -522,12 +325,6 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -539,13 +336,11 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -553,10 +348,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -571,7 +363,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -581,7 +372,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -608,14 +398,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -638,12 +421,6 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -675,23 +452,12 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -707,13 +473,6 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -727,32 +486,22 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v0.0.0-20181223230014-1083505acf35 h1:zpdCK+REwbk+rqjJmHhiCN6iBIigrZ39glqSF0P3KF0=
diff --git a/pkg/bookkeeper/admin.go b/pkg/bookkeeper/admin.go
index 0388fb4..b362ca9 100644
--- 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
index 4e45bcc..01cc0c0 100644
--- 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
index 6e6f6c9..00f8bb6 100644
--- 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
index 4d749f5..7eaaad5 100644
--- a/pkg/cmdutils/config.go
+++ b/pkg/cmdutils/config.go
@@ -23,13 +23,13 @@ import (
 	"log"
 	"os"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/auth"
+	"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/auth"
-	"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"
diff --git a/pkg/ctl/brokers/delete_dynamic_config.go b/pkg/ctl/brokers/delete_dynamic_config.go
index c26480e..c54f63a 100644
--- 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
index 08e3678..b89144b 100644
--- 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/update_dynamic_config.go b/pkg/ctl/brokers/update_dynamic_config.go
index 8d639fa..5b5102f 100644
--- 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/cluster/create.go b/pkg/ctl/cluster/create.go
index 26d7e22..aefcc30 100644
--- 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
index dfacbd4..60783c6 100644
--- 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
index b1bd210..9ac71cb 100644
--- 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/update.go b/pkg/ctl/cluster/update.go
index aaefff4..180fd59 100644
--- 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
index d3df67b..1d27fa5 100644
--- 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_peer_clusters.go b/pkg/ctl/cluster/update_peer_clusters.go
index 24a16a5..a7d5f84 100644
--- 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/context/create_context.go b/pkg/ctl/context/create_context.go
index b6b74b6..3eab825 100644
--- 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/internal/loader.go b/pkg/ctl/context/internal/loader.go
index 737535b..fc1a6f5 100644
--- 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/functions/create.go b/pkg/ctl/functions/create.go
index 58e8fa4..b6b1c96 100644
--- 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
index 6564480..64b4a19 100644
--- 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
index 2640241..f899855 100644
--- 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"
 )
diff --git a/pkg/ctl/functions/get.go b/pkg/ctl/functions/get.go
index a7f76f3..ba0b411 100644
--- a/pkg/ctl/functions/get.go
+++ b/pkg/ctl/functions/get.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/list.go b/pkg/ctl/functions/list.go
index 8ba2a6b..68852d5 100644
--- a/pkg/ctl/functions/list.go
+++ b/pkg/ctl/functions/list.go
@@ -20,10 +20,10 @@ package functions
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
 	"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/putstate.go b/pkg/ctl/functions/putstate.go
index bfbfe69..3dca82f 100644
--- a/pkg/ctl/functions/putstate.go
+++ b/pkg/ctl/functions/putstate.go
@@ -21,10 +21,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/querystate.go b/pkg/ctl/functions/querystate.go
index 554e038..0ffe6aa 100644
--- a/pkg/ctl/functions/querystate.go
+++ b/pkg/ctl/functions/querystate.go
@@ -20,10 +20,10 @@ package functions
 import (
 	"time"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"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/restart.go b/pkg/ctl/functions/restart.go
index 16e5091..f91b21b 100644
--- a/pkg/ctl/functions/restart.go
+++ b/pkg/ctl/functions/restart.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"strconv"
 
+	"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/start.go b/pkg/ctl/functions/start.go
index aa6da3c..74b0374 100644
--- a/pkg/ctl/functions/start.go
+++ b/pkg/ctl/functions/start.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"strconv"
 
+	"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/stats.go b/pkg/ctl/functions/stats.go
index 1a7a76e..d68d4e5 100644
--- a/pkg/ctl/functions/stats.go
+++ b/pkg/ctl/functions/stats.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"strconv"
 
+	"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/status.go b/pkg/ctl/functions/status.go
index bb55100..ee60a70 100644
--- a/pkg/ctl/functions/status.go
+++ b/pkg/ctl/functions/status.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"strconv"
 
+	"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/stop.go b/pkg/ctl/functions/stop.go
index 3d9c73e..78e089e 100644
--- a/pkg/ctl/functions/stop.go
+++ b/pkg/ctl/functions/stop.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"strconv"
 
+	"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/trigger.go b/pkg/ctl/functions/trigger.go
index d32cf6b..6cdbb95 100644
--- a/pkg/ctl/functions/trigger.go
+++ b/pkg/ctl/functions/trigger.go
@@ -20,9 +20,9 @@ package functions
 import (
 	"errors"
 
+	"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/update.go b/pkg/ctl/functions/update.go
index 33533df..35e3e8a 100644
--- a/pkg/ctl/functions/update.go
+++ b/pkg/ctl/functions/update.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/upload.go b/pkg/ctl/functions/upload.go
index 9e528c9..18c66e0 100644
--- a/pkg/ctl/functions/upload.go
+++ b/pkg/ctl/functions/upload.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/functions/util.go b/pkg/ctl/functions/util.go
index 93ef43d..315ef77 100644
--- a/pkg/ctl/functions/util.go
+++ b/pkg/ctl/functions/util.go
@@ -24,8 +24,8 @@ import (
 	"os"
 	"strings"
 
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 	"gopkg.in/yaml.v2"
 
 	"github.com/streamnative/pulsarctl/pkg/ctl/utils"
diff --git a/pkg/ctl/namespace/clear_backlog.go b/pkg/ctl/namespace/clear_backlog.go
index 4e89e5c..58f9421 100644
--- a/pkg/ctl/namespace/clear_backlog.go
+++ b/pkg/ctl/namespace/clear_backlog.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"os"
 
+	"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/namespace/clear_offload_deletion_lag.go b/pkg/ctl/namespace/clear_offload_deletion_lag.go
index 5b72ce6..726ca47 100644
--- a/pkg/ctl/namespace/clear_offload_deletion_lag.go
+++ b/pkg/ctl/namespace/clear_offload_deletion_lag.go
@@ -20,7 +20,7 @@ package namespace
 import (
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 )
 
 func ClearOffloadDeletionLagCmd(vc *cmdutils.VerbCmd) {
diff --git a/pkg/ctl/namespace/create.go b/pkg/ctl/namespace/create.go
index 8b71320..368a6c4 100644
--- a/pkg/ctl/namespace/create.go
+++ b/pkg/ctl/namespace/create.go
@@ -20,9 +20,9 @@ package namespace
 import (
 	"math"
 
+	"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/namespace/get_anti_affinity_ns.go b/pkg/ctl/namespace/get_anti_affinity_ns.go
index 7f7eeb0..7f3c458 100644
--- a/pkg/ctl/namespace/get_anti_affinity_ns.go
+++ b/pkg/ctl/namespace/get_anti_affinity_ns.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"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/namespace/get_compaction_threshold.go b/pkg/ctl/namespace/get_compaction_threshold.go
index 55ad422..98f8c90 100644
--- a/pkg/ctl/namespace/get_compaction_threshold.go
+++ b/pkg/ctl/namespace/get_compaction_threshold.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_dispatch_rate.go b/pkg/ctl/namespace/get_dispatch_rate.go
index 207ae1f..df9b882 100644
--- a/pkg/ctl/namespace/get_dispatch_rate.go
+++ b/pkg/ctl/namespace/get_dispatch_rate.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_is_allow_auto_update_schema.go b/pkg/ctl/namespace/get_is_allow_auto_update_schema.go
index 6fe1617..da24dd8 100644
--- a/pkg/ctl/namespace/get_is_allow_auto_update_schema.go
+++ b/pkg/ctl/namespace/get_is_allow_auto_update_schema.go
@@ -20,7 +20,7 @@ package namespace
 import (
 	"strconv"
 
-	"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/namespace/get_max_consumers_per_subscription.go b/pkg/ctl/namespace/get_max_consumers_per_subscription.go
index 1620809..2101639 100644
--- a/pkg/ctl/namespace/get_max_consumers_per_subscription.go
+++ b/pkg/ctl/namespace/get_max_consumers_per_subscription.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_max_consumers_per_topic.go b/pkg/ctl/namespace/get_max_consumers_per_topic.go
index 06c5ac4..5dc7679 100644
--- a/pkg/ctl/namespace/get_max_consumers_per_topic.go
+++ b/pkg/ctl/namespace/get_max_consumers_per_topic.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_max_producers_per_topic.go b/pkg/ctl/namespace/get_max_producers_per_topic.go
index 3b5c5fd..b18abd4 100644
--- a/pkg/ctl/namespace/get_max_producers_per_topic.go
+++ b/pkg/ctl/namespace/get_max_producers_per_topic.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_offload_deletion_lag.go b/pkg/ctl/namespace/get_offload_deletion_lag.go
index d894f9d..62b87fd 100644
--- a/pkg/ctl/namespace/get_offload_deletion_lag.go
+++ b/pkg/ctl/namespace/get_offload_deletion_lag.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"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/namespace/get_offload_threshold.go b/pkg/ctl/namespace/get_offload_threshold.go
index 2f65887..2413e57 100644
--- a/pkg/ctl/namespace/get_offload_threshold.go
+++ b/pkg/ctl/namespace/get_offload_threshold.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_publish_rate.go b/pkg/ctl/namespace/get_publish_rate.go
index 0dff13b..04f5f6c 100644
--- a/pkg/ctl/namespace/get_publish_rate.go
+++ b/pkg/ctl/namespace/get_publish_rate.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_replicator_dispatch_rate.go b/pkg/ctl/namespace/get_replicator_dispatch_rate.go
index 4fce25e..05cdb23 100644
--- a/pkg/ctl/namespace/get_replicator_dispatch_rate.go
+++ b/pkg/ctl/namespace/get_replicator_dispatch_rate.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_schema_autoupdate_strategy.go b/pkg/ctl/namespace/get_schema_autoupdate_strategy.go
index 700aef5..a74e333 100644
--- a/pkg/ctl/namespace/get_schema_autoupdate_strategy.go
+++ b/pkg/ctl/namespace/get_schema_autoupdate_strategy.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_schema_valudation_enforce.go b/pkg/ctl/namespace/get_schema_valudation_enforce.go
index c0d3192..e47548e 100644
--- a/pkg/ctl/namespace/get_schema_valudation_enforce.go
+++ b/pkg/ctl/namespace/get_schema_valudation_enforce.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_subscribe_rate.go b/pkg/ctl/namespace/get_subscribe_rate.go
index 5b95cac..5c115fe 100644
--- a/pkg/ctl/namespace/get_subscribe_rate.go
+++ b/pkg/ctl/namespace/get_subscribe_rate.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/get_subscription_dispatch_rate.go b/pkg/ctl/namespace/get_subscription_dispatch_rate.go
index 05ec732..a650897 100644
--- a/pkg/ctl/namespace/get_subscription_dispatch_rate.go
+++ b/pkg/ctl/namespace/get_subscription_dispatch_rate.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/grant_permission.go b/pkg/ctl/namespace/grant_permission.go
index 3d247bc..1e967d7 100644
--- a/pkg/ctl/namespace/grant_permission.go
+++ b/pkg/ctl/namespace/grant_permission.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/grant_subscription_permission.go b/pkg/ctl/namespace/grant_subscription_permission.go
index afa77bb..decb872 100644
--- a/pkg/ctl/namespace/grant_subscription_permission.go
+++ b/pkg/ctl/namespace/grant_subscription_permission.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/namespace/permissions.go b/pkg/ctl/namespace/permissions.go
index f546a3b..b2b74ac 100644
--- a/pkg/ctl/namespace/permissions.go
+++ b/pkg/ctl/namespace/permissions.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/remove_topic_auto_creation.go b/pkg/ctl/namespace/remove_topic_auto_creation.go
index a427ec0..8afbb9f 100644
--- a/pkg/ctl/namespace/remove_topic_auto_creation.go
+++ b/pkg/ctl/namespace/remove_topic_auto_creation.go
@@ -18,7 +18,7 @@
 package namespace
 
 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/namespace/revoke_permission.go b/pkg/ctl/namespace/revoke_permission.go
index 11c5501..4b84bb1 100644
--- a/pkg/ctl/namespace/revoke_permission.go
+++ b/pkg/ctl/namespace/revoke_permission.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/revoke_subscription_permission.go b/pkg/ctl/namespace/revoke_subscription_permission.go
index e908375..36adafa 100644
--- a/pkg/ctl/namespace/revoke_subscription_permission.go
+++ b/pkg/ctl/namespace/revoke_subscription_permission.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/namespace/set_backlog_quota.go b/pkg/ctl/namespace/set_backlog_quota.go
index 86366ca..a000a3f 100644
--- a/pkg/ctl/namespace/set_backlog_quota.go
+++ b/pkg/ctl/namespace/set_backlog_quota.go
@@ -20,9 +20,9 @@ package namespace
 import (
 	"fmt"
 
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/namespace/set_compaction_threshold.go b/pkg/ctl/namespace/set_compaction_threshold.go
index d1c4bf2..8ad4e0c 100644
--- a/pkg/ctl/namespace/set_compaction_threshold.go
+++ b/pkg/ctl/namespace/set_compaction_threshold.go
@@ -18,9 +18,9 @@
 package namespace
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/namespace/set_deduplication_status.go b/pkg/ctl/namespace/set_deduplication_status.go
index a9bb048..5ebc44a 100644
--- a/pkg/ctl/namespace/set_deduplication_status.go
+++ b/pkg/ctl/namespace/set_deduplication_status.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_dispatch_rate.go b/pkg/ctl/namespace/set_dispatch_rate.go
index b407793..9574d76 100644
--- a/pkg/ctl/namespace/set_dispatch_rate.go
+++ b/pkg/ctl/namespace/set_dispatch_rate.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_encryption_require.go b/pkg/ctl/namespace/set_encryption_require.go
index 9dc569a..223150e 100644
--- a/pkg/ctl/namespace/set_encryption_require.go
+++ b/pkg/ctl/namespace/set_encryption_require.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_is_allow_auto_update_schema.go b/pkg/ctl/namespace/set_is_allow_auto_update_schema.go
index be1d33a..8e1b912 100644
--- a/pkg/ctl/namespace/set_is_allow_auto_update_schema.go
+++ b/pkg/ctl/namespace/set_is_allow_auto_update_schema.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/set_max_consumers_per_subscription.go b/pkg/ctl/namespace/set_max_consumers_per_subscription.go
index 1e256c7..7ffa851 100644
--- a/pkg/ctl/namespace/set_max_consumers_per_subscription.go
+++ b/pkg/ctl/namespace/set_max_consumers_per_subscription.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/namespace/set_max_consumers_per_topic.go b/pkg/ctl/namespace/set_max_consumers_per_topic.go
index de96705..dce5a3a 100644
--- a/pkg/ctl/namespace/set_max_consumers_per_topic.go
+++ b/pkg/ctl/namespace/set_max_consumers_per_topic.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/namespace/set_max_producers_per_topic.go b/pkg/ctl/namespace/set_max_producers_per_topic.go
index bf48eeb..fe25420 100644
--- a/pkg/ctl/namespace/set_max_producers_per_topic.go
+++ b/pkg/ctl/namespace/set_max_producers_per_topic.go
@@ -18,10 +18,10 @@
 package namespace
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/namespace/set_message_ttl.go b/pkg/ctl/namespace/set_message_ttl.go
index 9f37025..0ef4464 100644
--- a/pkg/ctl/namespace/set_message_ttl.go
+++ b/pkg/ctl/namespace/set_message_ttl.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/set_ns_anti_affinity_group.go b/pkg/ctl/namespace/set_ns_anti_affinity_group.go
index 339a189..9d7e922 100644
--- a/pkg/ctl/namespace/set_ns_anti_affinity_group.go
+++ b/pkg/ctl/namespace/set_ns_anti_affinity_group.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/set_offload_deletion_lag.go b/pkg/ctl/namespace/set_offload_deletion_lag.go
index 913b63b..c4b7da9 100644
--- a/pkg/ctl/namespace/set_offload_deletion_lag.go
+++ b/pkg/ctl/namespace/set_offload_deletion_lag.go
@@ -20,9 +20,9 @@ package namespace
 import (
 	"time"
 
+	"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/namespace/set_offload_threshold.go b/pkg/ctl/namespace/set_offload_threshold.go
index d496bc5..fe37391 100644
--- a/pkg/ctl/namespace/set_offload_threshold.go
+++ b/pkg/ctl/namespace/set_offload_threshold.go
@@ -18,9 +18,9 @@
 package namespace
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/namespace/set_persistence.go b/pkg/ctl/namespace/set_persistence.go
index e0a8e92..f78fd29 100644
--- a/pkg/ctl/namespace/set_persistence.go
+++ b/pkg/ctl/namespace/set_persistence.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/set_publish_rate.go b/pkg/ctl/namespace/set_publish_rate.go
index 49cffca..6751a71 100644
--- a/pkg/ctl/namespace/set_publish_rate.go
+++ b/pkg/ctl/namespace/set_publish_rate.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_replication_clusters.go b/pkg/ctl/namespace/set_replication_clusters.go
index 54dbc80..d7698de 100644
--- a/pkg/ctl/namespace/set_replication_clusters.go
+++ b/pkg/ctl/namespace/set_replication_clusters.go
@@ -20,9 +20,9 @@ package namespace
 import (
 	"strings"
 
+	"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/namespace/set_replicator_dispatch_rate.go b/pkg/ctl/namespace/set_replicator_dispatch_rate.go
index fca1cdd..7af8644 100644
--- a/pkg/ctl/namespace/set_replicator_dispatch_rate.go
+++ b/pkg/ctl/namespace/set_replicator_dispatch_rate.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_retention.go b/pkg/ctl/namespace/set_retention.go
index 665e7d2..c25d3e4 100644
--- a/pkg/ctl/namespace/set_retention.go
+++ b/pkg/ctl/namespace/set_retention.go
@@ -18,9 +18,9 @@
 package namespace
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/namespace/set_schema_autoupdate_strategy.go b/pkg/ctl/namespace/set_schema_autoupdate_strategy.go
index 07cd9ae..95697ab 100644
--- a/pkg/ctl/namespace/set_schema_autoupdate_strategy.go
+++ b/pkg/ctl/namespace/set_schema_autoupdate_strategy.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_schema_validation_enforce.go b/pkg/ctl/namespace/set_schema_validation_enforce.go
index 2b3bc81..69713fc 100644
--- a/pkg/ctl/namespace/set_schema_validation_enforce.go
+++ b/pkg/ctl/namespace/set_schema_validation_enforce.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_subscribe_rate.go b/pkg/ctl/namespace/set_subscribe_rate.go
index 253fc12..b0fce81 100644
--- a/pkg/ctl/namespace/set_subscribe_rate.go
+++ b/pkg/ctl/namespace/set_subscribe_rate.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_subscription_auth_mode.go b/pkg/ctl/namespace/set_subscription_auth_mode.go
index b65375c..a8b9766 100644
--- a/pkg/ctl/namespace/set_subscription_auth_mode.go
+++ b/pkg/ctl/namespace/set_subscription_auth_mode.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/set_subscription_dispatch_rate.go b/pkg/ctl/namespace/set_subscription_dispatch_rate.go
index d7425c7..7df4cd4 100644
--- a/pkg/ctl/namespace/set_subscription_dispatch_rate.go
+++ b/pkg/ctl/namespace/set_subscription_dispatch_rate.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/set_topic_auto_creation.go b/pkg/ctl/namespace/set_topic_auto_creation.go
index 264c6ee..055fb27 100644
--- a/pkg/ctl/namespace/set_topic_auto_creation.go
+++ b/pkg/ctl/namespace/set_topic_auto_creation.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/split_bundle.go b/pkg/ctl/namespace/split_bundle.go
index 42239af..e30aae8 100644
--- a/pkg/ctl/namespace/split_bundle.go
+++ b/pkg/ctl/namespace/split_bundle.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/namespace/unload.go b/pkg/ctl/namespace/unload.go
index 62927ff..d5acec2 100644
--- a/pkg/ctl/namespace/unload.go
+++ b/pkg/ctl/namespace/unload.go
@@ -18,8 +18,8 @@
 package namespace
 
 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/namespace/unsubscribe.go b/pkg/ctl/namespace/unsubscribe.go
index ac3e9bf..0909d59 100644
--- a/pkg/ctl/namespace/unsubscribe.go
+++ b/pkg/ctl/namespace/unsubscribe.go
@@ -18,9 +18,9 @@
 package namespace
 
 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/nsisolationpolicy/set.go b/pkg/ctl/nsisolationpolicy/set.go
index a15899a..521cd45 100644
--- a/pkg/ctl/nsisolationpolicy/set.go
+++ b/pkg/ctl/nsisolationpolicy/set.go
@@ -18,9 +18,9 @@
 package nsisolationpolicy
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/packages/delete.go b/pkg/ctl/packages/delete.go
index 4dbce35..babaef0 100644
--- a/pkg/ctl/packages/delete.go
+++ b/pkg/ctl/packages/delete.go
@@ -18,8 +18,8 @@
 package packages
 
 import (
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/packages/download.go b/pkg/ctl/packages/download.go
index ba2cbe2..32c96d1 100644
--- a/pkg/ctl/packages/download.go
+++ b/pkg/ctl/packages/download.go
@@ -18,10 +18,10 @@
 package packages
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"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/packages/get_metadata.go b/pkg/ctl/packages/get_metadata.go
index 81b0bdb..4868c60 100644
--- a/pkg/ctl/packages/get_metadata.go
+++ b/pkg/ctl/packages/get_metadata.go
@@ -18,8 +18,8 @@
 package packages
 
 import (
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/packages/list.go b/pkg/ctl/packages/list.go
index 60c1ed0..b7d142c 100644
--- a/pkg/ctl/packages/list.go
+++ b/pkg/ctl/packages/list.go
@@ -20,10 +20,10 @@ package packages
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
 	"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/packages/list_versions.go b/pkg/ctl/packages/list_versions.go
index 16badf5..aa6ab87 100644
--- a/pkg/ctl/packages/list_versions.go
+++ b/pkg/ctl/packages/list_versions.go
@@ -20,9 +20,9 @@ package packages
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
-	"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/packages/update_metadata.go b/pkg/ctl/packages/update_metadata.go
index 680cd78..8b6a7ce 100644
--- a/pkg/ctl/packages/update_metadata.go
+++ b/pkg/ctl/packages/update_metadata.go
@@ -18,10 +18,10 @@
 package packages
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"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/packages/upload.go b/pkg/ctl/packages/upload.go
index 9a4b5bc..5de9fd8 100644
--- a/pkg/ctl/packages/upload.go
+++ b/pkg/ctl/packages/upload.go
@@ -18,10 +18,10 @@
 package packages
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"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/resourcequotas/get.go b/pkg/ctl/resourcequotas/get.go
index 1792b11..7cff562 100644
--- a/pkg/ctl/resourcequotas/get.go
+++ b/pkg/ctl/resourcequotas/get.go
@@ -18,8 +18,8 @@
 package resourcequotas
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/resourcequotas/reset.go b/pkg/ctl/resourcequotas/reset.go
index 50164ee..c95bff9 100644
--- a/pkg/ctl/resourcequotas/reset.go
+++ b/pkg/ctl/resourcequotas/reset.go
@@ -20,7 +20,7 @@ package resourcequotas
 import (
 	"errors"
 
-	"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/resourcequotas/set.go b/pkg/ctl/resourcequotas/set.go
index 36b70bf..38ab020 100644
--- a/pkg/ctl/resourcequotas/set.go
+++ b/pkg/ctl/resourcequotas/set.go
@@ -18,10 +18,10 @@
 package resourcequotas
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/schemas/get.go b/pkg/ctl/schemas/get.go
index 5d3cc44..2325fa5 100644
--- a/pkg/ctl/schemas/get.go
+++ b/pkg/ctl/schemas/get.go
@@ -20,8 +20,8 @@ package schemas
 import (
 	"io"
 
+	"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/schemas/schemas.go b/pkg/ctl/schemas/schemas.go
index e6666e7..df93bba 100644
--- a/pkg/ctl/schemas/schemas.go
+++ b/pkg/ctl/schemas/schemas.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/schemas/upload.go b/pkg/ctl/schemas/upload.go
index 13450ef..d20d2be 100644
--- a/pkg/ctl/schemas/upload.go
+++ b/pkg/ctl/schemas/upload.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
+	"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/sinks/create.go b/pkg/ctl/sinks/create.go
index cbc4e48..e6605e6 100644
--- a/pkg/ctl/sinks/create.go
+++ b/pkg/ctl/sinks/create.go
@@ -18,9 +18,9 @@
 package sinks
 
 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/sinks/delete.go b/pkg/ctl/sinks/delete.go
index e056dd5..938f0c0 100644
--- a/pkg/ctl/sinks/delete.go
+++ b/pkg/ctl/sinks/delete.go
@@ -18,9 +18,9 @@
 package sinks
 
 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/sinks/get.go b/pkg/ctl/sinks/get.go
index 3e9d9db..15a9806 100644
--- a/pkg/ctl/sinks/get.go
+++ b/pkg/ctl/sinks/get.go
@@ -18,9 +18,9 @@
 package sinks
 
 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/sinks/list.go b/pkg/ctl/sinks/list.go
index 312898b..08aa8c6 100644
--- a/pkg/ctl/sinks/list.go
+++ b/pkg/ctl/sinks/list.go
@@ -20,10 +20,10 @@ package sinks
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
 	"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/sinks/list_built_in_sinks.go b/pkg/ctl/sinks/list_built_in_sinks.go
index 238909c..0f38981 100644
--- a/pkg/ctl/sinks/list_built_in_sinks.go
+++ b/pkg/ctl/sinks/list_built_in_sinks.go
@@ -20,8 +20,8 @@ package sinks
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
 	"github.com/olekukonko/tablewriter"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
 
diff --git a/pkg/ctl/sinks/restart.go b/pkg/ctl/sinks/restart.go
index a7512f4..88326d5 100644
--- a/pkg/ctl/sinks/restart.go
+++ b/pkg/ctl/sinks/restart.go
@@ -20,9 +20,9 @@ package sinks
 import (
 	"strconv"
 
+	"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/sinks/start.go b/pkg/ctl/sinks/start.go
index 041bf2f..9817d09 100644
--- a/pkg/ctl/sinks/start.go
+++ b/pkg/ctl/sinks/start.go
@@ -20,9 +20,9 @@ package sinks
 import (
 	"strconv"
 
+	"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/sinks/status.go b/pkg/ctl/sinks/status.go
index 369c67b..30b37b2 100644
--- a/pkg/ctl/sinks/status.go
+++ b/pkg/ctl/sinks/status.go
@@ -20,9 +20,9 @@ package sinks
 import (
 	"strconv"
 
+	"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/sinks/stop.go b/pkg/ctl/sinks/stop.go
index a574eff..3550352 100644
--- a/pkg/ctl/sinks/stop.go
+++ b/pkg/ctl/sinks/stop.go
@@ -20,9 +20,9 @@ package sinks
 import (
 	"strconv"
 
+	"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/sinks/update.go b/pkg/ctl/sinks/update.go
index e01649d..85ed933 100644
--- a/pkg/ctl/sinks/update.go
+++ b/pkg/ctl/sinks/update.go
@@ -18,9 +18,9 @@
 package sinks
 
 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/sinks/util.go b/pkg/ctl/sinks/util.go
index 67e0d7e..4eeff1c 100644
--- a/pkg/ctl/sinks/util.go
+++ b/pkg/ctl/sinks/util.go
@@ -24,9 +24,9 @@ import (
 	"log"
 	"strings"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 	"gopkg.in/yaml.v2"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
diff --git a/pkg/ctl/sources/create.go b/pkg/ctl/sources/create.go
index 1d9215b..ee06ff0 100644
--- a/pkg/ctl/sources/create.go
+++ b/pkg/ctl/sources/create.go
@@ -18,9 +18,9 @@
 package sources
 
 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/sources/delete.go b/pkg/ctl/sources/delete.go
index 300b174..216f3ef 100644
--- a/pkg/ctl/sources/delete.go
+++ b/pkg/ctl/sources/delete.go
@@ -18,9 +18,9 @@
 package sources
 
 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/sources/get.go b/pkg/ctl/sources/get.go
index 989c02b..0dde939 100644
--- a/pkg/ctl/sources/get.go
+++ b/pkg/ctl/sources/get.go
@@ -18,9 +18,9 @@
 package sources
 
 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/sources/list.go b/pkg/ctl/sources/list.go
index 4c9d231..6205108 100644
--- a/pkg/ctl/sources/list.go
+++ b/pkg/ctl/sources/list.go
@@ -20,10 +20,10 @@ package sources
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
 	"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/sources/list_built_in_sources.go b/pkg/ctl/sources/list_built_in_sources.go
index cd224ea..d51a7b9 100644
--- a/pkg/ctl/sources/list_built_in_sources.go
+++ b/pkg/ctl/sources/list_built_in_sources.go
@@ -20,8 +20,8 @@ package sources
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
 	"github.com/olekukonko/tablewriter"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
 
diff --git a/pkg/ctl/sources/restart.go b/pkg/ctl/sources/restart.go
index 725dbfd..badc61b 100644
--- a/pkg/ctl/sources/restart.go
+++ b/pkg/ctl/sources/restart.go
@@ -20,9 +20,9 @@ package sources
 import (
 	"strconv"
 
+	"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/sources/start.go b/pkg/ctl/sources/start.go
index 7a38068..d9e9d6a 100644
--- a/pkg/ctl/sources/start.go
+++ b/pkg/ctl/sources/start.go
@@ -20,9 +20,9 @@ package sources
 import (
 	"strconv"
 
+	"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/sources/status.go b/pkg/ctl/sources/status.go
index 6193b89..48baefa 100644
--- a/pkg/ctl/sources/status.go
+++ b/pkg/ctl/sources/status.go
@@ -20,9 +20,9 @@ package sources
 import (
 	"strconv"
 
+	"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/sources/stop.go b/pkg/ctl/sources/stop.go
index 50b0202..d11e956 100644
--- a/pkg/ctl/sources/stop.go
+++ b/pkg/ctl/sources/stop.go
@@ -20,9 +20,9 @@ package sources
 import (
 	"strconv"
 
+	"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/sources/update.go b/pkg/ctl/sources/update.go
index e82f235..3f484f9 100644
--- a/pkg/ctl/sources/update.go
+++ b/pkg/ctl/sources/update.go
@@ -18,9 +18,9 @@
 package sources
 
 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/sources/util.go b/pkg/ctl/sources/util.go
index 1478355..20449c8 100644
--- a/pkg/ctl/sources/util.go
+++ b/pkg/ctl/sources/util.go
@@ -25,9 +25,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/config"
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/config"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 	"gopkg.in/yaml.v2"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
diff --git a/pkg/ctl/subscription/create.go b/pkg/ctl/subscription/create.go
index 9c7b389..76f3ef1 100644
--- a/pkg/ctl/subscription/create.go
+++ b/pkg/ctl/subscription/create.go
@@ -20,9 +20,9 @@ package subscription
 import (
 	"strings"
 
+	"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/subscription/delete.go b/pkg/ctl/subscription/delete.go
index 69717ee..865d319 100644
--- a/pkg/ctl/subscription/delete.go
+++ b/pkg/ctl/subscription/delete.go
@@ -18,8 +18,8 @@
 package subscription
 
 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/subscription/expire.go b/pkg/ctl/subscription/expire.go
index a4d841b..dabaaad 100644
--- a/pkg/ctl/subscription/expire.go
+++ b/pkg/ctl/subscription/expire.go
@@ -20,10 +20,10 @@ package subscription
 import (
 	"fmt"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/subscription/get_message_by_id.go b/pkg/ctl/subscription/get_message_by_id.go
index 3f6a099..30c74e3 100644
--- a/pkg/ctl/subscription/get_message_by_id.go
+++ b/pkg/ctl/subscription/get_message_by_id.go
@@ -22,9 +22,9 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"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/subscription/list.go b/pkg/ctl/subscription/list.go
index 0035bed..f5196cc 100644
--- a/pkg/ctl/subscription/list.go
+++ b/pkg/ctl/subscription/list.go
@@ -20,8 +20,8 @@ package subscription
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/subscription/peek.go b/pkg/ctl/subscription/peek.go
index c87f511..d4f8621 100644
--- a/pkg/ctl/subscription/peek.go
+++ b/pkg/ctl/subscription/peek.go
@@ -22,9 +22,9 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"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/subscription/reset_cursor.go b/pkg/ctl/subscription/reset_cursor.go
index 5a71a7e..372640c 100644
--- a/pkg/ctl/subscription/reset_cursor.go
+++ b/pkg/ctl/subscription/reset_cursor.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"time"
 
+	"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/subscription/skip.go b/pkg/ctl/subscription/skip.go
index 08cad60..1212b9c 100644
--- a/pkg/ctl/subscription/skip.go
+++ b/pkg/ctl/subscription/skip.go
@@ -18,9 +18,9 @@
 package subscription
 
 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/tenant/create.go b/pkg/ctl/tenant/create.go
index 0e099cf..9c9eacd 100644
--- a/pkg/ctl/tenant/create.go
+++ b/pkg/ctl/tenant/create.go
@@ -18,8 +18,8 @@
 package tenant
 
 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/tenant/update.go b/pkg/ctl/tenant/update.go
index 09756d2..068fe92 100644
--- a/pkg/ctl/tenant/update.go
+++ b/pkg/ctl/tenant/update.go
@@ -18,8 +18,8 @@
 package tenant
 
 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/topic/bundle_range.go b/pkg/ctl/topic/bundle_range.go
index 9ad1b0d..4e92fb3 100644
--- a/pkg/ctl/topic/bundle_range.go
+++ b/pkg/ctl/topic/bundle_range.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/compact.go b/pkg/ctl/topic/compact.go
index 4274ee6..7ddd282 100644
--- a/pkg/ctl/topic/compact.go
+++ b/pkg/ctl/topic/compact.go
@@ -18,9 +18,9 @@
 package topic
 
 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/topic/compact_status.go b/pkg/ctl/topic/compact_status.go
index c927097..8ebd9c1 100644
--- a/pkg/ctl/topic/compact_status.go
+++ b/pkg/ctl/topic/compact_status.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"time"
 
+	"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/topic/create.go b/pkg/ctl/topic/create.go
index a245687..24654ea 100644
--- a/pkg/ctl/topic/create.go
+++ b/pkg/ctl/topic/create.go
@@ -20,8 +20,8 @@ package topic
 import (
 	"strconv"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/topic/delete.go b/pkg/ctl/topic/delete.go
index 87bc3c9..eed204b 100644
--- a/pkg/ctl/topic/delete.go
+++ b/pkg/ctl/topic/delete.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/get.go b/pkg/ctl/topic/get.go
index 339da5a..884ef2f 100644
--- a/pkg/ctl/topic/get.go
+++ b/pkg/ctl/topic/get.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_backlog_quota.go b/pkg/ctl/topic/get_backlog_quota.go
index de95e5a..c8ccaf7 100644
--- a/pkg/ctl/topic/get_backlog_quota.go
+++ b/pkg/ctl/topic/get_backlog_quota.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/get_compaction_threshold.go b/pkg/ctl/topic/get_compaction_threshold.go
index ba44101..5902ebd 100644
--- a/pkg/ctl/topic/get_compaction_threshold.go
+++ b/pkg/ctl/topic/get_compaction_threshold.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/get_deduplication_status.go b/pkg/ctl/topic/get_deduplication_status.go
index ecc4442..e2fb73c 100644
--- a/pkg/ctl/topic/get_deduplication_status.go
+++ b/pkg/ctl/topic/get_deduplication_status.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_delayed_delivery.go b/pkg/ctl/topic/get_delayed_delivery.go
index 462123e..2de5bd0 100644
--- a/pkg/ctl/topic/get_delayed_delivery.go
+++ b/pkg/ctl/topic/get_delayed_delivery.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_dispatch_rate.go b/pkg/ctl/topic/get_dispatch_rate.go
index 3ee5691..2a0cccd 100644
--- a/pkg/ctl/topic/get_dispatch_rate.go
+++ b/pkg/ctl/topic/get_dispatch_rate.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_inactive_topic.go b/pkg/ctl/topic/get_inactive_topic.go
index e882add..2c3fd67 100644
--- a/pkg/ctl/topic/get_inactive_topic.go
+++ b/pkg/ctl/topic/get_inactive_topic.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/get_max_consumers.go b/pkg/ctl/topic/get_max_consumers.go
index 459b5a8..6b0ac94 100644
--- a/pkg/ctl/topic/get_max_consumers.go
+++ b/pkg/ctl/topic/get_max_consumers.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_max_producers.go b/pkg/ctl/topic/get_max_producers.go
index ce9c3c5..07fa1a1 100644
--- a/pkg/ctl/topic/get_max_producers.go
+++ b/pkg/ctl/topic/get_max_producers.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_max_unack_messages_per_consumer.go b/pkg/ctl/topic/get_max_unack_messages_per_consumer.go
index 8f739d6..d092922 100644
--- a/pkg/ctl/topic/get_max_unack_messages_per_consumer.go
+++ b/pkg/ctl/topic/get_max_unack_messages_per_consumer.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_max_unack_messages_per_subscription.go b/pkg/ctl/topic/get_max_unack_messages_per_subscription.go
index c5e1b31..5f071f1 100644
--- a/pkg/ctl/topic/get_max_unack_messages_per_subscription.go
+++ b/pkg/ctl/topic/get_max_unack_messages_per_subscription.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_message_ttl.go b/pkg/ctl/topic/get_message_ttl.go
index a8aaae7..c10a3c2 100644
--- a/pkg/ctl/topic/get_message_ttl.go
+++ b/pkg/ctl/topic/get_message_ttl.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_permissions.go b/pkg/ctl/topic/get_permissions.go
index 6560f05..708ad4b 100644
--- a/pkg/ctl/topic/get_permissions.go
+++ b/pkg/ctl/topic/get_permissions.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_persistence.go b/pkg/ctl/topic/get_persistence.go
index 778b169..bb825d4 100644
--- a/pkg/ctl/topic/get_persistence.go
+++ b/pkg/ctl/topic/get_persistence.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_publish_rate.go b/pkg/ctl/topic/get_publish_rate.go
index d4fdd7c..e03ed25 100644
--- a/pkg/ctl/topic/get_publish_rate.go
+++ b/pkg/ctl/topic/get_publish_rate.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/get_retention.go b/pkg/ctl/topic/get_retention.go
index 9deaaee..a106cc5 100644
--- a/pkg/ctl/topic/get_retention.go
+++ b/pkg/ctl/topic/get_retention.go
@@ -18,8 +18,8 @@
 package topic
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/topic/grant_permissions.go b/pkg/ctl/topic/grant_permissions.go
index 14f4d9f..dc3ea9f 100644
--- a/pkg/ctl/topic/grant_permissions.go
+++ b/pkg/ctl/topic/grant_permissions.go
@@ -18,10 +18,10 @@
 package topic
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/topic/internal.go b/pkg/ctl/topic/internal.go
index 5b00681..f928b32 100644
--- a/pkg/ctl/topic/internal.go
+++ b/pkg/ctl/topic/internal.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/last_messageId.go b/pkg/ctl/topic/last_messageId.go
index 2c31460..618f260 100644
--- a/pkg/ctl/topic/last_messageId.go
+++ b/pkg/ctl/topic/last_messageId.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/list.go b/pkg/ctl/topic/list.go
index 0bde9d0..2a189e9 100644
--- a/pkg/ctl/topic/list.go
+++ b/pkg/ctl/topic/list.go
@@ -20,8 +20,8 @@ package topic
 import (
 	"io"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/olekukonko/tablewriter"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/topic/lookup_topic.go b/pkg/ctl/topic/lookup_topic.go
index 802ebbb..1b0321d 100644
--- a/pkg/ctl/topic/lookup_topic.go
+++ b/pkg/ctl/topic/lookup_topic.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/offload.go b/pkg/ctl/topic/offload.go
index 4a41f55..ce7ed9c 100644
--- a/pkg/ctl/topic/offload.go
+++ b/pkg/ctl/topic/offload.go
@@ -18,8 +18,8 @@
 package topic
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	util "github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 	"github.com/streamnative/pulsarctl/pkg/ctl/utils"
@@ -130,9 +130,9 @@ func findFirstLedgerWithinThreshold(ledgers []util.LedgerInfo, sizeThreshold int
 		suffixSize += ledgers[i].Size
 		if suffixSize > sizeThreshold {
 			return &util.MessageID{
-				LedgerID:         previousLedger,
-				EntryID:          0,
-				PartitionedIndex: -1,
+				LedgerID:       previousLedger,
+				EntryID:        0,
+				PartitionIndex: -1,
 			}
 		}
 		previousLedger = ledgers[i].LedgerID
diff --git a/pkg/ctl/topic/offload_status.go b/pkg/ctl/topic/offload_status.go
index d11c32a..3350471 100644
--- a/pkg/ctl/topic/offload_status.go
+++ b/pkg/ctl/topic/offload_status.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"time"
 
+	"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/topic/remove_backlog_quota.go b/pkg/ctl/topic/remove_backlog_quota.go
index 8d715a8..296ff8d 100644
--- a/pkg/ctl/topic/remove_backlog_quota.go
+++ b/pkg/ctl/topic/remove_backlog_quota.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/remove_compaction_threshold.go b/pkg/ctl/topic/remove_compaction_threshold.go
index 09b2189..0f003a1 100644
--- a/pkg/ctl/topic/remove_compaction_threshold.go
+++ b/pkg/ctl/topic/remove_compaction_threshold.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_deduplication_status.go b/pkg/ctl/topic/remove_deduplication_status.go
index bb7695f..a1b5940 100644
--- a/pkg/ctl/topic/remove_deduplication_status.go
+++ b/pkg/ctl/topic/remove_deduplication_status.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_delayed_delivery.go b/pkg/ctl/topic/remove_delayed_delivery.go
index f5b9470..484d6b4 100644
--- a/pkg/ctl/topic/remove_delayed_delivery.go
+++ b/pkg/ctl/topic/remove_delayed_delivery.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_dispatch_rate.go b/pkg/ctl/topic/remove_dispatch_rate.go
index 5a7ab9c..6bebc46 100644
--- a/pkg/ctl/topic/remove_dispatch_rate.go
+++ b/pkg/ctl/topic/remove_dispatch_rate.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_inactive_topic.go b/pkg/ctl/topic/remove_inactive_topic.go
index a9eb1ae..21625a4 100644
--- a/pkg/ctl/topic/remove_inactive_topic.go
+++ b/pkg/ctl/topic/remove_inactive_topic.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_max_consumer.go b/pkg/ctl/topic/remove_max_consumer.go
index 5b5a946..79e35a3 100644
--- a/pkg/ctl/topic/remove_max_consumer.go
+++ b/pkg/ctl/topic/remove_max_consumer.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_max_producers.go b/pkg/ctl/topic/remove_max_producers.go
index 245c37f..7e736b5 100644
--- a/pkg/ctl/topic/remove_max_producers.go
+++ b/pkg/ctl/topic/remove_max_producers.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_max_unack_messages_per_consumer.go b/pkg/ctl/topic/remove_max_unack_messages_per_consumer.go
index 162cab7..b41605d 100644
--- a/pkg/ctl/topic/remove_max_unack_messages_per_consumer.go
+++ b/pkg/ctl/topic/remove_max_unack_messages_per_consumer.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_max_unack_messages_per_subscription.go b/pkg/ctl/topic/remove_max_unack_messages_per_subscription.go
index 3afd0e7..6d6a28a 100644
--- a/pkg/ctl/topic/remove_max_unack_messages_per_subscription.go
+++ b/pkg/ctl/topic/remove_max_unack_messages_per_subscription.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_message_ttl.go b/pkg/ctl/topic/remove_message_ttl.go
index eb77ffe..d845d7e 100644
--- a/pkg/ctl/topic/remove_message_ttl.go
+++ b/pkg/ctl/topic/remove_message_ttl.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_persistence.go b/pkg/ctl/topic/remove_persistence.go
index 22ee2a0..12fd604 100644
--- a/pkg/ctl/topic/remove_persistence.go
+++ b/pkg/ctl/topic/remove_persistence.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_publish_rate.go b/pkg/ctl/topic/remove_publish_rate.go
index 54e54e9..4e57e53 100644
--- a/pkg/ctl/topic/remove_publish_rate.go
+++ b/pkg/ctl/topic/remove_publish_rate.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/remove_retention.go b/pkg/ctl/topic/remove_retention.go
index 7f39f76..c8f2a56 100644
--- a/pkg/ctl/topic/remove_retention.go
+++ b/pkg/ctl/topic/remove_retention.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/revoke_permissions.go b/pkg/ctl/topic/revoke_permissions.go
index 6a48201..a8be647 100644
--- a/pkg/ctl/topic/revoke_permissions.go
+++ b/pkg/ctl/topic/revoke_permissions.go
@@ -18,10 +18,10 @@
 package topic
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"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/topic/set_backlog_quota.go b/pkg/ctl/topic/set_backlog_quota.go
index b6b15d4..1b365bf 100644
--- a/pkg/ctl/topic/set_backlog_quota.go
+++ b/pkg/ctl/topic/set_backlog_quota.go
@@ -18,9 +18,9 @@
 package topic
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/topic/set_compaction_threshold.go b/pkg/ctl/topic/set_compaction_threshold.go
index 687aabf..8a3af15 100644
--- a/pkg/ctl/topic/set_compaction_threshold.go
+++ b/pkg/ctl/topic/set_compaction_threshold.go
@@ -18,9 +18,9 @@
 package topic
 
 import (
+	util "github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	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/topic/set_deduplication_status.go b/pkg/ctl/topic/set_deduplication_status.go
index 7f20f9d..f94dafc 100644
--- a/pkg/ctl/topic/set_deduplication_status.go
+++ b/pkg/ctl/topic/set_deduplication_status.go
@@ -18,9 +18,9 @@
 package topic
 
 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/topic/set_delayed_delivery.go b/pkg/ctl/topic/set_delayed_delivery.go
index 81f63b8..0fbbe97 100644
--- a/pkg/ctl/topic/set_delayed_delivery.go
+++ b/pkg/ctl/topic/set_delayed_delivery.go
@@ -18,9 +18,9 @@
 package topic
 
 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"
 	ctlUtil "github.com/streamnative/pulsarctl/pkg/ctl/utils"
diff --git a/pkg/ctl/topic/set_dispatch_rate.go b/pkg/ctl/topic/set_dispatch_rate.go
index b4407e7..1375986 100644
--- a/pkg/ctl/topic/set_dispatch_rate.go
+++ b/pkg/ctl/topic/set_dispatch_rate.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_inactive_topic.go b/pkg/ctl/topic/set_inactive_topic.go
index 3556d9c..04d5143 100644
--- a/pkg/ctl/topic/set_inactive_topic.go
+++ b/pkg/ctl/topic/set_inactive_topic.go
@@ -18,9 +18,9 @@
 package topic
 
 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"
 	ctlutils "github.com/streamnative/pulsarctl/pkg/ctl/utils"
diff --git a/pkg/ctl/topic/set_max_consumers.go b/pkg/ctl/topic/set_max_consumers.go
index ec2f0f4..f8cc3bc 100644
--- a/pkg/ctl/topic/set_max_consumers.go
+++ b/pkg/ctl/topic/set_max_consumers.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_max_producers.go b/pkg/ctl/topic/set_max_producers.go
index 7d7a0a7..5ebf800 100644
--- a/pkg/ctl/topic/set_max_producers.go
+++ b/pkg/ctl/topic/set_max_producers.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_max_unack_messages_per_consumer.go b/pkg/ctl/topic/set_max_unack_messages_per_consumer.go
index fcc1971..c1d4ad3 100644
--- a/pkg/ctl/topic/set_max_unack_messages_per_consumer.go
+++ b/pkg/ctl/topic/set_max_unack_messages_per_consumer.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_max_unack_messages_per_subscription.go b/pkg/ctl/topic/set_max_unack_messages_per_subscription.go
index 34e67f6..865554b 100644
--- a/pkg/ctl/topic/set_max_unack_messages_per_subscription.go
+++ b/pkg/ctl/topic/set_max_unack_messages_per_subscription.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_message_ttl.go b/pkg/ctl/topic/set_message_ttl.go
index 4378c4a..25532f6 100644
--- a/pkg/ctl/topic/set_message_ttl.go
+++ b/pkg/ctl/topic/set_message_ttl.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_persistence.go b/pkg/ctl/topic/set_persistence.go
index ee54197..1076216 100644
--- a/pkg/ctl/topic/set_persistence.go
+++ b/pkg/ctl/topic/set_persistence.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_publish_rate.go b/pkg/ctl/topic/set_publish_rate.go
index 44d9935..bab9df3 100644
--- a/pkg/ctl/topic/set_publish_rate.go
+++ b/pkg/ctl/topic/set_publish_rate.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/set_retention.go b/pkg/ctl/topic/set_retention.go
index 8c07eae..b0d2880 100644
--- a/pkg/ctl/topic/set_retention.go
+++ b/pkg/ctl/topic/set_retention.go
@@ -18,10 +18,10 @@
 package topic
 
 import (
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 	ctlutils "github.com/streamnative/pulsarctl/pkg/ctl/utils"
diff --git a/pkg/ctl/topic/stats.go b/pkg/ctl/topic/stats.go
index dc617ae..93458a5 100644
--- a/pkg/ctl/topic/stats.go
+++ b/pkg/ctl/topic/stats.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/stats_internal.go b/pkg/ctl/topic/stats_internal.go
index 99b223e..20dbfe3 100644
--- a/pkg/ctl/topic/stats_internal.go
+++ b/pkg/ctl/topic/stats_internal.go
@@ -18,8 +18,8 @@
 package topic
 
 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/topic/teminate.go b/pkg/ctl/topic/teminate.go
index b6603ee..6c612fd 100644
--- a/pkg/ctl/topic/teminate.go
+++ b/pkg/ctl/topic/teminate.go
@@ -18,9 +18,9 @@
 package topic
 
 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/topic/unload.go b/pkg/ctl/topic/unload.go
index b0511a7..681e538 100644
--- a/pkg/ctl/topic/unload.go
+++ b/pkg/ctl/topic/unload.go
@@ -18,7 +18,7 @@
 package topic
 
 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/topic/update.go b/pkg/ctl/topic/update.go
index 593667a..a2ee752 100644
--- a/pkg/ctl/topic/update.go
+++ b/pkg/ctl/topic/update.go
@@ -20,8 +20,8 @@ package topic
 import (
 	"strconv"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/ctl/utils/util.go b/pkg/ctl/utils/util.go
index e6d3534..347a848 100644
--- a/pkg/ctl/utils/util.go
+++ b/pkg/ctl/utils/util.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/pkg/errors"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 )
 
 const (
diff --git a/pkg/oauth2/active.go b/pkg/oauth2/active.go
index 9d14a10..9329403 100644
--- a/pkg/oauth2/active.go
+++ b/pkg/oauth2/active.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	o "github.com/apache/pulsar-client-go/oauth2"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/auth"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/auth"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 )
diff --git a/pkg/oauth2/login.go b/pkg/oauth2/login.go
index 7f73cd7..9379146 100644
--- a/pkg/oauth2/login.go
+++ b/pkg/oauth2/login.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	o "github.com/apache/pulsar-client-go/oauth2"
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/admin/auth"
 	"github.com/spf13/pflag"
-	"github.com/streamnative/pulsar-admin-go/pkg/admin/auth"
 
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
 	"github.com/streamnative/pulsarctl/pkg/oauth2/os"


Test patch:
diff --git a/pkg/ctl/brokers/config_test.go b/pkg/ctl/brokers/config_test.go
index cceb4db..8c92ec7 100644
--- 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/namespaces_test.go b/pkg/ctl/brokers/namespaces_test.go
index ef0615d..e8072c9 100644
--- 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/brokerstats/allocator_stats_test.go b/pkg/ctl/brokerstats/allocator_stats_test.go
index fe90624..733d495 100644
--- 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
index 62c63ac..aff2b88 100644
--- 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
index 9beecfd..a3f4719 100644
--- 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/get_failure_domain_test.go b/pkg/ctl/cluster/get_failure_domain_test.go
index 83b7a8f..9f11b6b 100644
--- 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
index 3866941..0afff3a 100644
--- 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
index 73a62cb..8ac09ed 100644
--- 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/update_failure_domain_test.go b/pkg/ctl/cluster/update_failure_domain_test.go
index 57ab9aa..32aad92 100644
--- 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_test.go b/pkg/ctl/cluster/update_peer_clusters_test.go
index 40a7e8a..156cde6 100644
--- 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
index 574b13f..ab4c159 100644
--- 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_test.go b/pkg/ctl/context/create_context_test.go
index c1299bc..8c40e43 100644
--- 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
index 4e702f1..71027f5 100644
--- 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/rename_context_test.go b/pkg/ctl/context/rename_context_test.go
index 9ccf9f2..6bc9093 100644
--- 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/get_test.go b/pkg/ctl/functions/get_test.go
index e40ecec..920de9b 100644
--- a/pkg/ctl/functions/get_test.go
+++ b/pkg/ctl/functions/get_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"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/test"
diff --git a/pkg/ctl/functions/putstate_test.go b/pkg/ctl/functions/putstate_test.go
index 6fee62e..166b674 100644
--- a/pkg/ctl/functions/putstate_test.go
+++ b/pkg/ctl/functions/putstate_test.go
@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"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/functions/restart_test.go b/pkg/ctl/functions/restart_test.go
index 626134a..4000584 100644
--- a/pkg/ctl/functions/restart_test.go
+++ b/pkg/ctl/functions/restart_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"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/functions/stats_test.go b/pkg/ctl/functions/stats_test.go
index 22732aa..6a62c8e 100644
--- a/pkg/ctl/functions/stats_test.go
+++ b/pkg/ctl/functions/stats_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"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/test"
diff --git a/pkg/ctl/functions/status_test.go b/pkg/ctl/functions/status_test.go
index d08385f..48d5f36 100644
--- a/pkg/ctl/functions/status_test.go
+++ b/pkg/ctl/functions/status_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"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/functions/trigger_test.go b/pkg/ctl/functions/trigger_test.go
index 8804186..6092446 100644
--- a/pkg/ctl/functions/trigger_test.go
+++ b/pkg/ctl/functions/trigger_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"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/test"
diff --git a/pkg/ctl/functions/update_test.go b/pkg/ctl/functions/update_test.go
index e3eb7f6..1c1817a 100644
--- a/pkg/ctl/functions/update_test.go
+++ b/pkg/ctl/functions/update_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"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/test"
diff --git a/pkg/ctl/functionsworker/functions_worker_test.go b/pkg/ctl/functionsworker/functions_worker_test.go
index f03b632..44c61ca 100644
--- a/pkg/ctl/functionsworker/functions_worker_test.go
+++ b/pkg/ctl/functionsworker/functions_worker_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/namespace/backlog_quota_test.go b/pkg/ctl/namespace/backlog_quota_test.go
index 9969647..7184c87 100644
--- a/pkg/ctl/namespace/backlog_quota_test.go
+++ b/pkg/ctl/namespace/backlog_quota_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/namespace/create_test.go b/pkg/ctl/namespace/create_test.go
index 0a47dba..db0e32a 100644
--- a/pkg/ctl/namespace/create_test.go
+++ b/pkg/ctl/namespace/create_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"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/ctl/cluster"
diff --git a/pkg/ctl/namespace/dispatch_rate_test.go b/pkg/ctl/namespace/dispatch_rate_test.go
index 8910513..e827d15 100644
--- a/pkg/ctl/namespace/dispatch_rate_test.go
+++ b/pkg/ctl/namespace/dispatch_rate_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/test"
diff --git a/pkg/ctl/namespace/permissions_test.go b/pkg/ctl/namespace/permissions_test.go
index f99ead0..239b07c 100644
--- a/pkg/ctl/namespace/permissions_test.go
+++ b/pkg/ctl/namespace/permissions_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/namespace/persistence_test.go b/pkg/ctl/namespace/persistence_test.go
index e43dc52..590f3c8 100644
--- a/pkg/ctl/namespace/persistence_test.go
+++ b/pkg/ctl/namespace/persistence_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/namespace/policies_test.go b/pkg/ctl/namespace/policies_test.go
index 7a93ca8..eabc200 100644
--- a/pkg/ctl/namespace/policies_test.go
+++ b/pkg/ctl/namespace/policies_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/namespace/publish_rate_test.go b/pkg/ctl/namespace/publish_rate_test.go
index b3bbb19..f26f8d7 100644
--- a/pkg/ctl/namespace/publish_rate_test.go
+++ b/pkg/ctl/namespace/publish_rate_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/test"
diff --git a/pkg/ctl/namespace/replicator_dispatch_rate_test.go b/pkg/ctl/namespace/replicator_dispatch_rate_test.go
index 5dae2c7..d2fe38c 100644
--- a/pkg/ctl/namespace/replicator_dispatch_rate_test.go
+++ b/pkg/ctl/namespace/replicator_dispatch_rate_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/test"
diff --git a/pkg/ctl/namespace/retention_test.go b/pkg/ctl/namespace/retention_test.go
index 2d682c4..b72eea9 100644
--- a/pkg/ctl/namespace/retention_test.go
+++ b/pkg/ctl/namespace/retention_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/namespace/schema_autoupdate_strategy_test.go b/pkg/ctl/namespace/schema_autoupdate_strategy_test.go
index 72f4f9a..7ab00ff 100644
--- a/pkg/ctl/namespace/schema_autoupdate_strategy_test.go
+++ b/pkg/ctl/namespace/schema_autoupdate_strategy_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"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/namespace/set_encryption_require_test.go b/pkg/ctl/namespace/set_encryption_require_test.go
index 54df68a..a91f124 100644
--- a/pkg/ctl/namespace/set_encryption_require_test.go
+++ b/pkg/ctl/namespace/set_encryption_require_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/namespace/set_subscription_auth_mode_test.go b/pkg/ctl/namespace/set_subscription_auth_mode_test.go
index 75c870f..8c35643 100644
--- a/pkg/ctl/namespace/set_subscription_auth_mode_test.go
+++ b/pkg/ctl/namespace/set_subscription_auth_mode_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/namespace/subscribe_rate_test.go b/pkg/ctl/namespace/subscribe_rate_test.go
index 6a39791..9798101 100644
--- a/pkg/ctl/namespace/subscribe_rate_test.go
+++ b/pkg/ctl/namespace/subscribe_rate_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/namespace/subscription_dispatch_rate_test.go b/pkg/ctl/namespace/subscription_dispatch_rate_test.go
index e536289..f8364df 100644
--- a/pkg/ctl/namespace/subscription_dispatch_rate_test.go
+++ b/pkg/ctl/namespace/subscription_dispatch_rate_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"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/nsisolationpolicy/broker_test.go b/pkg/ctl/nsisolationpolicy/broker_test.go
index 59dad37..db5ebff 100644
--- a/pkg/ctl/nsisolationpolicy/broker_test.go
+++ b/pkg/ctl/nsisolationpolicy/broker_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"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/nsisolationpolicy/ns_isolation_policy_test.go b/pkg/ctl/nsisolationpolicy/ns_isolation_policy_test.go
index c3eaf38..4454255 100644
--- a/pkg/ctl/nsisolationpolicy/ns_isolation_policy_test.go
+++ b/pkg/ctl/nsisolationpolicy/ns_isolation_policy_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/resourcequotas/resource_quota_test.go b/pkg/ctl/resourcequotas/resource_quota_test.go
index 6205caa..794c247 100644
--- a/pkg/ctl/resourcequotas/resource_quota_test.go
+++ b/pkg/ctl/resourcequotas/resource_quota_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/sinks/opeations_test.go b/pkg/ctl/sinks/opeations_test.go
index 6883812..256716e 100644
--- a/pkg/ctl/sinks/opeations_test.go
+++ b/pkg/ctl/sinks/opeations_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"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/sources/operations_test.go b/pkg/ctl/sources/operations_test.go
index db4c718..af15950 100644
--- a/pkg/ctl/sources/operations_test.go
+++ b/pkg/ctl/sources/operations_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"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/tenant/get_test.go b/pkg/ctl/tenant/get_test.go
index 2677410..6e18b15 100644
--- a/pkg/ctl/tenant/get_test.go
+++ b/pkg/ctl/tenant/get_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/tenant/update_test.go b/pkg/ctl/tenant/update_test.go
index 7b90735..50e398c 100644
--- a/pkg/ctl/tenant/update_test.go
+++ b/pkg/ctl/tenant/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/topic/backlog_quota_test.go b/pkg/ctl/topic/backlog_quota_test.go
index 714d23f..41b1d0d 100644
--- a/pkg/ctl/topic/backlog_quota_test.go
+++ b/pkg/ctl/topic/backlog_quota_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"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/test"
diff --git a/pkg/ctl/topic/delayed_delivery_test.go b/pkg/ctl/topic/delayed_delivery_test.go
index 9626e28..93eaba3 100644
--- a/pkg/ctl/topic/delayed_delivery_test.go
+++ b/pkg/ctl/topic/delayed_delivery_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"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/topic/dispatch_rate_test.go b/pkg/ctl/topic/dispatch_rate_test.go
index 26a0d99..7052d44 100644
--- a/pkg/ctl/topic/dispatch_rate_test.go
+++ b/pkg/ctl/topic/dispatch_rate_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/onsi/gomega"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 )
 
 func TestDispatchRate(t *testing.T) {
diff --git a/pkg/ctl/topic/get_test.go b/pkg/ctl/topic/get_test.go
index b91d994..f010250 100644
--- a/pkg/ctl/topic/get_test.go
+++ b/pkg/ctl/topic/get_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/topic/grant_permissions_test.go b/pkg/ctl/topic/grant_permissions_test.go
index a9837dd..c927876 100644
--- a/pkg/ctl/topic/grant_permissions_test.go
+++ b/pkg/ctl/topic/grant_permissions_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/topic/inactive_topic_test.go b/pkg/ctl/topic/inactive_topic_test.go
index bab30e0..f808e26 100644
--- a/pkg/ctl/topic/inactive_topic_test.go
+++ b/pkg/ctl/topic/inactive_topic_test.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/onsi/gomega"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/test"
 )
diff --git a/pkg/ctl/topic/lookup_topic_test.go b/pkg/ctl/topic/lookup_topic_test.go
index 786e963..add635e 100644
--- a/pkg/ctl/topic/lookup_topic_test.go
+++ b/pkg/ctl/topic/lookup_topic_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/topic/persistence_test.go b/pkg/ctl/topic/persistence_test.go
index e474f75..504c693 100644
--- a/pkg/ctl/topic/persistence_test.go
+++ b/pkg/ctl/topic/persistence_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/onsi/gomega"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 )
 
 func TestPersistence(t *testing.T) {
diff --git a/pkg/ctl/topic/publish_rate_test.go b/pkg/ctl/topic/publish_rate_test.go
index 9288681..f24dcf9 100644
--- a/pkg/ctl/topic/publish_rate_test.go
+++ b/pkg/ctl/topic/publish_rate_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/onsi/gomega"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 )
 
 func TestPublishRate(t *testing.T) {
diff --git a/pkg/ctl/topic/retention_test.go b/pkg/ctl/topic/retention_test.go
index 69cc0d5..c9926e5 100644
--- a/pkg/ctl/topic/retention_test.go
+++ b/pkg/ctl/topic/retention_test.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/onsi/gomega"
-	"github.com/streamnative/pulsar-admin-go/pkg/utils"
 
 	"github.com/streamnative/pulsarctl/pkg/test"
 )
diff --git a/pkg/ctl/topic/revoke_permissions_test.go b/pkg/ctl/topic/revoke_permissions_test.go
index be9bb7a..ad49279 100644
--- a/pkg/ctl/topic/revoke_permissions_test.go
+++ b/pkg/ctl/topic/revoke_permissions_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/topic/stats_internal_test.go b/pkg/ctl/topic/stats_internal_test.go
index 3b13fad..9ce988a 100644
--- a/pkg/ctl/topic/stats_internal_test.go
+++ b/pkg/ctl/topic/stats_internal_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/topic/stats_test.go b/pkg/ctl/topic/stats_test.go
index c3a0ce7..0e8015b 100644
--- a/pkg/ctl/topic/stats_test.go
+++ b/pkg/ctl/topic/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/topic/update_test.go b/pkg/ctl/topic/update_test.go
index 1073939..b0f09d1 100644
--- a/pkg/ctl/topic/update_test.go
+++ b/pkg/ctl/topic/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"
 )