Do not pass credentials to file_fetcher/updater

These are now available in the proxy
github · Aug 11, 2021 · 8ba8780 · 8ba8780
1 parent 2fd6ad1
commit 8ba8780
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/api-client.ts b/src/api-client.ts
@@ -21,7 +21,6 @@ export type JobDetails = {
   }[]
   id: string
   'package-manager': PackageManager
-  credentials: Credential[] // TODO: Remove these once the proxy is set up
 }
 
 export type Credential = {

diff --git a/src/file-types.ts b/src/file-types.ts
@@ -8,7 +8,6 @@ export type FetchedFiles = {
 
 export type FileFetcherInput = {
   job: JobDetails
-  credentials: Credential[]
 }
 
 export type DependencyFile = {

diff --git a/src/updater.ts b/src/updater.ts
@@ -2,7 +2,7 @@ import * as core from '@actions/core'
 import Docker, {Container} from 'dockerode'
 import path from 'path'
 import fs from 'fs'
-import {Credential, JobDetails, APIClient} from './api-client'
+import {JobDetails, APIClient} from './api-client'
 import {ContainerService} from './container-service'
 import {base64DecodeDependencyFile} from './utils'
 import {DependencyFile, FetchedFiles, FileUpdaterInput} from './file-types'
@@ -36,12 +36,10 @@ export class Updater {
     try {
       const details = await this.apiClient.getJobDetails()
       const credentials = await this.apiClient.getCredentials()
-      // TODO: once the proxy is set up, remove credentials from the job details
-      details.credentials = credentials
 
       await this.proxy.run(details, credentials)
 
-      const files = await this.runFileFetcher(details, credentials)
+      const files = await this.runFileFetcher(details)
       if (!files) {
         core.error(`failed during fetch, skipping updater`)
         // TODO: report job runner_error?
@@ -59,18 +57,14 @@ export class Updater {
   }
 
   private async runFileFetcher(
-    details: JobDetails,
-    credentials: Credential[]
+    details: JobDetails
   ): Promise<void | FetchedFiles> {
     const container = await this.createContainer('fetch_files')
     await ContainerService.storeInput(
       JOB_INPUT_FILENAME,
       JOB_INPUT_PATH,
       container,
-      {
-        job: details,
-        credentials
-      }
+      {job: details}
     )
     await ContainerService.storeCert(
       CA_CERT_FILENAME,