From 2c909dab09d42251f388c45c76dce44942f63433 Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Thu, 6 Jul 2023 09:22:22 -0700
Subject: [PATCH] fix: adds port and schema to connection again to fix clashes
 between same host. fixes #2279 (#2289)

* fix: adds port and schema to connection again to fix clashes between same host. fixes #2279

* fixes tests
---
 assets/components/SideMenu.vue          |  6 +++---
 assets/components/common/MobileMenu.vue |  6 +++---
 assets/composables/storage.ts           |  2 +-
 assets/stores/config.ts                 |  2 +-
 docker/client.go                        |  6 +++---
 docker/client_test.go                   | 16 ++++++++--------
 docker/host.go                          |  4 ++--
 main.go                                 |  8 ++++----
 main_test.go                            | 16 ++++++++--------
 web/routes_test.go                      |  2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/assets/components/SideMenu.vue b/assets/components/SideMenu.vue
index 150cf224..e4088f1c 100644
--- a/assets/components/SideMenu.vue
+++ b/assets/components/SideMenu.vue
@@ -16,7 +16,7 @@
     <transition :name="sessionHost ? 'slide-left' : 'slide-right'" mode="out-in">
       <ul class="menu-list" v-if="!sessionHost">
         <li v-for="host in config.hosts">
-          <a @click.prevent="setHost(host.host)">{{ host.name }}</a>
+          <a @click.prevent="setHost(host.id)">{{ host.name }}</a>
         </li>
       </ul>
       <ul class="menu-list" v-else>
