stop using factory.OpenshiftClientConfig

deads2k · deads2k · commit a6267219f89d · 2018-04-13T12:35:09.000-04:00
diff --git a/pkg/oc/admin/diagnostics/config.go b/pkg/oc/admin/diagnostics/config.go
@@ -15,7 +15,7 @@ import (
 
 // use the base factory to return a raw config (not specific to a context)
 func (o DiagnosticsOptions) buildRawConfig() (*clientcmdapi.Config, error) {
-	kubeConfig, configErr := o.Factory.OpenShiftClientConfig().RawConfig()
+	kubeConfig, configErr := o.Factory.RawConfig()
 	if configErr != nil {
 		return nil, configErr
 	}
diff --git a/pkg/oc/admin/image/verify-signature.go b/pkg/oc/admin/image/verify-signature.go
@@ -18,7 +18,6 @@ import (
 	"github.com/spf13/cobra"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -84,8 +83,6 @@ type VerifyImageSignatureOptions struct {
 
 	ImageClient imageclient.ImageInterface
 
-	clientConfig kclientcmd.ClientConfig
-
 	Out    io.Writer
 	ErrOut io.Writer
 }
@@ -96,9 +93,8 @@ const (
 
 func NewCmdVerifyImageSignature(name, fullName string, f *clientcmd.Factory, out, errOut io.Writer) *cobra.Command {
 	opts := &VerifyImageSignatureOptions{
-		ErrOut:       errOut,
-		Out:          out,
-		clientConfig: f.OpenShiftClientConfig(),
+		ErrOut: errOut,
+		Out:    out,
 		// TODO: This improves the error message users get when containers/image is not able
 		// to locate the pubring.gpg file (which is default).
 		// This should be improved/fixed in containers/image.
@@ -169,7 +165,8 @@ func (o *VerifyImageSignatureOptions) Complete(f *clientcmd.Factory, cmd *cobra.
 		return err
 	} else {
 		o.CurrentUser = me.Name
-		if config, err := o.clientConfig.ClientConfig(); err != nil {
+
+		if config, err := f.ClientConfig(); err != nil {
 			return err
 		} else {
 			if o.CurrentUserToken = config.BearerToken; len(o.CurrentUserToken) == 0 {
diff --git a/pkg/oc/cli/cmd/login/login.go b/pkg/oc/cli/cmd/login/login.go
@@ -97,7 +97,7 @@ func NewCmdLogin(fullName string, f *osclientcmd.Factory, reader io.Reader, out,
 }
 
 func (o *LoginOptions) Complete(f *osclientcmd.Factory, cmd *cobra.Command, args []string, commandName string) error {
-	kubeconfig, err := f.OpenShiftClientConfig().RawConfig()
+	kubeconfig, err := f.RawConfig()
 	o.StartingKubeConfig = &kubeconfig
 	if err != nil {
 		if !os.IsNotExist(err) {
diff --git a/pkg/oc/cli/cmd/login/logout.go b/pkg/oc/cli/cmd/login/logout.go
@@ -80,13 +80,13 @@ func NewCmdLogout(name, fullName, ocLoginFullCommand string, f *osclientcmd.Fact
 }
 
 func (o *LogoutOptions) Complete(f *osclientcmd.Factory, cmd *cobra.Command, args []string) error {
-	kubeconfig, err := f.OpenShiftClientConfig().RawConfig()
+	kubeconfig, err := f.RawConfig()
 	o.StartingKubeConfig = &kubeconfig
 	if err != nil {
 		return err
 	}
 
-	o.Config, err = f.OpenShiftClientConfig().ClientConfig()
+	o.Config, err = f.ClientConfig()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/oc/cli/cmd/project.go b/pkg/oc/cli/cmd/project.go
@@ -100,7 +100,7 @@ func (o *ProjectOptions) Complete(f *clientcmd.Factory, args []string, out io.Wr
 		o.ProjectName = args[0]
 	}
 
-	o.Config, err = f.OpenShiftClientConfig().RawConfig()
+	o.Config, err = f.RawConfig()
 	if err != nil {
 		return err
 	}
@@ -126,7 +126,7 @@ func (o *ProjectOptions) Complete(f *clientcmd.Factory, args []string, out io.Wr
 
 		// since we failed to retrieve ClientConfig for the current server,
 		// fetch local OpenShift client config
-		o.ClientConfig, err = f.OpenShiftClientConfig().ClientConfig()
+		o.ClientConfig, err = f.ClientConfig()
 		if err != nil {
 			return err
 		}
diff --git a/pkg/oc/cli/cmd/projects.go b/pkg/oc/cli/cmd/projects.go
@@ -92,12 +92,12 @@ func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, commandN
 	o.CommandName = commandName
 
 	var err error
-	o.Config, err = f.OpenShiftClientConfig().RawConfig()
+	o.Config, err = f.RawConfig()
 	if err != nil {
 		return err
 	}
 
-	o.ClientConfig, err = f.OpenShiftClientConfig().ClientConfig()
+	o.ClientConfig, err = f.ClientConfig()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/oc/cli/cmd/request_project.go b/pkg/oc/cli/cmd/request_project.go
@@ -115,7 +115,7 @@ func (o *NewProjectOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, a
 			return err
 		}
 	} else {
-		clientConfig, err := f.OpenShiftClientConfig().ClientConfig()
+		clientConfig, err := f.ClientConfig()
 		if err != nil {
 			return err
 		}
diff --git a/pkg/oc/cli/cmd/startbuild.go b/pkg/oc/cli/cmd/startbuild.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/third_party/forked/golang/netutil"
 	restclient "k8s.io/client-go/rest"
-	kclientcmd "k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
@@ -158,7 +157,7 @@ type StartBuildOptions struct {
 
 	Mapper       meta.RESTMapper
 	BuildClient  buildclient.BuildInterface
-	ClientConfig kclientcmd.ClientConfig
+	ClientConfig *restclient.Config
 
 	AsBinary    bool
 	ShortOutput bool
@@ -169,11 +168,15 @@ type StartBuildOptions struct {
 }
 
 func (o *StartBuildOptions) Complete(f *clientcmd.Factory, in io.Reader, out, errout io.Writer, cmd *cobra.Command, cmdFullName string, args []string) error {
+	var err error
 	o.In = in
 	o.Out = out
 	o.ErrOut = errout
 	o.Git = git.NewRepository()
-	o.ClientConfig = f.OpenShiftClientConfig()
+	o.ClientConfig, err = f.ClientConfig()
+	if err != nil {
+		return err
+	}
 	o.Mapper, _ = f.Object()
 
 	o.IncrementalOverride = cmd.Flags().Lookup("incremental").Changed
@@ -716,13 +719,10 @@ func (o *StartBuildOptions) RunStartBuildWebHook() error {
 	// when using HTTPS, try to reuse the local config transport if possible to get a client cert
 	// TODO: search all configs
 	if hook.Scheme == "https" {
-		config, err := o.ClientConfig.ClientConfig()
-		if err == nil {
-			if url, _, err := restclient.DefaultServerURL(config.Host, "", schema.GroupVersion{}, true); err == nil {
-				if netutil.CanonicalAddr(url) == netutil.CanonicalAddr(hook) && url.Scheme == hook.Scheme {
-					if rt, err := restclient.TransportFor(config); err == nil {
-						httpClient = &http.Client{Transport: rt}
-					}
+		if url, _, err := restclient.DefaultServerURL(o.ClientConfig.Host, "", schema.GroupVersion{}, true); err == nil {
+			if netutil.CanonicalAddr(url) == netutil.CanonicalAddr(hook) && url.Scheme == hook.Scheme {
+				if rt, err := restclient.TransportFor(o.ClientConfig); err == nil {
+					httpClient = &http.Client{Transport: rt}
 				}
 			}
 		}
diff --git a/pkg/oc/cli/cmd/startbuild_test.go b/pkg/oc/cli/cmd/startbuild_test.go
@@ -60,7 +60,7 @@ func TestStartBuildWebHook(t *testing.T) {
 	buf := &bytes.Buffer{}
 	o := &StartBuildOptions{
 		Out:          buf,
-		ClientConfig: cfg,
+		ClientConfig: cfg.Client,
 		FromWebhook:  server.URL + "/webhook",
 		Mapper:       legacyscheme.Registry.RESTMapper(),
 	}
@@ -79,30 +79,6 @@ func TestStartBuildWebHook(t *testing.T) {
 	}
 }
 
-func TestStartBuildWebHookHTTPS(t *testing.T) {
-	invoked := make(chan struct{}, 1)
-	server := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		invoked <- struct{}{}
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	testErr := errors.New("not enabled")
-	cfg := &FakeClientConfig{
-		Err: testErr,
-	}
-	buf := &bytes.Buffer{}
-	o := &StartBuildOptions{
-		Out:          buf,
-		ClientConfig: cfg,
-		FromWebhook:  server.URL + "/webhook",
-		Mapper:       legacyscheme.Registry.RESTMapper(),
-	}
-	if err := o.Run(); err == nil || !strings.Contains(err.Error(), "certificate signed by unknown authority") {
-		t.Fatalf("unexpected non-error: %v", err)
-	}
-}
-
 func TestStartBuildHookPostReceive(t *testing.T) {
 	invoked := make(chan *buildapi.GenericWebHookEvent, 1)
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -129,7 +105,7 @@ func TestStartBuildHookPostReceive(t *testing.T) {
 	buf := &bytes.Buffer{}
 	o := &StartBuildOptions{
 		Out:            buf,
-		ClientConfig:   cfg,
+		ClientConfig:   cfg.Client,
 		FromWebhook:    server.URL + "/webhook",
 		GitPostReceive: f.Name(),
 		Mapper:         legacyscheme.Registry.RESTMapper(),
diff --git a/pkg/oc/cli/cmd/status.go b/pkg/oc/cli/cmd/status.go
@@ -130,12 +130,12 @@ func (o *StatusOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, baseC
 		return err
 	}
 
-	config, err := f.OpenShiftClientConfig().ClientConfig()
+	config, err := f.ClientConfig()
 	if err != nil {
 		return err
 	}
 
-	rawConfig, err := f.OpenShiftClientConfig().RawConfig()
+	rawConfig, err := f.RawConfig()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/oc/cli/cmd/version.go b/pkg/oc/cli/cmd/version.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	etcdversion "github.com/coreos/etcd/version"
+	"k8s.io/client-go/rest"
 
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	kubeversiontypes "k8s.io/apimachinery/pkg/version"
@@ -32,7 +33,7 @@ type VersionOptions struct {
 	BaseName string
 	Out      io.Writer
 
-	ClientConfig kclientcmd.ClientConfig
+	ClientConfig *rest.Config
 	Clients      func() (kclientset.Interface, error)
 
 	Timeout time.Duration
@@ -72,15 +73,19 @@ func (o *VersionOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, out
 	}
 
 	o.Clients = f.ClientSet
-	o.ClientConfig = f.OpenShiftClientConfig()
+	var err error
+	o.ClientConfig, err = f.ClientConfig()
+	if err != nil {
+		return err
+	}
 
 	if !o.IsServer {
 		// retrieve config timeout and set cmd option
 		// use this instead of getting value from global
 		// flag, as flag value would have to be parsed
 		// from a string potentially not formatted as
 		// a valid time.Duration value
-		config, err := o.ClientConfig.ClientConfig()
+		config, err := f.ClientConfig()
 		if err == nil {
 			o.Timeout = config.Timeout
 		}
@@ -129,12 +134,7 @@ func (o VersionOptions) RunVersion() error {
 
 		// confirm config exists before making request to server
 		var err error
-		clientConfig, err := o.ClientConfig.ClientConfig()
-		if err != nil {
-			done <- err
-			return
-		}
-		versionHost = clientConfig.Host
+		versionHost = o.ClientConfig.Host
 
 		kClient, err := o.Clients()
 		if err != nil {
diff --git a/pkg/oc/cli/cmd/whoami.go b/pkg/oc/cli/cmd/whoami.go
@@ -61,7 +61,7 @@ func (o WhoAmIOptions) WhoAmI() (*userapi.User, error) {
 
 func RunWhoAmI(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []string, o *WhoAmIOptions) error {
 	if kcmdutil.GetFlagBool(cmd, "show-token") {
-		cfg, err := f.OpenShiftClientConfig().ClientConfig()
+		cfg, err := f.ClientConfig()
 		if err != nil {
 			return err
 		}
@@ -72,7 +72,7 @@ func RunWhoAmI(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []s
 		return nil
 	}
 	if kcmdutil.GetFlagBool(cmd, "show-context") {
-		cfg, err := f.OpenShiftClientConfig().RawConfig()
+		cfg, err := f.RawConfig()
 		if err != nil {
 			return err
 		}
@@ -83,7 +83,7 @@ func RunWhoAmI(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []s
 		return nil
 	}
 	if kcmdutil.GetFlagBool(cmd, "show-server") {
-		cfg, err := f.OpenShiftClientConfig().ClientConfig()
+		cfg, err := f.ClientConfig()
 		if err != nil {
 			return err
 		}
diff --git a/pkg/oc/cli/sa/create_kubeconfig.go b/pkg/oc/cli/sa/create_kubeconfig.go
@@ -94,7 +94,7 @@ func (o *CreateKubeconfigOptions) Complete(args []string, f *clientcmd.Factory,
 		return err
 	}
 
-	o.RawConfig, err = f.OpenShiftClientConfig().RawConfig()
+	o.RawConfig, err = f.RawConfig()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/oc/cli/util/clientcmd/factory_builder.go b/pkg/oc/cli/util/clientcmd/factory_builder.go
@@ -68,7 +68,7 @@ func (f *ring2Factory) Reaper(mapping *meta.RESTMapping) (kubectl.Reaper, error)
 		if err != nil {
 			return nil, err
 		}
-		config, err := f.clientAccessFactory.OpenShiftClientConfig().ClientConfig()
+		config, err := f.clientAccessFactory.ClientConfig()
 		if err != nil {
 			return nil, err
 		}
@@ -134,7 +134,7 @@ func (f *ring2Factory) Reaper(mapping *meta.RESTMapping) (kubectl.Reaper, error)
 			securityClient.Security().SecurityContextConstraints(),
 		), nil
 	case buildapi.IsKindOrLegacy("BuildConfig", gk):
-		config, err := f.clientAccessFactory.OpenShiftClientConfig().ClientConfig()
+		config, err := f.clientAccessFactory.ClientConfig()
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/oc/cli/util/clientcmd/factory_client_access.go b/pkg/oc/cli/util/clientcmd/factory_client_access.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
 	kclientcmd "k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	kclientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/client-go/util/homedir"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
@@ -54,7 +55,6 @@ type ClientAccessFactory interface {
 	kcmdutil.ClientAccessFactory
 	CLIClientBuilder
 
-	OpenShiftClientConfig() kclientcmd.ClientConfig
 	ImageResolutionOptions() FlagBinder
 }
 
@@ -122,8 +122,8 @@ func (f *discoveryFactory) DiscoveryClient() (discovery.CachedDiscoveryInterface
 	return kcmdutil.NewCachedDiscoveryClient(newLegacyDiscoveryClient(kubeClient.Discovery().RESTClient()), cacheDir, time.Duration(10*time.Minute)), nil
 }
 
-func (f *ring0Factory) OpenShiftClientConfig() kclientcmd.ClientConfig {
-	return f.clientConfig
+func (f *ring0Factory) RawConfig() (clientcmdapi.Config, error) {
+	return f.kubeClientAccessFactory.RawConfig()
 }
 
 func (f *ring0Factory) DiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
@@ -310,7 +310,7 @@ func (f *ring0Factory) ResolveImage(image string) (string, error) {
 	if isDockerImageSource(options.Source) {
 		return f.kubeClientAccessFactory.ResolveImage(image)
 	}
-	config, err := f.OpenShiftClientConfig().ClientConfig()
+	config, err := f.kubeClientAccessFactory.ClientConfig()
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/oc/cli/util/clientcmd/factory_object_mapping.go b/pkg/oc/cli/util/clientcmd/factory_object_mapping.go
@@ -192,7 +192,7 @@ func (f *ring1Factory) HistoryViewer(mapping *meta.RESTMapping) (kubectl.History
 
 func (f *ring1Factory) Rollbacker(mapping *meta.RESTMapping) (kubectl.Rollbacker, error) {
 	if appsapi.IsKindOrLegacy("DeploymentConfig", mapping.GroupVersionKind.GroupKind()) {
-		config, err := f.clientAccessFactory.OpenShiftClientConfig().ClientConfig()
+		config, err := f.clientAccessFactory.ClientConfig()
 		if err != nil {
 			return nil, err
 		}
@@ -202,7 +202,7 @@ func (f *ring1Factory) Rollbacker(mapping *meta.RESTMapping) (kubectl.Rollbacker
 }
 
 func (f *ring1Factory) StatusViewer(mapping *meta.RESTMapping) (kubectl.StatusViewer, error) {
-	config, err := f.clientAccessFactory.OpenShiftClientConfig().ClientConfig()
+	config, err := f.clientAccessFactory.ClientConfig()
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`// use the base factory to return a raw config (not specific to a context)`
`17`	`17`	`func (o DiagnosticsOptions) buildRawConfig() (*clientcmdapi.Config, error) {`
`18`		`- kubeConfig, configErr := o.Factory.OpenShiftClientConfig().RawConfig()`
	`18`	`+ kubeConfig, configErr := o.Factory.RawConfig()`
`19`	`19`	`if configErr != nil {`
`20`	`20`	`return nil, configErr`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func NewCmdLogin(fullName string, f *osclientcmd.Factory, reader io.Reader, out,`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`func (o LoginOptions) Complete(f osclientcmd.Factory, cmd *cobra.Command, args []string, commandName string) error {`
`100`		`- kubeconfig, err := f.OpenShiftClientConfig().RawConfig()`
	`100`	`+ kubeconfig, err := f.RawConfig()`
`101`	`101`	`o.StartingKubeConfig = &kubeconfig`
`102`	`102`	`if err != nil {`
`103`	`103`	`if !os.IsNotExist(err) {`
Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,13 @@ func NewCmdLogout(name, fullName, ocLoginFullCommand string, f *osclientcmd.Fact`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func (o LogoutOptions) Complete(f osclientcmd.Factory, cmd *cobra.Command, args []string) error {`
`83`		`- kubeconfig, err := f.OpenShiftClientConfig().RawConfig()`
	`83`	`+ kubeconfig, err := f.RawConfig()`
`84`	`84`	`o.StartingKubeConfig = &kubeconfig`
`85`	`85`	`if err != nil {`
`86`	`86`	`return err`
`87`	`87`	`}`
`88`	`88`
`89`		`- o.Config, err = f.OpenShiftClientConfig().ClientConfig()`
	`89`	`+ o.Config, err = f.ClientConfig()`
`90`	`90`	`if err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func (o ProjectOptions) Complete(f clientcmd.Factory, args []string, out io.Wr`
`100`	`100`	`o.ProjectName = args[0]`
`101`	`101`	`}`
`102`	`102`
`103`		`- o.Config, err = f.OpenShiftClientConfig().RawConfig()`
	`103`	`+ o.Config, err = f.RawConfig()`
`104`	`104`	`if err != nil {`
`105`	`105`	`return err`
`106`	`106`	`}`
`@@ -126,7 +126,7 @@ func (o ProjectOptions) Complete(f clientcmd.Factory, args []string, out io.Wr`
`126`	`126`
`127`	`127`	`// since we failed to retrieve ClientConfig for the current server,`
`128`	`128`	`// fetch local OpenShift client config`
`129`		`- o.ClientConfig, err = f.OpenShiftClientConfig().ClientConfig()`
	`129`	`+ o.ClientConfig, err = f.ClientConfig()`
`130`	`130`	`if err != nil {`
`131`	`131`	`return err`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,12 @@ func (o ProjectsOptions) Complete(f clientcmd.Factory, args []string, commandN`
`92`	`92`	`o.CommandName = commandName`
`93`	`93`
`94`	`94`	`var err error`
`95`		`- o.Config, err = f.OpenShiftClientConfig().RawConfig()`
	`95`	`+ o.Config, err = f.RawConfig()`
`96`	`96`	`if err != nil {`
`97`	`97`	`return err`
`98`	`98`	`}`
`99`	`99`
`100`		`- o.ClientConfig, err = f.OpenShiftClientConfig().ClientConfig()`
	`100`	`+ o.ClientConfig, err = f.ClientConfig()`
`101`	`101`	`if err != nil {`
`102`	`102`	`return err`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func (o NewProjectOptions) Complete(f clientcmd.Factory, cmd *cobra.Command, a`
`115`	`115`	`return err`
`116`	`116`	`}`
`117`	`117`	`} else {`
`118`		`- clientConfig, err := f.OpenShiftClientConfig().ClientConfig()`
	`118`	`+ clientConfig, err := f.ClientConfig()`
`119`	`119`	`if err != nil {`
`120`	`120`	`return err`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,12 @@ func (o StatusOptions) Complete(f clientcmd.Factory, cmd *cobra.Command, baseC`
`130`	`130`	`return err`
`131`	`131`	`}`
`132`	`132`
`133`		`- config, err := f.OpenShiftClientConfig().ClientConfig()`
	`133`	`+ config, err := f.ClientConfig()`
`134`	`134`	`if err != nil {`
`135`	`135`	`return err`
`136`	`136`	`}`
`137`	`137`
`138`		`- rawConfig, err := f.OpenShiftClientConfig().RawConfig()`
	`138`	`+ rawConfig, err := f.RawConfig()`
`139`	`139`	`if err != nil {`
`140`	`140`	`return err`
`141`	`141`	`}`