Merge pull request #112 from github/jurre/proxy-job-id

Pass job-id directly to proxy

__tests__/proxy-integration.test.ts

@@ -1,5 +1,5 @@
 import Docker from 'dockerode'
-import {Credential, JobDetails} from '../src/api-client'
+import {Credential} from '../src/api-client'
 import {ImageService} from '../src/image-service'
 import {PROXY_IMAGE_NAME} from '../src/main'
 import {ProxyBuilder} from '../src/proxy'
@@ -10,15 +10,7 @@ import path from 'path'
 
 describe('ProxyBuilder', () => {
   const docker = new Docker()
-  const details: JobDetails = {
-    id: '1',
-    'allowed-updates': [
-      {
-        'dependency-type': 'all'
-      }
-    ],
-    'package-manager': 'npm_and_yarn'
-  }
+  const jobId = 1
   const credentials: Credential[] = [
     {
       type: 'git_source',
@@ -48,7 +40,7 @@ describe('ProxyBuilder', () => {
       return
     }
 
-    const proxy = await builder.run(details, credentials)
+    const proxy = await builder.run(jobId, credentials)
     await proxy.container.start()
 
     expect(proxy.networkName).toBe('job-1-network')
@@ -91,7 +83,7 @@ describe('ProxyBuilder', () => {
     fs.writeFileSync(certPath, 'ca-pem-contents')
     process.env.CUSTOM_CA_PATH = certPath
 
-    const proxy = await builder.run(details, credentials)
+    const proxy = await builder.run(jobId, credentials)
     await proxy.container.start()
 
     const id = proxy.container.id

src/proxy.ts

@@ -8,7 +8,7 @@ import {
   ProxyConfig
 } from './config-types'
 import {ContainerService} from './container-service'
-import {Credential, JobDetails} from './api-client'
+import {Credential} from './api-client'
 import {pki} from 'node-forge'
 import {outStream, errStream} from './utils'
 
@@ -60,15 +60,15 @@ export class ProxyBuilder {
     private readonly proxyImage: string
   ) {}
 
-  async run(details: JobDetails, credentials: Credential[]): Promise<Proxy> {
-    const name = `job-${details.id}-proxy`
-    const config = this.buildProxyConfig(credentials, details.id)
+  async run(jobId: number, credentials: Credential[]): Promise<Proxy> {
+    const name = `job-${jobId}-proxy`
+    const config = this.buildProxyConfig(credentials, jobId)
     const cert = config.ca.cert
 
-    const networkName = `job-${details.id}-network`
+    const networkName = `job-${jobId}-network`
     const network = await this.ensureNetwork(networkName)
 
-    const container = await this.createContainer(details.id, name, networkName)
+    const container = await this.createContainer(jobId, name, networkName)
 
     await ContainerService.storeInput(
       CONFIG_FILE_NAME,
@@ -130,7 +130,7 @@ export class ProxyBuilder {
 
   private buildProxyConfig(
     credentials: Credential[],
-    jobId: string
+    jobId: number
   ): ProxyConfig {
     const ca = this.generateCertificateAuthority()
     const password = crypto.randomBytes(20).toString('hex')
@@ -167,7 +167,7 @@ export class ProxyBuilder {
   }
 
   private async createContainer(
-    jobId: string,
+    jobId: number,
     containerName: string,
     networkName: string
   ): Promise<Container> {

src/updater.ts

@@ -35,7 +35,7 @@ export class Updater {
    */
   async runUpdater(): Promise<boolean> {
     const proxy = await new ProxyBuilder(this.docker, this.proxyImage).run(
-      this.details,
+      this.apiClient.params.jobId,
       this.credentials
     )
     proxy.container.start()