add invocation of specific commands (graph) (#1540)

Author: jakecoffman

__tests__/graph-integration.test.ts

@@ -0,0 +1,85 @@
+import * as httpClient from '@actions/http-client'
+import {ApiClient} from '../src/api-client'
+import {ImageService} from '../src/image-service'
+import {JobParameters} from '../src/inputs'
+import {updaterImageName, PROXY_IMAGE_NAME} from '../src/docker-tags'
+import {Updater} from '../src/updater'
+
+import {
+  integration,
+  removeDanglingUpdaterContainers,
+  runFakeDependabotApi
+} from './helpers'
+
+const FAKE_SERVER_PORT = 9000
+
+integration('Graph', () => {
+  let server: any
+
+  // Used from this action to get job details and credentials
+  const dependabotApiUrl = `http://localhost:${FAKE_SERVER_PORT}`
+  // Used from within the updater container to update the job state and create prs
+  const internalDockerHost =
+    process.platform === 'darwin' ? 'host.docker.internal' : '172.17.0.1'
+  const dependabotApiDockerUrl = `http://${internalDockerHost}:${FAKE_SERVER_PORT}`
+  const updaterImage = updaterImageName('npm_and_yarn')
+
+  // Define jobToken and credentialsToken
+  const jobToken = 'xxx'
+  const credentialsToken = 'yyy'
+
+  const params = new JobParameters(
+    1,
+    jobToken,
+    credentialsToken,
+    dependabotApiUrl,
+    dependabotApiDockerUrl,
+    updaterImage
+  )
+
+  const client = new httpClient.HttpClient(
+    'github/dependabot-action integration'
+  )
+  const apiClient = new ApiClient(client, params, jobToken, credentialsToken)
+
+  beforeAll(async () => {
+    await ImageService.pull(updaterImageName('npm_and_yarn'))
+    await ImageService.pull(PROXY_IMAGE_NAME)
+
+    const testRetry = true
+    server = await runFakeDependabotApi(FAKE_SERVER_PORT, testRetry)
+  })
+
+  afterEach(async () => {
+    server && server() // eslint-disable-line @typescript-eslint/no-unused-expressions
+    await removeDanglingUpdaterContainers()
+  })
+
+  jest.setTimeout(120000)
+
+  it('should run the graph command', async () => {
+    const details = await apiClient.getJobDetails()
+    const credentials = await apiClient.getCredentials()
+
+    details.command = 'graph'
+    details.experiments = {
+      enable_dependency_submission_poc: true
+    }
+
+    const updater = new Updater(
+      updaterImageName('npm_and_yarn'),
+      PROXY_IMAGE_NAME,
+      apiClient,
+      details,
+      credentials
+    )
+
+    await updater.runUpdater()
+
+    // NOTE: This will not work when running against the actual dependabot-api
+    // Checks if the graph_updates was persisted in the fake json-server
+    const res = await client.getJson<any>(`${dependabotApiUrl}/graph_updates/1`)
+
+    expect(res.statusCode).toEqual(200)
+  })
+})

__tests__/server/db.json

@@ -48,5 +48,6 @@
       }
     }
   ],
-  "pull_requests": []
+  "pull_requests": [],
+  "graph_updates": []
 }

__tests__/server/server.js

@@ -75,6 +75,18 @@ server.post(
   }
 )
 
+server.post(
+  '/update_jobs/:id/create_dependency_submission',
+  jsonServer.bodyParser,
+  (req, res) => {
+    const data = { ...req.body.data, id: req.params.id }
+    db.graph_updates.push(data)
+    router.db.write()
+
+    res.status(204).send()
+  }
+)
+
 server.post('/update_jobs/:id/record_update_job_error', (_, res) => {
   res.status(204).send()
 })

dist/main/index.js

@@ -5,6 +5,7 @@ import {TypedResponse} from '@actions/http-client/lib/interfaces'
 
 // JobDetails are information about the repository and dependencies to be updated
 export type JobDetails = {
+  command?: string
   'allowed-updates': Array<{
     'dependency-type': string
   }>

dist/main/index.js.map

@@ -33,7 +33,7 @@ export const ContainerService = {
     await container.putArchive(tar, {path})
   },
 
-  async run(container: Container): Promise<boolean> {
+  async run(container: Container, command?: string): Promise<boolean> {
     try {
       // Start the container
       await container.start()
@@ -56,10 +56,19 @@ export const ContainerService = {
         // Then run the dependabot commands as dependabot user
         const dependabotCommands = [
           'mkdir -p /home/dependabot/dependabot-updater/output',
-          '$DEPENDABOT_HOME/dependabot-updater/bin/run fetch_files',
-          '$DEPENDABOT_HOME/dependabot-updater/bin/run update_files'
+          '$DEPENDABOT_HOME/dependabot-updater/bin/run fetch_files'
         ]
 
+        if (command === 'graph') {
+          dependabotCommands.push(
+            '$DEPENDABOT_HOME/dependabot-updater/bin/run update_graph'
+          )
+        } else {
+          dependabotCommands.push(
+            '$DEPENDABOT_HOME/dependabot-updater/bin/run update_files'
+          )
+        }
+
         for (const cmd of dependabotCommands) {
           await this.execCommand(
             container,

src/api-client.ts

@@ -143,7 +143,7 @@ export class Updater {
       job: this.details
     })
 
-    await ContainerService.run(container)
+    await ContainerService.run(container, this.details.command)
   }
 
   private async createContainer(