cmd/internal/container/mesos: fix some golint warnings

It all started from this:

internal/container/mesos/client.go:57:16: exported func Client returns unexported type github.com/google/cadvisor/cmd/internal/container/mesos.mesosAgentClient, which can be annoying to use (golint)
func Client() (mesosAgentClient, error) {
               ^
internal/container/mesos/client_test.go:24:58: exported method ContainerInfo returns unexported type *github.com/google/cadvisor/cmd/internal/container/mesos.containerInfo, which can be annoying to use (golint)
func (c *FakeMesosAgentClient) ContainerInfo(id string) (*containerInfo, error) {
                                                         ^

Now, as the both functions are only used internally, it makes no sense
to make them public.

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

cmd/internal/container/mesos/client.go

@@ -44,17 +44,17 @@ type client struct {
 }
 
 type mesosAgentClient interface {
-	ContainerInfo(id string) (*containerInfo, error)
-	ContainerPid(id string) (int, error)
+	containerInfo(id string) (*containerInfo, error)
+	containerPID(id string) (int, error)
 }
 
 type containerInfo struct {
 	cntr   *mContainer
 	labels map[string]string
 }
 
-// Client is an interface to query mesos agent http endpoints
-func Client() (mesosAgentClient, error) {
+// newClient is an interface to query mesos agent http endpoints
+func newClient() (mesosAgentClient, error) {
 	mesosClientOnce.Do(func() {
 		// Start Client
 		apiURL := url.URL{
@@ -79,8 +79,8 @@ func Client() (mesosAgentClient, error) {
 	return mesosClient, nil
 }
 
-// ContainerInfo returns the container information of the given container id
-func (c *client) ContainerInfo(id string) (*containerInfo, error) {
+// containerInfo returns the container information of the given container id
+func (c *client) containerInfo(id string) (*containerInfo, error) {
 	container, err := c.getContainer(id)
 	if err != nil {
 		return nil, err
@@ -99,11 +99,11 @@ func (c *client) ContainerInfo(id string) (*containerInfo, error) {
 }
 
 // Get the Pid of the container
-func (c *client) ContainerPid(id string) (int, error) {
+func (c *client) containerPID(id string) (int, error) {
 	var pid int
 	err := retry.Retry(
 		func(attempt uint) error {
-			c, err := c.ContainerInfo(id)
+			c, err := c.containerInfo(id)
 			if err != nil {
 				return err
 			}

cmd/internal/container/mesos/client_test.go

@@ -21,7 +21,7 @@ type FakeMesosAgentClient struct {
 	err      error
 }
 
-func (c *FakeMesosAgentClient) ContainerInfo(id string) (*containerInfo, error) {
+func (c *FakeMesosAgentClient) containerInfo(id string) (*containerInfo, error) {
 	if c.err != nil {
 		return nil, c.err
 	}
@@ -32,7 +32,7 @@ func (c *FakeMesosAgentClient) ContainerInfo(id string) (*containerInfo, error)
 	return cInfo, nil
 }
 
-func (c *FakeMesosAgentClient) ContainerPid(id string) (int, error) {
+func (c *FakeMesosAgentClient) containerPID(id string) (int, error) {
 	if c.err != nil {
 		return invalidPID, c.err
 	}

cmd/internal/container/mesos/factory.go

@@ -61,7 +61,7 @@ func (f *mesosFactory) String() string {
 }
 
 func (f *mesosFactory) NewContainerHandler(name string, metadataEnvAllowList []string, inHostNamespace bool) (container.ContainerHandler, error) {
-	client, err := Client()
+	client, err := newClient()
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +109,7 @@ func (f *mesosFactory) CanHandleAndAccept(name string) (handle bool, accept bool
 	// Check if the container is known to mesos and it is active.
 	id := ContainerNameToMesosId(name)
 
-	_, err = f.client.ContainerInfo(id)
+	_, err = f.client.containerInfo(id)
 	if err != nil {
 		return false, true, fmt.Errorf("error getting running container: %v", err)
 	}
@@ -126,7 +126,7 @@ func Register(
 	fsInfo fs.FsInfo,
 	includedMetrics container.MetricSet,
 ) error {
-	client, err := Client()
+	client, err := newClient()
 
 	if err != nil {
 		return fmt.Errorf("unable to create mesos agent client: %v", err)

cmd/internal/container/mesos/handler.go

@@ -75,14 +75,14 @@ func newMesosContainerHandler(
 
 	id := ContainerNameToMesosId(name)
 
-	cinfo, err := client.ContainerInfo(id)
+	cinfo, err := client.containerInfo(id)
 
 	if err != nil {
 		return nil, err
 	}
 
 	labels := cinfo.labels
-	pid, err := client.ContainerPid(id)
+	pid, err := client.containerPID(id)
 	if err != nil {
 		return nil, err
 	}