fix: handle null value in container command (#3620) (#3625)

Signed-off-by: lstocchi <lstocchi@redhat.com>
containers · Aug 22, 2023 · eaf4c08 · eaf4c08
1 parent e47e972
commit eaf4c08
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 5 deletions.
diff --git a/packages/main/src/plugin/api/container-info.ts b/packages/main/src/plugin/api/container-info.ts
@@ -40,7 +40,7 @@ export interface ContainerInfo {
   Names: string[];
   Image: string;
   ImageID: string;
-  Command: string;
+  Command?: string;
   Created: number;
   Ports: ContainerPortInfo[];
   Labels: { [label: string]: string };

diff --git a/packages/main/src/plugin/container-registry.spec.ts b/packages/main/src/plugin/container-registry.spec.ts
@@ -740,6 +740,102 @@ describe('listContainers', () => {
     });
     expect(container.State).toBe('running');
   });
+
+  test('list containers with Podman API and null command value', async () => {
+    const containersWithPodmanAPI = [
+      {
+        AutoRemove: false,
+        Command: null,
+        Created: '2023-08-10T15:37:44.555961563+02:00',
+        CreatedAt: '',
+        Exited: true,
+        ExitedAt: 1691674673,
+        ExitCode: 0,
+        Id: '31a4b282691420be2611817f203765402d8da7e13cd530f80a6ddd1bb4aa63b4',
+        Image: 'docker.io/library/httpd:latest',
+        ImageID: '911d72fc5020723f0c003a134a8d2f062b4aea884474a11d1db7dcd28ce61d6a',
+        IsInfra: false,
+        Labels: {
+          'io.buildah.version': '1.30.0',
+          maintainer: 'Podman Maintainers',
+        },
+        Mounts: [],
+        Names: ['admiring_wing'],
+        Namespaces: {},
+        Networks: ['podman'],
+        Pid: 0,
+        Pod: '',
+        PodName: '',
+        Ports: [
+          {
+            host_ip: '',
+            container_port: 8080,
+            host_port: 8080,
+            range: 1,
+            protocol: 'tcp',
+          },
+        ],
+        Restarts: 0,
+        Size: null,
+        StartedAt: 1691674664,
+        State: 'running',
+        Status: '',
+      },
+    ];
+
+    nock('http://localhost').get('/v4.2.0/libpod/containers/json?all=true').reply(200, containersWithPodmanAPI);
+
+    // mock listPods
+
+    nock('http://localhost').get('/v4.2.0/libpod/pods/json').reply(200, []);
+
+    const dockerAPI = new Dockerode({ protocol: 'http', host: 'localhost' });
+
+    const libpod = new LibpodDockerode();
+    libpod.enhancePrototypeWithLibPod();
+
+    // set providers with docker being first
+    containerRegistry.addInternalProvider('podman1', {
+      name: 'podman',
+      id: 'podman1',
+      api: dockerAPI,
+      libpodApi: dockerAPI,
+      connection: {
+        type: 'podman',
+      },
+    } as unknown as InternalContainerProvider);
+
+    const containers = await containerRegistry.listContainers();
+
+    // ensure the field are correct
+    expect(containers).toBeDefined();
+    expect(containers).toHaveLength(1);
+    const container = containers[0];
+    expect(container.engineId).toBe('podman1');
+    expect(container.engineName).toBe('podman');
+    expect(container.engineType).toBe('podman');
+    expect(container.StartedAt).toBe('2023-08-10T13:37:44.000Z');
+    expect(container.pod).toBeUndefined();
+    expect(container.Id).toBe('31a4b282691420be2611817f203765402d8da7e13cd530f80a6ddd1bb4aa63b4');
+    expect(container.Command).toBe(undefined);
+    expect(container.Names).toStrictEqual(['/admiring_wing']);
+    expect(container.Image).toBe('docker.io/library/httpd:latest');
+    expect(container.ImageID).toBe('sha256:911d72fc5020723f0c003a134a8d2f062b4aea884474a11d1db7dcd28ce61d6a');
+    expect(container.Created).toBe(1691674664);
+    expect(container.Ports).toStrictEqual([
+      {
+        IP: '',
+        PrivatePort: 8080,
+        PublicPort: 8080,
+        Type: 'tcp',
+      },
+    ]);
+    expect(container.Labels).toStrictEqual({
+      'io.buildah.version': '1.30.0',
+      maintainer: 'Podman Maintainers',
+    });
+    expect(container.State).toBe('running');
+  });
 });
 
 test('pull unknown image ', async () => {

diff --git a/packages/main/src/plugin/container-registry.ts b/packages/main/src/plugin/container-registry.ts
@@ -303,7 +303,7 @@ export class ContainerProviderRegistry {
             Names: string[];
             Image: string;
             ImageID: string;
-            Command: string;
+            Command?: string;
             Created: number;
             Ports: ContainerPortInfo[];
             Labels: { [label: string]: string };
@@ -354,7 +354,7 @@ export class ContainerProviderRegistry {
                 Created: moment(podmanContainer.Created).unix(),
                 State: podmanContainer.State,
                 StartedAt,
-                Command: podmanContainer.Command[0],
+                Command: podmanContainer.Command?.length > 0 ? podmanContainer.Command[0] : undefined,
                 Labels,
                 Ports,
               };

diff --git a/packages/renderer/src/lib/container/ContainerDetailsSummary.svelte b/packages/renderer/src/lib/container/ContainerDetailsSummary.svelte
@@ -11,7 +11,7 @@ export let container: ContainerInfoUI;
         <td class="pt-2 pr-2">Id</td>
         <td class="pt-2 pr-2">{container.shortId}</td>
       </tr>
-      <tr>
+      <tr class:hidden="{!container.command}">
         <td class="pt-2 pr-2">Command</td>
         <td class="pt-2 pr-2">{container.command}</td>
       </tr>

diff --git a/packages/renderer/src/lib/container/ContainerInfoUI.ts b/packages/renderer/src/lib/container/ContainerInfoUI.ts
@@ -57,7 +57,7 @@ export interface ContainerInfoUI {
   ports: Port[];
   portsAsString: string;
   displayPort: string;
-  command: string;
+  command?: string;
   hasPublicPort: boolean;
   openingUrl?: string;
   groupInfo: ContainerGroupPartInfoUI;