Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use full DSL for non-sandboxed PR runs #439

Merged
merged 2 commits into from
Jul 9, 2019
Merged

Use full DSL for non-sandboxed PR runs #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e401d1d
Use createPRDSL instead of createPRJSONDSL in runPRRun
jtreanor Jul 8, 2019
cf51f3b
Fix github.api authentication by passing access token to jsonToDSL
jtreanor Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/source/github/events/_tests/_github_runner-prs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { runPRRun } from "../handlers/pr"
const apiFixtures = resolve(__dirname, "fixtures")
const fixture = (file: string) => JSON.parse(readFileSync(resolve(apiFixtures, file), "utf8"))

jest.mock("../createPRDSL", () => ({ createPRJSONDSL: () => Promise.resolve({}) }))
jest.mock("../createPRDSL", () => ({ createPRDSL: () => Promise.resolve({}) }))

it("runs a Dangerfile for a PR with a local", async () => {
mockContents.mockImplementationOnce(() => Promise.resolve("fail('dangerfile')"))
Expand Down
5 changes: 5 additions & 0 deletions api/source/github/events/createPRDSL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ import { source } from "../../danger/peril_ci_source"
*/
export const createPRDSL = async (githubAPI: GitHubAPI) => {
const jsonDSL = await createPRJSONDSL(githubAPI)
// Danger JS expects the Github access token to be set on
// settings.github.accessToken, so put it there if we have one
if (githubAPI.token !== undefined) {
jsonDSL.settings.github.accessToken = githubAPI.token
}
return await jsonToDSL(jsonDSL, source)
}

Expand Down
33 changes: 0 additions & 33 deletions api/source/github/events/handlers/_tests/__snapshots__/_pr-create-fixture.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,6 @@ Object {
],
"payload": Object {
"dsl": Object {
"git": Object {
"JSONDiffForFile": [Function],
"JSONPatchForFile": [Function],
"commits": Array [
Object {
"author": Object {
"date": "1",
"email": "1",
"name": "1",
},
"committer": Object {
"date": "1",
"email": "1",
"name": "1",
},
"message": "456",
"sha": "123",
"tree": Object {
"sha": "123",
"url": "123",
},
"url": "123",
},
],
"created_files": Array [],
"deleted_files": Array [],
"diffForFile": [Function],
"fileMatch": [Function],
"linesOfCode": [Function],
"modified_files": Array [],
"structuredDiffForFile": [Function],
},
"github": Object {},
"settings": Object {
"cliArgs": Object {},
"github": Object {
Expand Down
2 changes: 2 additions & 0 deletions api/source/github/events/handlers/_tests/_pr-create-fixture.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jest.mock("../../../../danger/peril_platform", () => ({
getPerilPlatformForDSL: () => mockPlatform,
}))

jest.mock("../../createPRDSL", () => ({ createPRDSL: () => Promise.resolve({}) }))

const apiFixtures = resolve(__dirname, "../../_tests/fixtures")
const fixture = (file: string) => JSON.parse(readFileSync(resolve(apiFixtures, file), "utf8"))

Expand Down
27 changes: 0 additions & 27 deletions api/source/github/events/handlers/_tests/fixtures/PerilRunnerPRBootStrapExample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,6 @@
},
"payload": {
"dsl": {
"git": {
"modified_files": [],
"created_files": [],
"deleted_files": [],
"commits": [
{
"sha": "123",
"author": {
"name": "1",
"email": "1",
"date": "1"
},
"committer": {
"name": "1",
"email": "1",
"date": "1"
},
"message": "456",
"tree": {
"sha": "123",
"url": "123"
},
"url": "123"
}
]
},
"github": {},
"settings": {
"github": {
"accessToken": "12345",
Expand Down
4 changes: 2 additions & 2 deletions api/source/github/events/handlers/pr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { DangerResults } from "danger/distribution/dsl/DangerResults"
import { DangerRun, RunType } from "../../../danger/danger_run"
import { runDangerForInstallation } from "../../../danger/danger_runner"
import { canUserWriteToRepo, getGitHubFileContents } from "../../lib/github_helpers"
import { createPRJSONDSL } from "../createPRDSL"
import { createPRDSL } from "../createPRDSL"
import { GitHubRunSettings } from "../github_runner"
import { Pull_request } from "../types/pull_request_updated.types"
import { githubAPIForCommentable } from "../utils/commenting"
Expand Down Expand Up @@ -57,7 +57,7 @@ export const runPRRun = async (
settings: settings.installationSettings,
}

const dangerDSL = await createPRJSONDSL(githubAPI)
const dangerDSL = await createPRDSL(githubAPI)
const results = await runDangerForInstallation(
eventName,
contents,
Expand Down