Replace safeLoad with load

This commit is contained in:
Edoardo Pirovano 2021-07-27 22:12:26 +01:00
parent fde64716e1
commit 05fc5a885c
No known key found for this signature in database
GPG key ID: 047556B5D93FFE28
12 changed files with 36 additions and 36 deletions

2
lib/actions-util.js generated
View file

@ -289,7 +289,7 @@ exports.formatWorkflowCause = formatWorkflowCause;
async function getWorkflow() { async function getWorkflow() {
const relativePath = await getWorkflowPath(); const relativePath = await getWorkflowPath();
const absolutePath = path.join(util_1.getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath); const absolutePath = path.join(util_1.getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath);
return yaml.safeLoad(fs.readFileSync(absolutePath, "utf-8")); return yaml.load(fs.readFileSync(absolutePath, "utf-8"));
} }
exports.getWorkflow = getWorkflow; exports.getWorkflow = getWorkflow;
/** /**

File diff suppressed because one or more lines are too long

View file

@ -139,7 +139,7 @@ ava_1.default("getWorkflowErrors() when on.pull_requests is a string and correct
t.deepEqual(...errorCodes(errors, [])); t.deepEqual(...errorCodes(errors, []));
}); });
ava_1.default("getWorkflowErrors() when on.push is correct with empty objects", (t) => { ava_1.default("getWorkflowErrors() when on.push is correct with empty objects", (t) => {
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
on: on:
push: push:
pull_request: pull_request:
@ -228,7 +228,7 @@ ava_1.default("getWorkflowErrors() for a range of malformed workflows", (t) => {
}), [])); }), []));
}); });
ava_1.default("getWorkflowErrors() when on.pull_request for every branch but push specifies branches", (t) => { ava_1.default("getWorkflowErrors() when on.pull_request for every branch but push specifies branches", (t) => {
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -311,7 +311,7 @@ ava_1.default("patternIsSuperset()", (t) => {
t.false(actionsutil.patternIsSuperset("/robin/moose/release/goose", "/robin/*/release/*")); t.false(actionsutil.patternIsSuperset("/robin/moose/release/goose", "/robin/*/release/*"));
}); });
ava_1.default("getWorkflowErrors() when branches contain dots", (t) => { ava_1.default("getWorkflowErrors() when branches contain dots", (t) => {
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
on: on:
push: push:
branches: [4.1, master] branches: [4.1, master]
@ -322,7 +322,7 @@ ava_1.default("getWorkflowErrors() when branches contain dots", (t) => {
t.deepEqual(...errorCodes(errors, [])); t.deepEqual(...errorCodes(errors, []));
}); });
ava_1.default("getWorkflowErrors() when on.push has a trailing comma", (t) => { ava_1.default("getWorkflowErrors() when on.push has a trailing comma", (t) => {
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -335,7 +335,7 @@ on:
}); });
ava_1.default("getWorkflowErrors() should only report the current job's CheckoutWrongHead", (t) => { ava_1.default("getWorkflowErrors() should only report the current job's CheckoutWrongHead", (t) => {
process.env.GITHUB_JOB = "test"; process.env.GITHUB_JOB = "test";
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -359,7 +359,7 @@ jobs:
}); });
ava_1.default("getWorkflowErrors() should not report a different job's CheckoutWrongHead", (t) => { ava_1.default("getWorkflowErrors() should not report a different job's CheckoutWrongHead", (t) => {
process.env.GITHUB_JOB = "test3"; process.env.GITHUB_JOB = "test3";
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -382,34 +382,34 @@ jobs:
t.deepEqual(...errorCodes(errors, [])); t.deepEqual(...errorCodes(errors, []));
}); });
ava_1.default("getWorkflowErrors() when on is missing", (t) => { ava_1.default("getWorkflowErrors() when on is missing", (t) => {
const errors = actionsutil.getWorkflowErrors(yaml.safeLoad(` const errors = actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
`)); `));
t.deepEqual(...errorCodes(errors, [])); t.deepEqual(...errorCodes(errors, []));
}); });
ava_1.default("getWorkflowErrors() with a different on setup", (t) => { ava_1.default("getWorkflowErrors() with a different on setup", (t) => {
t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(` t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: "workflow_dispatch" on: "workflow_dispatch"
`)), [])); `)), []));
t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(` t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: [workflow_dispatch] on: [workflow_dispatch]
`)), [])); `)), []));
t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(` t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
workflow_dispatch: {} workflow_dispatch: {}
`)), [])); `)), []));
}); });
ava_1.default("getWorkflowErrors() should not report an error if PRs are totally unconfigured", (t) => { ava_1.default("getWorkflowErrors() should not report an error if PRs are totally unconfigured", (t) => {
t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(` t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
branches: [master] branches: [master]
`)), [])); `)), []));
t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.safeLoad(` t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(yaml.load(`
name: "CodeQL" name: "CodeQL"
on: ["push"] on: ["push"]
`)), [])); `)), []));

File diff suppressed because one or more lines are too long

2
lib/analyze.test.js generated
View file

@ -277,7 +277,7 @@ ava_1.default("status report fields and search path setting", async (t) => {
function readContents(name) { function readContents(name) {
const x = fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8"); const x = fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8");
console.log(x); console.log(x);
return yaml.safeLoad(fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8")); return yaml.load(fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8"));
} }
} }
}); });

File diff suppressed because one or more lines are too long

4
lib/config-utils.js generated
View file

@ -723,7 +723,7 @@ function getLocalConfig(configFile, workspacePath) {
if (!fs.existsSync(configFile)) { if (!fs.existsSync(configFile)) {
throw new Error(getConfigFileDoesNotExistErrorMessage(configFile)); throw new Error(getConfigFileDoesNotExistErrorMessage(configFile));
} }
return yaml.safeLoad(fs.readFileSync(configFile, "utf8")); return yaml.load(fs.readFileSync(configFile, "utf8"));
} }
async function getRemoteConfig(configFile, apiDetails) { async function getRemoteConfig(configFile, apiDetails) {
// retrieve the various parts of the config location, and ensure they're present // retrieve the various parts of the config location, and ensure they're present
@ -751,7 +751,7 @@ async function getRemoteConfig(configFile, apiDetails) {
else { else {
throw new Error(getConfigFileFormatInvalidMessage(configFile)); throw new Error(getConfigFileFormatInvalidMessage(configFile));
} }
return yaml.safeLoad(Buffer.from(fileContents, "base64").toString("binary")); return yaml.load(Buffer.from(fileContents, "base64").toString("binary"));
} }
/** /**
* Get the file path where the parsed config will be stored. * Get the file path where the parsed config will be stored.

File diff suppressed because one or more lines are too long

View file

@ -193,7 +193,7 @@ test("getWorkflowErrors() when on.pull_requests is a string and correct", (t) =>
test("getWorkflowErrors() when on.push is correct with empty objects", (t) => { test("getWorkflowErrors() when on.push is correct with empty objects", (t) => {
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
on: on:
push: push:
pull_request: pull_request:
@ -363,7 +363,7 @@ test("getWorkflowErrors() for a range of malformed workflows", (t) => {
test("getWorkflowErrors() when on.pull_request for every branch but push specifies branches", (t) => { test("getWorkflowErrors() when on.pull_request for every branch but push specifies branches", (t) => {
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -480,7 +480,7 @@ test("patternIsSuperset()", (t) => {
test("getWorkflowErrors() when branches contain dots", (t) => { test("getWorkflowErrors() when branches contain dots", (t) => {
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
on: on:
push: push:
branches: [4.1, master] branches: [4.1, master]
@ -495,7 +495,7 @@ test("getWorkflowErrors() when branches contain dots", (t) => {
test("getWorkflowErrors() when on.push has a trailing comma", (t) => { test("getWorkflowErrors() when on.push has a trailing comma", (t) => {
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -513,7 +513,7 @@ test("getWorkflowErrors() should only report the current job's CheckoutWrongHead
process.env.GITHUB_JOB = "test"; process.env.GITHUB_JOB = "test";
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -544,7 +544,7 @@ test("getWorkflowErrors() should not report a different job's CheckoutWrongHead"
process.env.GITHUB_JOB = "test3"; process.env.GITHUB_JOB = "test3";
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -571,7 +571,7 @@ jobs:
test("getWorkflowErrors() when on is missing", (t) => { test("getWorkflowErrors() when on is missing", (t) => {
const errors = actionsutil.getWorkflowErrors( const errors = actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
`) `)
); );
@ -583,7 +583,7 @@ test("getWorkflowErrors() with a different on setup", (t) => {
t.deepEqual( t.deepEqual(
...errorCodes( ...errorCodes(
actionsutil.getWorkflowErrors( actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: "workflow_dispatch" on: "workflow_dispatch"
`) `)
@ -595,7 +595,7 @@ on: "workflow_dispatch"
t.deepEqual( t.deepEqual(
...errorCodes( ...errorCodes(
actionsutil.getWorkflowErrors( actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: [workflow_dispatch] on: [workflow_dispatch]
`) `)
@ -607,7 +607,7 @@ on: [workflow_dispatch]
t.deepEqual( t.deepEqual(
...errorCodes( ...errorCodes(
actionsutil.getWorkflowErrors( actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
workflow_dispatch: {} workflow_dispatch: {}
@ -622,7 +622,7 @@ test("getWorkflowErrors() should not report an error if PRs are totally unconfig
t.deepEqual( t.deepEqual(
...errorCodes( ...errorCodes(
actionsutil.getWorkflowErrors( actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: on:
push: push:
@ -636,7 +636,7 @@ on:
t.deepEqual( t.deepEqual(
...errorCodes( ...errorCodes(
actionsutil.getWorkflowErrors( actionsutil.getWorkflowErrors(
yaml.safeLoad(` yaml.load(`
name: "CodeQL" name: "CodeQL"
on: ["push"] on: ["push"]
`) `)

View file

@ -332,7 +332,7 @@ export async function getWorkflow(): Promise<Workflow> {
relativePath relativePath
); );
return yaml.safeLoad(fs.readFileSync(absolutePath, "utf-8")); return yaml.load(fs.readFileSync(absolutePath, "utf-8"));
} }
/** /**

View file

@ -324,7 +324,7 @@ test("status report fields and search path setting", async (t) => {
); );
console.log(x); console.log(x);
return yaml.safeLoad( return yaml.load(
fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8") fs.readFileSync(path.join(tmpDir, "codeql_databases", name), "utf8")
); );
} }

View file

@ -1286,7 +1286,7 @@ function getLocalConfig(configFile: string, workspacePath: string): UserConfig {
throw new Error(getConfigFileDoesNotExistErrorMessage(configFile)); throw new Error(getConfigFileDoesNotExistErrorMessage(configFile));
} }
return yaml.safeLoad(fs.readFileSync(configFile, "utf8")); return yaml.load(fs.readFileSync(configFile, "utf8"));
} }
async function getRemoteConfig( async function getRemoteConfig(
@ -1321,7 +1321,7 @@ async function getRemoteConfig(
throw new Error(getConfigFileFormatInvalidMessage(configFile)); throw new Error(getConfigFileFormatInvalidMessage(configFile));
} }
return yaml.safeLoad(Buffer.from(fileContents, "base64").toString("binary")); return yaml.load(Buffer.from(fileContents, "base64").toString("binary"));
} }
/** /**