chore(agent): remove duplication on docker client initialization

Author: henrybarreto

pkg/agent/connector/docker.go

@@ -82,7 +82,7 @@ func (d *DockerConnector) Start(ctx context.Context, id string, name string) {
 	d.mu.Unlock()
 
 	privateKey := fmt.Sprintf("%s/%s.key", d.privateKeys, id)
-	go initContainerAgent(ctx, Container{
+	go initContainerAgent(ctx, d.cli, Container{
 		ID:            id,
 		Name:          name,
 		ServerAddress: d.server,
@@ -155,7 +155,7 @@ func (d *DockerConnector) Listen(ctx context.Context) error {
 }
 
 // initContainerAgent initializes the agent for a container.
-func initContainerAgent(ctx context.Context, container Container) {
+func initContainerAgent(ctx context.Context, cli *dockerclient.Client, container Container) {
 	agent.AgentPlatform = "connector"
 	agent.AgentVersion = ConnectorVersion
 
@@ -178,7 +178,20 @@ func initContainerAgent(ctx context.Context, container Container) {
 		"version":        agent.AgentVersion,
 	}).Info("Connector container started")
 
-	ag, err := agent.NewAgentWithConfig(cfg, agent.NewConnectorMode(cfg.PreferredIdentity))
+	mode, err := agent.NewConnectorMode(cli, container.ID)
+	if err != nil {
+		log.WithError(err).WithFields(log.Fields{
+			"id":             container.ID,
+			"identity":       cfg.PreferredIdentity,
+			"hostname":       cfg.PreferredHostname,
+			"tenant_id":      cfg.TenantID,
+			"server_address": cfg.ServerAddress,
+			"timestamp":      time.Now(),
+			"version":        agent.AgentVersion,
+		}).Fatal("Failed to create connector mode")
+	}
+
+	ag, err := agent.NewAgentWithConfig(cfg, mode)
 	if err != nil {
 		log.WithError(err).WithFields(log.Fields{
 			"id":            container.ID,

pkg/agent/modes.go

@@ -81,23 +81,24 @@ func (m *HostMode) GetInfo() (*Info, error) {
 // responsible for the SSH server, but the authentication and authorization is made by either the conainer
 // internals, `passwd` or `shadow`, or by the ShellHub API.
 type ConnectorMode struct {
+	cli        *dockerclient.Client
 	serverMode *connector.Mode
 	identity   string
 }
 
-func NewConnectorMode(identity string) Mode {
+func NewConnectorMode(cli *dockerclient.Client, identity string) (Mode, error) {
 	return &ConnectorMode{
 		identity: identity,
-	}
+		cli:      cli,
+	}, nil
 }
 
 var _ Mode = new(ConnectorMode)
 
 func (m *ConnectorMode) Serve(agent *Agent) {
-	cli, _ := dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
 	m.serverMode = &connector.Mode{
-		Authenticator: *connector.NewAuthenticator(agent.cli, cli, agent.authData, &agent.Identity.MAC),
-		Sessioner:     *connector.NewSessioner(&agent.Identity.MAC, cli),
+		Authenticator: *connector.NewAuthenticator(agent.cli, m.cli, agent.authData, &agent.Identity.MAC),
+		Sessioner:     *connector.NewSessioner(&agent.Identity.MAC, m.cli),
 	}
 
 	// NOTICE: When the agent is running in `Connector` mode, we need to identify the container ID to maintain the
@@ -117,14 +118,7 @@ func (m *ConnectorMode) Serve(agent *Agent) {
 }
 
 func (m *ConnectorMode) GetInfo() (*Info, error) {
-	cli, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
-	if err != nil {
-		return nil, err
-	}
-
-	defer cli.Close()
-
-	info, err := cli.ContainerInspect(context.Background(), m.identity)
+	info, err := m.cli.ContainerInspect(context.Background(), m.identity)
 	if err != nil {
 		return nil, err
 	}