rename client to restClient

pkg/kubeclient/client.go

@@ -39,13 +39,13 @@
 	config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}
 	config.UserAgent = rest.DefaultKubernetesUserAgent()
 
-	client, err := rest.RESTClientFor(&config)
+	restClient, err := rest.RESTClientFor(&config)
 	if err != nil {
 		return nil, err
 	}
 
 	crtRESTClient := &CRTRESTClient{
-		RestClient: client,
+		RestClient: restClient,
 		Informer:   informer,
 		Config:     config,
 		NS:         namespace,
@@ -94,11 +94,11 @@
 func (c *V1Alpha1REST) UserSignups() UserSignupInterface {
 	return &userSignupClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -107,11 +107,11 @@
 func (c *V1Alpha1REST) MasterUserRecords() MasterUserRecordInterface {
 	return &masterUserRecordClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -120,11 +120,11 @@
 func (c *V1Alpha1REST) BannedUsers() BannedUserInterface {
 	return &bannedUserClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -133,11 +133,11 @@
 func (c *V1Alpha1REST) ToolchainStatuses() ToolchainStatusInterface {
 	return &toolchainStatusClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -146,11 +146,11 @@
 func (c *V1Alpha1REST) SocialEvents() SocialEventInterface {
 	return &socialeventClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -159,11 +159,11 @@
 func (c *V1Alpha1REST) Spaces() SpaceInterface {
 	return &spaceClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
@@ -172,19 +172,19 @@
 func (c *V1Alpha1REST) SpaceBindings() SpaceBindingInterface {
 	return &spaceBindingClient{
 		crtClient: crtClient{
-			client:   c.client.RestClient,
-			informer: c.client.Informer,
-			ns:       c.client.NS,
-			cfg:      c.client.Config,
-			scheme:   c.client.Scheme,
+			restClient: c.client.RestClient,
+			informer:   c.client.Informer,
+			ns:         c.client.NS,
+			cfg:        c.client.Config,
+			scheme:     c.client.Scheme,
 		},
 	}
 }
 
 type crtClient struct {
-	client   rest.Interface
-	informer informers.Informer
-	ns       string
-	cfg      rest.Config
-	scheme   *runtime.Scheme
+	restClient rest.Interface
+	informer   informers.Informer
+	ns         string
+	cfg        rest.Config
+	scheme     *runtime.Scheme
 }

pkg/kubeclient/mur.go

@@ -18,7 +18,7 @@
 // Get returns the MasterUserRecord with the specified name, or an error if something went wrong while attempting to retrieve it
 func (c *masterUserRecordClient) Get(name string) (*crtapi.MasterUserRecord, error) {
 	result := &crtapi.MasterUserRecord{}
-	err := c.client.Get().
+	err := c.restClient.Get().
 		Namespace(c.ns).
 		Resource(resources.MurResourcePlural).
 		Name(name).

pkg/kubeclient/signup.go

@@ -31,7 +31,7 @@
 // If not found then NotFound error returned
 func (c *userSignupClient) Get(name string) (*crtapi.UserSignup, error) {
 	result := &crtapi.UserSignup{}
-	err := c.client.Get().
+	err := c.restClient.Get().
 		Namespace(c.ns).
 		Resource(resources.UserSignupResourcePlural).
 		Name(name).
@@ -47,7 +47,7 @@
 // an error if something went wrong
 func (c *userSignupClient) Create(obj *crtapi.UserSignup) (*crtapi.UserSignup, error) {
 	result := &crtapi.UserSignup{}
-	err := c.client.Post().
+	err := c.restClient.Post().
 		Namespace(c.ns).
 		Resource(resources.UserSignupResourcePlural).
 		Body(obj).
@@ -62,7 +62,7 @@
 // Update will update an existing UserSignup resource in the cluster, returning an error if something went wrong
 func (c *userSignupClient) Update(obj *crtapi.UserSignup) (*crtapi.UserSignup, error) {
 	result := &crtapi.UserSignup{}
-	err := c.client.Put().
+	err := c.restClient.Put().
 		Namespace(c.ns).
 		Resource(resources.UserSignupResourcePlural).
 		Name(obj.Name).

pkg/kubeclient/socialevent.go

@@ -21,7 +21,7 @@
 // Get returns the SocialEvent with the specified name, or an error if something went wrong while attempting to retrieve it
 func (c *socialeventClient) Get(name string) (*crtapi.SocialEvent, error) {
 	result := &crtapi.SocialEvent{}
-	err := c.client.Get().
+	err := c.restClient.Get().
 		Namespace(c.ns).
 		Resource(socialeventResourcePlural).
 		Name(name).

pkg/kubeclient/space.go

@@ -18,8 +18,8 @@
 // List returns the Spaces that match for the provided selector, or an error if something went wrong while attempting to retrieve it
 func (c *spaceClient) Get(name string) (*crtapi.Space, error) {
 	result := &crtapi.Space{}
-	err := c.client.Get().
+	err := c.restClient.Get().
 		Namespace(c.ns).
 		Resource(resources.SpaceResourcePlural).
 		Name(name).
 		Do(context.TODO()).

pkg/kubeclient/toolchainstatus.go

@@ -19,7 +19,7 @@ type ToolchainStatusInterface interface {
 // If not found then NotFound error returned
 func (c *toolchainStatusClient) Get() (*crtapi.ToolchainStatus, error) {
 	result := &crtapi.ToolchainStatus{}
-	err := c.client.Get().
+	err := c.restClient.Get().
 		Namespace(c.ns).
 		Resource(resources.ToolchainStatusPlural).
 		Name(resources.ToolchainStatusName).