fixup! chore: add attachToContainer methods

Signed-off-by: Florent Benoit <fbenoit@redhat.com>
containers · Sep 14, 2023 · fd5e26d · fd5e26d
1 parent 715bfe3
commit fd5e26d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/packages/main/src/plugin/container-registry.spec.ts b/packages/main/src/plugin/container-registry.spec.ts
@@ -1923,4 +1923,48 @@ describe('attachToContainer', () => {
     expect(containerRegistry.getStreamsOutputPerContainerId().get(dockerodeContainer.id)).toBeUndefined();
     expect(containerRegistry.getStreamsPerContainerId().get(dockerodeContainer.id)).toBeUndefined();
   });
+
+  test('container do not attach stream as tty but no OpenStdin', async () => {
+    const fakeDockerode = {} as Dockerode;
+
+    const engine = {
+      name: 'docker1',
+      id: 'docker1',
+      connection: {
+        type: 'docker',
+      },
+      api: fakeDockerode,
+    } as InternalContainerProvider;
+
+    const attachMock = vi.fn();
+    const inspectMock = vi.fn();
+
+    const dockerodeContainer = {
+      id: '1234',
+      attach: attachMock,
+      inspect: inspectMock,
+    } as unknown as Dockerode.Container;
+
+    inspectMock.mockResolvedValue({
+      Config: {
+        Tty: true,
+        OpenStdin: false,
+      },
+    });
+
+    // create a read/write stream
+    const stream = new PassThrough();
+    // need to reply with a stream
+    attachMock.mockResolvedValue(stream);
+
+    await containerRegistry.attachToContainer(engine, dockerodeContainer);
+
+    const data = 'log message';
+    //send some data
+    stream.write(data);
+
+    expect(attachMock).not.toBeCalled();
+    expect(containerRegistry.getStreamsOutputPerContainerId().get(dockerodeContainer.id)).toBeUndefined();
+    expect(containerRegistry.getStreamsPerContainerId().get(dockerodeContainer.id)).toBeUndefined();
+  });
 });
diff --git a/packages/main/src/plugin/container-registry.ts b/packages/main/src/plugin/container-registry.ts
@@ -1480,7 +1480,7 @@ export class ContainerProviderRegistry {
       openStdin = containerInspectInfo.Config.OpenStdin;
     }
     // no tty and no stdin, do not need to try to attach a terminal
-    if (!hasTty && !openStdin) {
+    if (!hasTty || !openStdin) {
       return;
     }