From b5772740ae3685fceceeda513fca4ff86a183d14 Mon Sep 17 00:00:00 2001
From: Ivan <ivan@mish.guru>
Date: Sat, 22 Feb 2020 16:27:28 -0700
Subject: [PATCH 1/2] Add a containerId request parameter for journal-logs api
 endpoint, and pass it along to journalctl process options.

Change-Type: minor
Signed-off-by: Ivan <ivanign04.alt@gmail.com>
---
 src/device-api/v2.ts | 10 +++++++++-
 src/lib/journald.ts  |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/device-api/v2.ts b/src/device-api/v2.ts
index 2e500dba..e69b1f50 100644
--- a/src/device-api/v2.ts
+++ b/src/device-api/v2.ts
@@ -471,8 +471,16 @@ export function createV2Api(router: Router, applications: ApplicationManager) {
 		const count = checkInt(req.body.count, { positive: true }) || undefined;
 		const unit = req.body.unit;
 		const format = req.body.format || 'short';
+		const containerId = req.body.containerId;
 
-		const journald = spawnJournalctl({ all, follow, count, unit, format });
+		const journald = spawnJournalctl({
+			all,
+			follow,
+			count,
+			unit,
+			format,
+			containerId,
+		});
 		res.status(200);
 		journald.stdout.pipe(res);
 		res.on('close', () => {
diff --git a/src/lib/journald.ts b/src/lib/journald.ts
index 22516614..28ab487a 100644
--- a/src/lib/journald.ts
+++ b/src/lib/journald.ts
@@ -8,6 +8,7 @@ export function spawnJournalctl(opts: {
 	follow: boolean;
 	count?: number;
 	unit?: string;
+	containerId?: string;
 	format: string;
 }): ChildProcess {
 	const args = [
@@ -25,6 +26,10 @@ export function spawnJournalctl(opts: {
 		args.push('-u');
 		args.push(opts.unit);
 	}
+	if (opts.containerId != null) {
+		args.push('-t');
+		args.push(opts.containerId);
+	}
 	if (opts.count != null) {
 		args.push('-n');
 		args.push(opts.count.toString());

From f5c51be07d616de21fef2960dfde7d70f598c7ac Mon Sep 17 00:00:00 2001
From: Ivan <ivan@mish.guru>
Date: Sat, 22 Feb 2020 16:31:31 -0700
Subject: [PATCH 2/2] Add unit test to ensure journalctl process is spawned
 with expected arguments.

Signed-off-by: Ivan <ivan@mish.guru>
---
 test/26-journald.spec.ts | 57 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 test/26-journald.spec.ts

diff --git a/test/26-journald.spec.ts b/test/26-journald.spec.ts
new file mode 100644
index 00000000..0d9b6ed8
--- /dev/null
+++ b/test/26-journald.spec.ts
@@ -0,0 +1,57 @@
+import { SinonStub, stub } from 'sinon';
+import constants = require('../src/lib/constants');
+import { spawnJournalctl } from '../src/lib/journald';
+import { expect } from './lib/chai-config';
+
+describe('journald', () => {
+	let spawn: SinonStub;
+
+	beforeEach(done => {
+		spawn = stub(require('child_process'), 'spawn');
+		done();
+	});
+
+	afterEach(done => {
+		spawn.restore();
+		done();
+	});
+
+	it('spawnJournalctl calls spawn child process with expected args', () => {
+		spawnJournalctl({
+			all: true,
+			follow: true,
+			count: 10,
+			unit: 'nginx.service',
+			containerId: 'abc123',
+			format: 'json-pretty',
+		});
+
+		const expectedCommand = `chroot`;
+		const expectedCoreArgs = [`${constants.rootMountPoint}`, 'journalctl'];
+		const expectedOptionalArgs = [
+			'-a',
+			'--follow',
+			'-u',
+			'nginx.service',
+			'-t',
+			'abc123',
+			'-n',
+			'10',
+			'-o',
+			'json-pretty',
+		];
+
+		const actualCommand = spawn.firstCall.args[0];
+		const actualCoreArgs = spawn.firstCall.args[1].slice(0, 2);
+		const actualOptionalArgs = spawn.firstCall.args[1].slice(2);
+
+		expect(spawn.calledOnce).to.be.true;
+
+		expect(actualCommand).deep.equal(expectedCommand);
+		expect(actualCoreArgs).deep.equal(expectedCoreArgs);
+
+		expectedOptionalArgs.forEach(arg => {
+			expect(actualOptionalArgs).to.include(arg);
+		});
+	});
+});