From 4414c7cde7acadfe25e93f11ee1e75a2d9bf7d82 Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Thu, 22 Jul 2021 15:26:36 -0400 Subject: [PATCH] Start FileUpdater container, add it to `host` network, and use internal endpoint in test --- __tests__/updater-integration.test.ts | 8 +++++--- src/updater.ts | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/__tests__/updater-integration.test.ts b/__tests__/updater-integration.test.ts index a5bea5b..fe5850f 100644 --- a/__tests__/updater-integration.test.ts +++ b/__tests__/updater-integration.test.ts @@ -12,11 +12,15 @@ describe('Updater', () => { jobID: 1, jobToken: 'xxx', credentialsToken: 'yyy', - dependabotAPI: 'http://localhost' + dependabotAPI: 'http://host.docker.internal:3001' } } const updater = new Updater(docker, mockDependabotAPI) + beforeAll(() => { + updater.pullImage() + }) + afterEach(() => { docker.listContainers(function (err, containers) { if (!containers) return @@ -54,8 +58,6 @@ describe('Updater', () => { } ] }) - - await updater.pullImage() await updater.runUpdater() }) }) diff --git a/src/updater.ts b/src/updater.ts index 3e62e39..35b1f36 100644 --- a/src/updater.ts +++ b/src/updater.ts @@ -118,6 +118,15 @@ export class Updater { files: FetchedFiles ): Promise { core.info(`running update ${details.id} ${files}`) + const container = await this.createContainer(details, 'update_files') + const containerInput: FileUpdaterInput = { + base_commit_sha: files.base_commit_sha, + base64_dependency_files: files.base64_dependency_files, + dependency_files: files.dependency_files, + job: details + } + await this.storeContainerInput(container, containerInput) + await this.runContainer(container) } private async createContainer( @@ -170,6 +179,9 @@ export class Updater { }) container.modem.demuxStream(stream, process.stdout, process.stderr) + const network = this.docker.getNetwork('host') + network.connect({Container: container}, (err, data) => core.info(err)) + await container.wait() } finally { await container.remove()