chore: cli does not use cli-runtime deprecated method (#5406)

apecloud · Oct 13, 2023 · 6ed51fb · 6ed51fb
1 parent 9847a03
commit 6ed51fb
Show file tree

Hide file tree

Showing 209 changed files with 705 additions and 689 deletions.
diff --git a/internal/cli/cmd/accounts/base.go b/internal/cli/cmd/accounts/base.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/klog/v2"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
@@ -61,7 +61,7 @@ var (
 	errClusterNameorInstName = fmt.Errorf("specify either cluster name or --instance")
 )
 
-func NewAccountBaseOptions(f cmdutil.Factory, streams genericclioptions.IOStreams, op lorryutil.OperationKind) *AccountBaseOptions {
+func NewAccountBaseOptions(f cmdutil.Factory, streams genericiooptions.IOStreams, op lorryutil.OperationKind) *AccountBaseOptions {
 	return &AccountBaseOptions{
 		ExecOptions: exec.NewExecOptions(f, streams),
 		AccountOp:   op,
@@ -147,7 +147,7 @@ func (o *AccountBaseOptions) Complete(f cmdutil.Factory) error {
 	return nil
 }
 
-func (o *AccountBaseOptions) Run(cmd *cobra.Command, f cmdutil.Factory, streams genericclioptions.IOStreams) error {
+func (o *AccountBaseOptions) Run(cmd *cobra.Command, f cmdutil.Factory, streams genericiooptions.IOStreams) error {
 	var err error
 	response, err := o.Do()
 	if err != nil {

diff --git a/internal/cli/cmd/accounts/base_test.go b/internal/cli/cmd/accounts/base_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -44,14 +44,14 @@ var _ = Describe("Base Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/accounts/create.go b/internal/cli/cmd/accounts/create.go
@@ -22,7 +22,7 @@ package accounts
 import (
 	"github.com/sethvargo/go-password/password"
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
 	lorryutil "github.com/apecloud/kubeblocks/lorry/util"
@@ -33,7 +33,7 @@ type CreateUserOptions struct {
 	info lorryutil.UserInfo
 }
 
-func NewCreateUserOptions(f cmdutil.Factory, streams genericclioptions.IOStreams) *CreateUserOptions {
+func NewCreateUserOptions(f cmdutil.Factory, streams genericiooptions.IOStreams) *CreateUserOptions {
 	return &CreateUserOptions{
 		AccountBaseOptions: NewAccountBaseOptions(f, streams, lorryutil.CreateUserOp),
 	}

diff --git a/internal/cli/cmd/accounts/create_test.go b/internal/cli/cmd/accounts/create_test.go
@@ -24,9 +24,10 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -44,14 +45,14 @@ var _ = Describe("Create Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/accounts/delete.go b/internal/cli/cmd/accounts/delete.go
@@ -21,7 +21,7 @@ package accounts
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
 	"github.com/apecloud/kubeblocks/internal/cli/util/prompt"
@@ -34,7 +34,7 @@ type DeleteUserOptions struct {
 	info        lorryutil.UserInfo
 }
 
-func NewDeleteUserOptions(f cmdutil.Factory, streams genericclioptions.IOStreams) *DeleteUserOptions {
+func NewDeleteUserOptions(f cmdutil.Factory, streams genericiooptions.IOStreams) *DeleteUserOptions {
 	return &DeleteUserOptions{
 		AccountBaseOptions: NewAccountBaseOptions(f, streams, lorryutil.DeleteUserOp),
 	}

diff --git a/internal/cli/cmd/accounts/delete_test.go b/internal/cli/cmd/accounts/delete_test.go
@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -45,15 +45,15 @@ var _ = Describe("Delete Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		in      *bytes.Buffer
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, in, _, _ = genericclioptions.NewTestIOStreams()
+		streams, in, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/accounts/describe.go b/internal/cli/cmd/accounts/describe.go
@@ -21,7 +21,7 @@ package accounts
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
 	lorryutil "github.com/apecloud/kubeblocks/lorry/util"
@@ -32,7 +32,7 @@ type DescribeUserOptions struct {
 	info lorryutil.UserInfo
 }
 
-func NewDescribeUserOptions(f cmdutil.Factory, streams genericclioptions.IOStreams) *DescribeUserOptions {
+func NewDescribeUserOptions(f cmdutil.Factory, streams genericiooptions.IOStreams) *DescribeUserOptions {
 	return &DescribeUserOptions{
 		AccountBaseOptions: NewAccountBaseOptions(f, streams, lorryutil.DescribeUserOp),
 	}

diff --git a/internal/cli/cmd/accounts/describe_test.go b/internal/cli/cmd/accounts/describe_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -44,14 +44,14 @@ var _ = Describe("Describe Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/accounts/grant.go b/internal/cli/cmd/accounts/grant.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/slices"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/klog/v2"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
@@ -36,7 +36,7 @@ type GrantOptions struct {
 	info lorryutil.UserInfo
 }
 
-func NewGrantOptions(f cmdutil.Factory, streams genericclioptions.IOStreams, op lorryutil.OperationKind) *GrantOptions {
+func NewGrantOptions(f cmdutil.Factory, streams genericiooptions.IOStreams, op lorryutil.OperationKind) *GrantOptions {
 	if (op != lorryutil.GrantUserRoleOp) && (op != lorryutil.RevokeUserRoleOp) {
 		klog.V(1).Infof("invalid operation kind: %s", op)
 		return nil

diff --git a/internal/cli/cmd/accounts/grant_test.go b/internal/cli/cmd/accounts/grant_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -44,14 +44,14 @@ var _ = Describe("Grant Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/accounts/list.go b/internal/cli/cmd/accounts/list.go
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package accounts
 
 import (
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 
 	lorryutil "github.com/apecloud/kubeblocks/lorry/util"
@@ -30,7 +30,7 @@ type ListUserOptions struct {
 	*AccountBaseOptions
 }
 
-func NewListUserOptions(f cmdutil.Factory, streams genericclioptions.IOStreams) *ListUserOptions {
+func NewListUserOptions(f cmdutil.Factory, streams genericiooptions.IOStreams) *ListUserOptions {
 	return &ListUserOptions{
 		AccountBaseOptions: NewAccountBaseOptions(f, streams, lorryutil.ListUsersOp),
 	}

diff --git a/internal/cli/cmd/accounts/list_test.go b/internal/cli/cmd/accounts/list_test.go
@@ -24,9 +24,10 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes/scheme"
 	clientfake "k8s.io/client-go/rest/fake"
@@ -44,14 +45,14 @@ var _ = Describe("List Account Options", func() {
 	)
 
 	var (
-		streams genericclioptions.IOStreams
+		streams genericiooptions.IOStreams
 		tf      *cmdtesting.TestFactory
 		cluster = testing.FakeCluster(clusterName, namespace)
 		pods    = testing.FakePods(3, namespace, clusterName)
 	)
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = testing.NewTestFactory(namespace)
 		codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
 		httpResp := func(obj runtime.Object) *http.Response {

diff --git a/internal/cli/cmd/addon/addon.go b/internal/cli/cmd/addon/addon.go
@@ -37,7 +37,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	discoverycli "k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
@@ -76,7 +76,7 @@ func (r *addonEnableFlags) useDefault() bool {
 }
 
 type addonCmdOpts struct {
-	genericclioptions.IOStreams
+	genericiooptions.IOStreams
 
 	Factory cmdutil.Factory
 	dynamic dynamic.Interface
@@ -90,7 +90,7 @@ type addonCmdOpts struct {
 }
 
 // NewAddonCmd for addon functions
-func NewAddonCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func NewAddonCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "addon COMMAND",
 		Short: "Addon command.",
@@ -104,7 +104,7 @@ func NewAddonCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.
 	return cmd
 }
 
-func newListCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func newListCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := list.NewListOptions(f, streams, types.AddonGVR())
 	cmd := &cobra.Command{
 		Use:               "list",
@@ -120,7 +120,7 @@ func newListCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
 	return cmd
 }
 
-func newDescribeCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func newDescribeCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := &addonCmdOpts{
 		Options:   patch.NewOptions(f, streams, types.AddonGVR()),
 		Factory:   f,
@@ -142,7 +142,7 @@ func newDescribeCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cob
 	return cmd
 }
 
-func newEnableCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func newEnableCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := &addonCmdOpts{
 		Options:          patch.NewOptions(f, streams, types.AddonGVR()),
 		Factory:          f,
@@ -228,7 +228,7 @@ re-enable the addon (More info on how-to resize a PVC: https://kubernetes.io/doc
 	return cmd
 }
 
-func newDisableCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func newDisableCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := &addonCmdOpts{
 		Options:   patch.NewOptions(f, streams, types.AddonGVR()),
 		Factory:   f,

diff --git a/internal/cli/cmd/addon/addon_test.go b/internal/cli/cmd/addon/addon_test.go
@@ -27,7 +27,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -44,11 +44,11 @@ const (
 )
 
 var _ = Describe("Manage applications related to KubeBlocks", func() {
-	var streams genericclioptions.IOStreams
+	var streams genericiooptions.IOStreams
 	var tf *cmdtesting.TestFactory
 
 	BeforeEach(func() {
-		streams, _, _, _ = genericclioptions.NewTestIOStreams()
+		streams, _, _, _ = genericiooptions.NewTestIOStreams()
 		tf = cmdtesting.NewTestFactory().WithNamespace(testNamespace)
 	})
 

diff --git a/internal/cli/cmd/alert/add_receiver.go b/internal/cli/cmd/alert/add_receiver.go
@@ -30,7 +30,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apitypes "k8s.io/apimachinery/pkg/types"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/client-go/kubernetes"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -69,7 +69,7 @@ var (
 )
 
 type baseOptions struct {
-	genericclioptions.IOStreams
+	genericiooptions.IOStreams
 	alertConfigMap   *corev1.ConfigMap
 	webhookConfigMap *corev1.ConfigMap
 	client           kubernetes.Interface
@@ -90,7 +90,7 @@ type addReceiverOptions struct {
 	webhookAdaptorReceivers []webhookAdaptorReceiver
 }
 
-func newAddReceiverCmd(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {
+func newAddReceiverCmd(f cmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := addReceiverOptions{baseOptions: baseOptions{IOStreams: streams}}
 	cmd := &cobra.Command{
 		Use:     "add-receiver",