From 3895887f5e92bb83f8be33e785a53dd2840f554e Mon Sep 17 00:00:00 2001
From: juanvallejo <jvallejo@redhat.com>
Date: Thu, 24 May 2018 15:57:19 -0400
Subject: [PATCH] move scaleClient from factory

---
 pkg/kubectl/cmd/apply.go         |  2 +-
 pkg/kubectl/cmd/rollingupdate.go |  3 +--
 pkg/kubectl/cmd/scale.go         |  2 +-
 pkg/kubectl/cmd/util/factory.go  |  4 ----
 pkg/kubectl/cmd/util/helpers.go  | 34 ++++++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply.go
index fc8f67626dc..18819353753 100644
--- a/pkg/kubectl/cmd/apply.go
+++ b/pkg/kubectl/cmd/apply.go
@@ -220,7 +220,7 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
 		return err
 	}
 
-	o.Scaler, err = f.ScaleClient()
+	o.Scaler, err = cmdutil.ScaleClientFn(f)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go
index 24cde12b467..a82ef567ef1 100644
--- a/pkg/kubectl/cmd/rollingupdate.go
+++ b/pkg/kubectl/cmd/rollingupdate.go
@@ -214,7 +214,7 @@ func (o *RollingUpdateOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, a
 		return err
 	}
 
-	o.ScaleClient, err = f.ScaleClient()
+	o.ScaleClient, err = cmdutil.ScaleClientFn(f)
 	if err != nil {
 		return err
 	}
@@ -242,7 +242,6 @@ func (o *RollingUpdateOptions) Validate(cmd *cobra.Command, args []string) error
 }
 
 func (o *RollingUpdateOptions) Run() error {
-
 	filename := ""
 	if len(o.FilenameOptions.Filenames) > 0 {
 		filename = o.FilenameOptions.Filenames[0]
diff --git a/pkg/kubectl/cmd/scale.go b/pkg/kubectl/cmd/scale.go
index 6b4ffb1b5ff..d873a1ae2a7 100644
--- a/pkg/kubectl/cmd/scale.go
+++ b/pkg/kubectl/cmd/scale.go
@@ -289,7 +289,7 @@ func ScaleJob(info *resource.Info, jobsClient batchclient.JobsGetter, count uint
 }
 
 func scaler(f cmdutil.Factory) (kubectl.Scaler, error) {
-	scalesGetter, err := f.ScaleClient()
+	scalesGetter, err := cmdutil.ScaleClientFn(f)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go
index 0e7f0724797..2718111ae5c 100644
--- a/pkg/kubectl/cmd/util/factory.go
+++ b/pkg/kubectl/cmd/util/factory.go
@@ -25,7 +25,6 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
-	scaleclient "k8s.io/client-go/scale"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl"
@@ -81,9 +80,6 @@ type Factory interface {
 	Validator(validate bool) (validation.Schema, error)
 	// OpenAPISchema returns the schema openapi schema definition
 	OpenAPISchema() (openapi.Resources, error)
-
-	// ScaleClient gives you back scale getter
-	ScaleClient() (scaleclient.ScalesGetter, error)
 }
 
 func makePortsString(ports []api.ServicePort, useNodePort bool) string {
diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go
index b4640f67b25..e942b682b14 100644
--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -38,6 +38,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/scale"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl"
@@ -673,3 +675,35 @@ func genericDescriber(restClientGetter genericclioptions.RESTClientGetter, mappi
 	eventsClient := clientSet.Core()
 	return printersinternal.GenericDescriberFor(mapping, dynamicClient, eventsClient), nil
 }
+
+// ScaleClientFunc provides a ScalesGetter
+type ScaleClientFunc func(genericclioptions.RESTClientGetter) (scale.ScalesGetter, error)
+
+// ScaleClientFn gives a way to easily override the function for unit testing if needed.
+var ScaleClientFn ScaleClientFunc = scaleClient
+
+// scaleClient gives you back scale getter
+func scaleClient(restClientGetter genericclioptions.RESTClientGetter) (scale.ScalesGetter, error) {
+	discoveryClient, err := restClientGetter.ToDiscoveryClient()
+	if err != nil {
+		return nil, err
+	}
+
+	clientConfig, err := restClientGetter.ToRESTConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	setKubernetesDefaults(clientConfig)
+	restClient, err := rest.RESTClientFor(clientConfig)
+	if err != nil {
+		return nil, err
+	}
+	resolver := scale.NewDiscoveryScaleKindResolver(discoveryClient)
+	mapper, err := restClientGetter.ToRESTMapper()
+	if err != nil {
+		return nil, err
+	}
+
+	return scale.New(restClient, mapper, dynamic.LegacyAPIPathResolverFunc, resolver), nil
+}