From cce113b7fcfae9693c1190503943cfdd221de2e9 Mon Sep 17 00:00:00 2001 From: Joshua Hale Date: Wed, 6 May 2020 14:03:29 +0100 Subject: [PATCH] don't catch error initializing config --- lib/config-utils.js | 63 ++++++++++++++++++++------------------------ lib/setup-tracer.js | 2 +- src/config-utils.ts | 64 +++++++++++++++++++++------------------------ src/setup-tracer.ts | 2 +- 4 files changed, 61 insertions(+), 70 deletions(-) diff --git a/lib/config-utils.js b/lib/config-utils.js index 360db685b..5d7daf1d5 100644 --- a/lib/config-utils.js +++ b/lib/config-utils.js @@ -71,41 +71,36 @@ function initConfig() { core.debug('No configuration file was provided'); return config; } - try { - const parsedYAML = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); - if (parsedYAML.name && typeof parsedYAML.name === "string") { - config.name = parsedYAML.name; - } - if (parsedYAML['disable-default-queries'] && typeof parsedYAML['disable-default-queries'] === "boolean") { - config.disableDefaultQueries = parsedYAML['disable-default-queries']; - } - const queries = parsedYAML.queries; - if (queries && queries instanceof Array) { - queries.forEach(query => { - if (query.uses && typeof query.uses === "string") { - config.addQuery(query.uses); - } - }); - } - const pathsIgnore = parsedYAML['paths-ignore']; - if (pathsIgnore && pathsIgnore instanceof Array) { - pathsIgnore.forEach(path => { - if (typeof path === "string") { - config.pathsIgnore.push(path); - } - }); - } - const paths = parsedYAML.paths; - if (paths && paths instanceof Array) { - paths.forEach(path => { - if (typeof path === "string") { - config.paths.push(path); - } - }); - } + const parsedYAML = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); + if (parsedYAML.name && typeof parsedYAML.name === "string") { + config.name = parsedYAML.name; } - catch (err) { - core.setFailed(err); + if (parsedYAML['disable-default-queries'] && typeof parsedYAML['disable-default-queries'] === "boolean") { + config.disableDefaultQueries = parsedYAML['disable-default-queries']; + } + const queries = parsedYAML.queries; + if (queries && queries instanceof Array) { + queries.forEach(query => { + if (query.uses && typeof query.uses === "string") { + config.addQuery(query.uses); + } + }); + } + const pathsIgnore = parsedYAML['paths-ignore']; + if (pathsIgnore && pathsIgnore instanceof Array) { + pathsIgnore.forEach(path => { + if (typeof path === "string") { + config.pathsIgnore.push(path); + } + }); + } + const paths = parsedYAML.paths; + if (paths && paths instanceof Array) { + paths.forEach(path => { + if (typeof path === "string") { + config.paths.push(path); + } + }); } return config; } diff --git a/lib/setup-tracer.js b/lib/setup-tracer.js index 51690d8c1..6f7b1d079 100644 --- a/lib/setup-tracer.js +++ b/lib/setup-tracer.js @@ -205,8 +205,8 @@ async function run() { await util.reportActionFailed('init', error.message, error.stack); return; } - core.exportVariable(sharedEnv.CODEQL_ACTION_INIT_COMPLETED, 'true'); await util.reportActionSucceeded('init'); + core.exportVariable(sharedEnv.CODEQL_ACTION_INIT_COMPLETED, 'true'); } run().catch(e => { core.setFailed("init action failed: " + e); diff --git a/src/config-utils.ts b/src/config-utils.ts index 2c31495cd..2189743d5 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -75,45 +75,41 @@ function initConfig(): Config { return config; } - try { - const parsedYAML = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); + const parsedYAML = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); - if (parsedYAML.name && typeof parsedYAML.name === "string") { - config.name = parsedYAML.name; - } + if (parsedYAML.name && typeof parsedYAML.name === "string") { + config.name = parsedYAML.name; + } - if (parsedYAML['disable-default-queries'] && typeof parsedYAML['disable-default-queries'] === "boolean") { - config.disableDefaultQueries = parsedYAML['disable-default-queries']; - } + if (parsedYAML['disable-default-queries'] && typeof parsedYAML['disable-default-queries'] === "boolean") { + config.disableDefaultQueries = parsedYAML['disable-default-queries']; + } - const queries = parsedYAML.queries; - if (queries && queries instanceof Array) { - queries.forEach(query => { - if (query.uses && typeof query.uses === "string") { - config.addQuery(query.uses); - } - }); - } + const queries = parsedYAML.queries; + if (queries && queries instanceof Array) { + queries.forEach(query => { + if (query.uses && typeof query.uses === "string") { + config.addQuery(query.uses); + } + }); + } - const pathsIgnore = parsedYAML['paths-ignore']; - if (pathsIgnore && pathsIgnore instanceof Array) { - pathsIgnore.forEach(path => { - if (typeof path === "string") { - config.pathsIgnore.push(path); - } - }); - } + const pathsIgnore = parsedYAML['paths-ignore']; + if (pathsIgnore && pathsIgnore instanceof Array) { + pathsIgnore.forEach(path => { + if (typeof path === "string") { + config.pathsIgnore.push(path); + } + }); + } - const paths = parsedYAML.paths; - if (paths && paths instanceof Array) { - paths.forEach(path => { - if (typeof path === "string") { - config.paths.push(path); - } - }); - } - } catch (err) { - core.setFailed(err); + const paths = parsedYAML.paths; + if (paths && paths instanceof Array) { + paths.forEach(path => { + if (typeof path === "string") { + config.paths.push(path); + } + }); } return config; diff --git a/src/setup-tracer.ts b/src/setup-tracer.ts index 4fa79bf4a..4730fcf3e 100644 --- a/src/setup-tracer.ts +++ b/src/setup-tracer.ts @@ -238,8 +238,8 @@ async function run() { await util.reportActionFailed('init', error.message, error.stack); return; } - core.exportVariable(sharedEnv.CODEQL_ACTION_INIT_COMPLETED, 'true'); await util.reportActionSucceeded('init'); + core.exportVariable(sharedEnv.CODEQL_ACTION_INIT_COMPLETED, 'true'); } run().catch(e => {