@@ -88,10 +88,10 @@ const sortedContainers = computed(() =>
 const hosts = computed(() =>
   config.hosts.reduce(
     (acc, item) => {
-      acc[item.host] = item;
+      acc[item.id] = item;
       return acc;
     },
-    {} as Record<string, { name: string; host: string }>,
+    {} as Record<string, { name: string; id: string }>,
   ),
 );
 
diff --git a/assets/components/common/MobileMenu.vue b/assets/components/common/MobileMenu.vue
index 7f4fa991..b4cb14e6 100644
--- a/assets/components/common/MobileMenu.vue
+++ b/assets/components/common/MobileMenu.vue
@@ -33,7 +33,7 @@
             </o-button>
           </template>
 
-          <o-dropdown-item :value="value.host" aria-role="listitem" v-for="value in config.hosts" :key="value">
+          <o-dropdown-item :value="value.id" aria-role="listitem" v-for="value in config.hosts" :key="value">
             <span>{{ value.name }}</span>
           </o-dropdown-item>
         </o-dropdown>
@@ -115,10 +115,10 @@ const sortedContainers = computed(() =>
 const hosts = computed(() =>
   config.hosts.reduce(
     (acc, item) => {
-      acc[item.host] = item;
+      acc[item.id] = item;
       return acc;
     },
-    {} as Record<string, { name: string; host: string }>,
+    {} as Record<string, { name: string; id: string }>,
   ),
 );
 </script>
diff --git a/assets/composables/storage.ts b/assets/composables/storage.ts
index cc8e2337..14dda074 100644
--- a/assets/composables/storage.ts
+++ b/assets/composables/storage.ts
@@ -3,7 +3,7 @@ import { Container } from "@/models/Container";
 const sessionHost = useSessionStorage<string | null>("host", null);
 
 if (config.hosts.length === 1 && !sessionHost.value) {
-  sessionHost.value = config.hosts[0].host;
+  sessionHost.value = config.hosts[0].id;
 }
 
 function persistentVisibleKeys(container: ComputedRef<Container>) {
diff --git a/assets/stores/config.ts b/assets/stores/config.ts
index 3f785992..c0e77ab9 100644
--- a/assets/stores/config.ts
+++ b/assets/stores/config.ts
@@ -7,7 +7,7 @@ interface Config {
   secured: boolean;
   maxLogs: number;
   hostname: string;
-  hosts: { name: string; host: string }[];
+  hosts: { name: string; id: string }[];
 }
 
 const pageConfig = JSON.parse(text);
diff --git a/docker/client.go b/docker/client.go
index 3a27d9ab..1c3a6ae7 100644
--- a/docker/client.go
+++ b/docker/client.go
@@ -87,7 +87,7 @@ func NewClientWithFilters(f map[string][]string) (Client, error) {
 		return nil, err
 	}
 
-	return &dockerClient{cli, filterArgs, &Host{Name: "localhost", Host: "localhost"}}, nil
+	return &dockerClient{cli, filterArgs, &Host{Name: "localhost", ID: "localhost"}}, nil
 }
 
 func NewClientWithTlsAndFilter(f map[string][]string, host Host) (Client, error) {
@@ -170,7 +170,7 @@ func (d *dockerClient) ListContainers() ([]Container, error) {
 			Created: c.Created,
 			State:   c.State,
 			Status:  c.Status,
-			Host:    d.host.Host,
+			Host:    d.host.ID,
 			Health:  findBetweenParentheses(c.Status),
 		}
 		containers = append(containers, container)
@@ -287,7 +287,7 @@ func (d *dockerClient) Events(ctx context.Context, messages chan<- ContainerEven
 					messages <- ContainerEvent{
 						ActorID: message.Actor.ID[:12],
 						Name:    message.Action,
-						Host:    d.host.Host,
+						Host:    d.host.ID,
 					}
 				}
 			}
diff --git a/docker/client_test.go b/docker/client_test.go
index c653b537..b1521e63 100644
--- a/docker/client_test.go
+++ b/docker/client_test.go
@@ -54,7 +54,7 @@ func (m *mockedProxy) ContainerStats(ctx context.Context, containerID string, st
 func Test_dockerClient_ListContainers_null(t *testing.T) {
 	proxy := new(mockedProxy)
 	proxy.On("ContainerList", mock.Anything, mock.Anything).Return(nil, nil)
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	list, err := client.ListContainers()
 	assert.Empty(t, list, "list should be empty")
@@ -66,7 +66,7 @@ func Test_dockerClient_ListContainers_null(t *testing.T) {
 func Test_dockerClient_ListContainers_error(t *testing.T) {
 	proxy := new(mockedProxy)
 	proxy.On("ContainerList", mock.Anything, mock.Anything).Return(nil, errors.New("test"))
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	list, err := client.ListContainers()
 	assert.Nil(t, list, "list should be nil")
@@ -89,7 +89,7 @@ func Test_dockerClient_ListContainers_happy(t *testing.T) {
 
 	proxy := new(mockedProxy)
 	proxy.On("ContainerList", mock.Anything, mock.Anything).Return(containers, nil)
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	list, err := client.ListContainers()
 	require.NoError(t, err, "error should not return an error.")
@@ -129,7 +129,7 @@ func Test_dockerClient_ContainerLogs_happy(t *testing.T) {
 	json := types.ContainerJSON{Config: &container.Config{Tty: false}}
 	proxy.On("ContainerInspect", mock.Anything, id).Return(json, nil)
 
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 	logReader, _ := client.ContainerLogs(context.Background(), id, "since", STDALL)
 
 	actual, _ := io.ReadAll(logReader)
@@ -150,7 +150,7 @@ func Test_dockerClient_ContainerLogs_happy_with_tty(t *testing.T) {
 	json := types.ContainerJSON{Config: &container.Config{Tty: true}}
 	proxy.On("ContainerInspect", mock.Anything, id).Return(json, nil)
 
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 	logReader, _ := client.ContainerLogs(context.Background(), id, "", STDALL)
 
 	actual, _ := io.ReadAll(logReader)
@@ -165,7 +165,7 @@ func Test_dockerClient_ContainerLogs_error(t *testing.T) {
 
 	proxy.On("ContainerLogs", mock.Anything, id, mock.Anything).Return(nil, errors.New("test"))
 
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	reader, err := client.ContainerLogs(context.Background(), id, "", STDALL)
 
@@ -188,7 +188,7 @@ func Test_dockerClient_FindContainer_happy(t *testing.T) {
 
 	proxy := new(mockedProxy)
 	proxy.On("ContainerList", mock.Anything, mock.Anything).Return(containers, nil)
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	container, err := client.FindContainer("abcdefghijkl")
 	require.NoError(t, err, "error should not be thrown")
@@ -216,7 +216,7 @@ func Test_dockerClient_FindContainer_error(t *testing.T) {
 
 	proxy := new(mockedProxy)
 	proxy.On("ContainerList", mock.Anything, mock.Anything).Return(containers, nil)
-	client := &dockerClient{proxy, filters.NewArgs(), &Host{Host: "localhost"}}
+	client := &dockerClient{proxy, filters.NewArgs(), &Host{ID: "localhost"}}
 
 	_, err := client.FindContainer("not_valid")
 	require.Error(t, err, "error should be thrown")
diff --git a/docker/host.go b/docker/host.go
index badcabdd..e45e803c 100644
--- a/docker/host.go
+++ b/docker/host.go
@@ -11,7 +11,7 @@ import (
 
 type Host struct {
 	Name       string   `json:"name"`
-	Host       string   `json:"host"`
+	ID         string   `json:"id"`
 	URL        *url.URL `json:"-"`
 	CertPath   string   `json:"-"`
 	CACertPath string   `json:"-"`
@@ -56,8 +56,8 @@ func ParseConnection(connection string) (Host, error) {
 	}
 
 	return Host{
+		ID:         strings.ReplaceAll(remoteUrl.String(), "/", ""),
 		Name:       name,
-		Host:       host,
 		URL:        remoteUrl,
 		CertPath:   certPath,
 		CACertPath: cacertPath,
diff --git a/main.go b/main.go
index b157ff57..cf6b4b9d 100644
--- a/main.go
+++ b/main.go
@@ -141,7 +141,7 @@ func createClients(args args, localClientFactory func(map[string][]string) (dock
 	clients := make(map[string]docker.Client)
 
 	if localClient := createLocalClient(args, localClientFactory); localClient != nil {
-		clients[localClient.Host().Host] = localClient
+		clients[localClient.Host().ID] = localClient
 	}
 
 	for _, remoteHost := range args.RemoteHost {
@@ -154,12 +154,12 @@ func createClients(args args, localClientFactory func(map[string][]string) (dock
 		if client, err := remoteClientFactory(args.Filter, host); err == nil {
 			if _, err := client.ListContainers(); err == nil {
 				log.Debugf("Connected to local Docker Engine")
-				clients[client.Host().Host] = client
+				clients[client.Host().ID] = client
 			} else {
-				log.Warnf("Could not connect to remote host %s: %s", host.Host, err)
+				log.Warnf("Could not connect to remote host %s: %s", host.ID, err)
 			}
 		} else {
-			log.Warnf("Could not create client for %s: %s", host.Host, err)
+			log.Warnf("Could not create client for %s: %s", host.ID, err)
 		}
 	}
 
diff --git a/main_test.go b/main_test.go
index 4f49f26b..c1b7dfd9 100644
--- a/main_test.go
+++ b/main_test.go
@@ -29,7 +29,7 @@ func Test_valid_localhost(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, nil)
 		client.On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 		return client, nil
 	}
@@ -46,7 +46,7 @@ func Test_invalid_localhost(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, errors.New("error"))
 		client.On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 		return client, nil
 	}
@@ -63,7 +63,7 @@ func Test_valid_remote(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, errors.New("error"))
 		client.On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 
 		return client, nil
@@ -73,7 +73,7 @@ func Test_valid_remote(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, nil)
 		client.On("Host").Return(&docker.Host{
-			Host: "test",
+			ID: "test",
 		})
 		return client, nil
 	}
@@ -94,7 +94,7 @@ func Test_valid_remote_and_local(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, nil)
 		client.On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 		return client, nil
 	}
@@ -103,7 +103,7 @@ func Test_valid_remote_and_local(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, nil)
 		client.On("Host").Return(&docker.Host{
-			Host: "test",
+			ID: "test",
 		})
 		return client, nil
 	}
@@ -124,7 +124,7 @@ func Test_no_clients(t *testing.T) {
 		client := new(fakeClient)
 		client.On("ListContainers").Return([]docker.Container{}, errors.New("error"))
 		client.On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 		return client, nil
 	}
@@ -132,7 +132,7 @@ func Test_no_clients(t *testing.T) {
 	fakeRemoteClientFactory := func(filter map[string][]string, host docker.Host) (docker.Client, error) {
 		client := new(fakeClient)
 		client.On("Host").Return(&docker.Host{
-			Host: "test",
+			ID: "test",
 		})
 		return client, nil
 	}
diff --git a/web/routes_test.go b/web/routes_test.go
index b045c6d7..848dea6d 100644
--- a/web/routes_test.go
+++ b/web/routes_test.go
@@ -59,7 +59,7 @@ func createHandler(client docker.Client, content fs.FS, config Config) *chi.Mux
 		client = new(MockedClient)
 		client.(*MockedClient).On("ListContainers").Return([]docker.Container{}, nil)
 		client.(*MockedClient).On("Host").Return(&docker.Host{
-			Host: "localhost",
+			ID: "localhost",
 		})
 	}