diff --git a/src/config/pragmas/http.js b/src/config/pragmas/http.js index 9256d10c..22a02b74 100644 --- a/src/config/pragmas/http.js +++ b/src/config/pragmas/http.js @@ -59,7 +59,7 @@ module.exports = function configureHTTP ({ arc, inventory, errors }) { arcStaticAssetProxy: true, pragma: 'http', method: 'get', - path: '/*' + path: '/*', } asap.config.shared = false asap.config.views = false diff --git a/src/config/pragmas/index.js b/src/config/pragmas/index.js index fbad35cd..365d008a 100644 --- a/src/config/pragmas/index.js +++ b/src/config/pragmas/index.js @@ -4,7 +4,6 @@ let { all: allPragmas } = pragmas // Get all pragmas except special cases let isSpecial = p => [ 'plugins', 'shared', 'views' ].includes(p) let visitors = allPragmas.map(p => { - // eslint-disable-next-line if (!isSpecial(p)) return require(`./${p}`) }).filter(Boolean) diff --git a/src/config/pragmas/plugins.js b/src/config/pragmas/plugins.js index 2a9433d6..71bbc69b 100644 --- a/src/config/pragmas/plugins.js +++ b/src/config/pragmas/plugins.js @@ -51,7 +51,6 @@ module.exports = async function getPluginModules ({ arc, inventory, errors }) { /* istanbul ignore next: idk why but for some reason nyc isn't picking up the catches; all cases are covered in tests, though! */ if (type === 'plugin') { try { - // eslint-disable-next-line plugins[name] = require(pluginPath) } catch (err) { @@ -69,7 +68,6 @@ module.exports = async function getPluginModules ({ arc, inventory, errors }) { } // Remap @macros to deploy.start if (type === 'macro') { - // eslint-disable-next-line plugins[name] = { deploy: { start: require(pluginPath) } } } // Walk each plugin and build the method tree diff --git a/src/config/pragmas/populate-lambda/_scheduled.js b/src/config/pragmas/populate-lambda/_scheduled.js index 7fce7b53..0211d7a4 100644 --- a/src/config/pragmas/populate-lambda/_scheduled.js +++ b/src/config/pragmas/populate-lambda/_scheduled.js @@ -26,7 +26,7 @@ let get = { dayOfWeek: bits[4], year: bits[5], } - } + }, } module.exports = function populateScheduled (params) { diff --git a/src/config/pragmas/populate-lambda/get-handler.js b/src/config/pragmas/populate-lambda/get-handler.js index 2b60116c..fc8c7c65 100644 --- a/src/config/pragmas/populate-lambda/get-handler.js +++ b/src/config/pragmas/populate-lambda/get-handler.js @@ -93,7 +93,7 @@ function getExt ({ runtime, src, errors }) { } } -function findHandler (arr, src){ +function findHandler (arr, src) { for (let handler of arr) { if (existsSync(join(src, handler))) { let bits = handler.split('.') diff --git a/src/config/pragmas/shared.js b/src/config/pragmas/shared.js index e299262e..277a59d5 100644 --- a/src/config/pragmas/shared.js +++ b/src/config/pragmas/shared.js @@ -11,7 +11,7 @@ module.exports = function configureShared ({ arc, pragmas, inventory, errors }) let src = join(projSrc, 'shared') let shared = { src: null, - shared: [] + shared: [], } let foundPluginSrc, foundArcSrc, required = false diff --git a/src/config/pragmas/tables-indexes.js b/src/config/pragmas/tables-indexes.js index 5267b601..3f94bc6b 100644 --- a/src/config/pragmas/tables-indexes.js +++ b/src/config/pragmas/tables-indexes.js @@ -31,7 +31,7 @@ module.exports = function configureTablesIndexes ({ arc, inventory, errors }) { plugins: indexesSetters, inventory, type: 'indexes', - valid: { name: 'string' } + valid: { name: 'string' }, }) if (plugins) indexes.push(...plugins) diff --git a/src/config/pragmas/tables.js b/src/config/pragmas/tables.js index c49a76fd..b2e70c34 100644 --- a/src/config/pragmas/tables.js +++ b/src/config/pragmas/tables.js @@ -26,7 +26,7 @@ module.exports = function configureTables ({ arc, inventory, errors }) { plugins: tablesSetters, inventory, type: 'tables', - valid: { name: 'string' } + valid: { name: 'string' }, }) if (plugins) tables.push(...plugins) diff --git a/src/config/pragmas/validate/_proxy.js b/src/config/pragmas/validate/_proxy.js index 6130f26c..4295e10c 100644 --- a/src/config/pragmas/validate/_proxy.js +++ b/src/config/pragmas/validate/_proxy.js @@ -7,7 +7,7 @@ module.exports = function validateProxy (proxy, errors) { errors.push(`Invalid @proxy protocol: ${url}`) } } - catch (e) { + catch { errors.push(`Invalid @proxy URL: ${url}`) } }) diff --git a/src/config/pragmas/validate/_tables.js b/src/config/pragmas/validate/_tables.js index dfc00dda..588a783e 100644 --- a/src/config/pragmas/validate/_tables.js +++ b/src/config/pragmas/validate/_tables.js @@ -43,7 +43,7 @@ module.exports = function validateTablesAndIndexes (pragma, pragmaName, errors) deepStrictEqual(index, expect) return true } - catch (err) { + catch { return false } }) diff --git a/src/config/pragmas/validate/index.js b/src/config/pragmas/validate/index.js index e9917a1c..46c4a3aa 100644 --- a/src/config/pragmas/validate/index.js +++ b/src/config/pragmas/validate/index.js @@ -1,4 +1,3 @@ -/* eslint-disable global-require */ module.exports = { // Pragmas and project validation aws: require('./_aws'), @@ -15,5 +14,5 @@ module.exports = { websockets: require('./_websockets'), // Misc - validate: require('./_lib') + validate: require('./_lib'), } diff --git a/src/config/pragmas/views.js b/src/config/pragmas/views.js index ad9aaa30..3073aa17 100644 --- a/src/config/pragmas/views.js +++ b/src/config/pragmas/views.js @@ -15,7 +15,7 @@ module.exports = function configureViews ({ arc, pragmas, inventory, errors }) { let src = join(projSrc, 'views') let views = { src: null, - views: [] + views: [], } let foundPluginSrc, foundArcSrc, required = false diff --git a/src/config/project/prefs/index.js b/src/config/project/prefs/index.js index 953e1a00..85141869 100644 --- a/src/config/project/prefs/index.js +++ b/src/config/project/prefs/index.js @@ -87,6 +87,6 @@ module.exports = function getPrefs ({ scope, inventory, errors }) { _arc: prefs.arc, _raw: prefs.raw, }, - preferencesFile: prefs.filepath + preferencesFile: prefs.filepath, } } diff --git a/src/env/index.js b/src/env/index.js index 754c525f..25e6f6b3 100644 --- a/src/env/index.js +++ b/src/env/index.js @@ -12,9 +12,8 @@ module.exports = function env (params, inventory, callback) { let name = inventory.app let { profile, region } = inventory.aws let result = [] - // eslint-disable-next-line let awsLite = require('@aws-lite/client') - /* istanbul ignore next */ // eslint-disable-next-line + /* istanbul ignore next */ awsLite({ profile, region, plugins: [ import('@aws-lite/ssm') ] }).then(_aws => { aws = _aws @@ -24,7 +23,7 @@ module.exports = function env (params, inventory, callback) { Recursive: true, MaxResults: 10, WithDecryption: true, - paginate: true + paginate: true, } aws.ssm.GetParametersByPath(params).then(data => { // Tidy up the response diff --git a/src/index.js b/src/index.js index 35f2174d..c3c0e1f9 100644 --- a/src/index.js +++ b/src/index.js @@ -84,7 +84,7 @@ module.exports = function architectInventory (params = {}, callback) { // Userland: fill out the pragmas, starting with @plugins inventory = { ...inventory, - ...config.pragmas(project) + ...config.pragmas(project), } // End here if first-pass validation failed @@ -107,7 +107,7 @@ module.exports = function architectInventory (params = {}, callback) { else { callback(null, { inv: inventory, - get: get(inventory) + get: get(inventory), }) } }) diff --git a/src/lib/pragmas.js b/src/lib/pragmas.js index 77bb5581..2733af27 100644 --- a/src/lib/pragmas.js +++ b/src/lib/pragmas.js @@ -45,5 +45,5 @@ module.exports = { 'jsonapi', 'text', 'xml', - ] + ], } diff --git a/src/read/index.js b/src/read/index.js index 756abf08..4bc71427 100644 --- a/src/read/index.js +++ b/src/read/index.js @@ -18,7 +18,7 @@ let functionConfig = { // Local preferences let preferences = { - arc: [ 'preferences.arc', 'prefs.arc', '.preferences.arc', '.prefs.arc', ], + arc: [ 'preferences.arc', 'prefs.arc', '.preferences.arc', '.prefs.arc' ], // TODO add json, yaml later if folks want it? } diff --git a/src/validate/layers.js b/src/validate/layers.js index c2bd02e9..bc6e76c0 100644 --- a/src/validate/layers.js +++ b/src/validate/layers.js @@ -67,7 +67,7 @@ function validateARN ({ layers, region, config }) { if (region !== layerRegion) { badRegions.push( ` - Layer ARN: ${arn}\n` + - ` - Layer region: ${layerRegion}` + ` - Layer region: ${layerRegion}`, ) } }) diff --git a/src/validate/paths.js b/src/validate/paths.js index 36b53c94..0f338e19 100644 --- a/src/validate/paths.js +++ b/src/validate/paths.js @@ -8,7 +8,7 @@ module.exports = function checkFilePaths (inventory, errors) { if (proj.build && !ascii.test(proj.build)) return err('Build') let { lambdasBySrcDir } = inventory - if (lambdasBySrcDir){ + if (lambdasBySrcDir) { Object.values(lambdasBySrcDir).forEach(lambdae => { if (!Array.isArray(lambdae)) lambdae = [ lambdae ] // Normalize possible multi-tenant Lambdas lambdae.forEach(lambda => { diff --git a/test/integration/preferences-test.js b/test/integration/preferences-test.js index 8b9ecca9..92437f99 100644 --- a/test/integration/preferences-test.js +++ b/test/integration/preferences-test.js @@ -66,7 +66,7 @@ testing env_var_2 bar ` let tmp = mockTmp({ - [globalPrefsFile]: prefsText + [globalPrefsFile]: prefsText, }) overrideHomedir(tmp) inv({ cwd }, (err, result) => { @@ -113,7 +113,7 @@ test('Get local preferences', t => { env: { testing: { 'env_var_1': 'foo', 'env_var_2': 'bar' }, staging: { 'env_var_1': 'fiz', 'env_var_2': 'buz' }, - production: { 'env_var_1': 'qix qix', 'env_var_2': 'qux qux' } + production: { 'env_var_1': 'qix qix', 'env_var_2': 'qux qux' }, }, } inv({ cwd }, (err, result) => { @@ -159,42 +159,42 @@ testing let globalPrefs = { sandbox: { environment: 'testing', - quiet: true + quiet: true, }, deploy: false, env: { testing: { 'env_var_1': 'foo', 'env_var_2': 'bar' }, staging: null, production: null, - } + }, } let localPrefs = { sandbox: { environment: 'staging', }, create: { - autocreate: true + autocreate: true, }, env: { testing: { 'env_var_2': 'bar' }, staging: { 'env_var_3': 'fiz' }, production: null, - } + }, } let prefs = { sandbox: { environment: 'staging', - quiet: true + quiet: true, }, deploy: false, create: { - autocreate: true + autocreate: true, }, env: { testing: { 'env_var_2': 'bar' }, staging: { 'env_var_3': 'fiz' }, production: null, - } + }, } let tmp = mockTmp({ [globalPrefsFile]: globalPrefsText, diff --git a/test/unit/src/config/pragmas/events-test.js b/test/unit/src/config/pragmas/events-test.js index 439d3d76..ed9c221a 100644 --- a/test/unit/src/config/pragmas/events-test.js +++ b/test/unit/src/config/pragmas/events-test.js @@ -50,7 +50,7 @@ test('@events population: complex format', t => { `${values[0]} src ${values[0]}/path`, `${values[1]} - src ${values[1]}/path` + src ${values[1]}/path`, ] let arc = parse(` @events @@ -75,7 +75,7 @@ test('@events population: complex format + fallback to default paths', t => { `${values[0]} whatever thingo`, `${values[1]} - whatever thingo` + whatever thingo`, ] let arc = parse(` @events diff --git a/test/unit/src/config/pragmas/meta/src-dirs-test.js b/test/unit/src/config/pragmas/meta/src-dirs-test.js index 67dd5ba5..09962113 100644 --- a/test/unit/src/config/pragmas/meta/src-dirs-test.js +++ b/test/unit/src/config/pragmas/meta/src-dirs-test.js @@ -24,13 +24,13 @@ test('Lambda source dir population', t => { let pragmas = { http: [ { src: values[0] }, - { src: values[1] } + { src: values[1] }, ], events: [ { src: values[2] }, - { src: values[3] } + { src: values[3] }, ], - scheduled: null + scheduled: null, } let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas }) @@ -52,8 +52,8 @@ test('Multiple Lambdas mapped to the same source dir', t => { { src: values[1] }, ], events: [ - { src: values[2] } - ] + { src: values[2] }, + ], } let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas }) @@ -80,9 +80,9 @@ test('HTTP Arc Static Asset Proxy handler', t => { { name: 'get /*', arcStaticAssetProxy: true, - src: null - } - ] + src: null, + }, + ], } let { lambdaSrcDirs, lambdasBySrcDir } = populateSrcDirs({ pragmas }) @@ -95,8 +95,8 @@ test('Lambdas missing src errors', t => { t.plan(1) let pragmas = { http: [ - { name: 'get /' } - ] + { name: 'get /' }, + ], } let errors = [] populateSrcDirs({ pragmas, errors }) diff --git a/test/unit/src/config/pragmas/populate-lambda/get-handler-test.js b/test/unit/src/config/pragmas/populate-lambda/get-handler-test.js index 61af380a..21ed63ab 100644 --- a/test/unit/src/config/pragmas/populate-lambda/get-handler-test.js +++ b/test/unit/src/config/pragmas/populate-lambda/get-handler-test.js @@ -229,7 +229,7 @@ test('Handler properties (Node.js module systems)', t => { errors = [] cwd = mockTmp({ [src]: { [`${file}.mjs`]: 'hi', - 'package.json': JSON.stringify({}) + 'package.json': JSON.stringify({}), } }) result = getHandler({ config, src: join(cwd, src), errors }) t.notOk(errors.length, 'Did not get handler errors') diff --git a/test/unit/src/config/pragmas/queues-test.js b/test/unit/src/config/pragmas/queues-test.js index 47557d04..ed65aef2 100644 --- a/test/unit/src/config/pragmas/queues-test.js +++ b/test/unit/src/config/pragmas/queues-test.js @@ -81,7 +81,7 @@ test('@queues population: complex format', t => { `${values[0]} src ${values[0]}/path`, `${values[1]} - src ${values[1]}/path` + src ${values[1]}/path`, ] let arc = parse(` @queues @@ -106,7 +106,7 @@ test('@queues population: complex format + fallback to default paths', t => { `${values[0]} whatever thingo`, `${values[1]} - whatever thingo` + whatever thingo`, ] let arc = parse(` @queues diff --git a/test/unit/src/config/pragmas/scheduled-test.js b/test/unit/src/config/pragmas/scheduled-test.js index 260f683a..8793735d 100644 --- a/test/unit/src/config/pragmas/scheduled-test.js +++ b/test/unit/src/config/pragmas/scheduled-test.js @@ -15,7 +15,7 @@ let str = s => JSON.stringify(s) let rate = { expression: '1 day', value: 1, - interval: 'day' + interval: 'day', } let cron = { expression: '1 2 3 4 5 6', @@ -75,7 +75,7 @@ test('@scheduled population: simple format (JSON)', t => { 'scheduled': { [names[0]]: expressions[0], [names[1]]: expressions[1], - } + }, })) let scheduled = populateScheduled({ arc, inventory }) t.equal(scheduled.length, values.length, 'Got correct number of scheduled events back') @@ -106,7 +106,7 @@ test('@scheduled population: complex format', t => { src ${names[0]}/path`, `${names[1]} cron ${cron.expression} - src ${names[1]}/path` + src ${names[1]}/path`, ] let arc = parse(` @scheduled @@ -145,7 +145,7 @@ test('@scheduled population: complex format (JSON)', t => { cron: cron.expression, src: `${names[1]}/path`, }, - } + }, } let arc = parse.json(str(json)) let scheduled = populateScheduled({ arc, inventory }) @@ -177,7 +177,7 @@ test('@scheduled population: complex format + fallback to default paths', t => { whatever thingo`, `${names[1]} cron ${cron.expression} - whatever thingo` + whatever thingo`, ] let arc = parse(` @scheduled diff --git a/test/unit/src/config/pragmas/shared-test.js b/test/unit/src/config/pragmas/shared-test.js index b5affc64..ca131373 100644 --- a/test/unit/src/config/pragmas/shared-test.js +++ b/test/unit/src/config/pragmas/shared-test.js @@ -86,7 +86,7 @@ test(`@shared population: defaults to enabled (without @shared)`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } let shared = populateShared({ arc, pragmas, inventory }) @@ -113,7 +113,7 @@ test(`@shared population: defaults to enabled (with empty @shared)`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } let shared = populateShared({ arc, pragmas, inventory }) @@ -142,7 +142,7 @@ src foo/bar`) pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } let shared = populateShared({ arc, pragmas, inventory }) @@ -179,7 +179,7 @@ test(`@shared population: plugin setter`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } shared = populateShared({ arc, pragmas, inventory }) @@ -202,7 +202,7 @@ test(`@shared population: plugin setter`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } shared = populateShared({ arc, pragmas, inventory }) t.ok(shared.src.endsWith(join('src', 'shared')), 'Got correct src dir back') @@ -218,7 +218,7 @@ test(`@shared population: plugin setter`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } // Just a control test! shared = populateShared({ arc, pragmas, inventory }) @@ -239,7 +239,7 @@ test(`@shared population: plugin setter`, t => { pragmas = { http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } shared = populateShared({ arc, pragmas, inventory }) t.equal(shared.src, 'foo/baz', 'Got correct src dir back') @@ -263,7 +263,7 @@ test(`@shared population: plugin setter`, t => { arc = parse(`@http\n${httpLambda}`) pragmas = { http: populateHTTP({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } shared = populateShared({ arc, pragmas, inventory }) t.equal(shared.src, src, 'Got correct src dir back') @@ -299,7 +299,7 @@ src foo/bar`) http: populateHTTP({ arc, inventory }), events: populateEvents({ arc, inventory }), queues: populateQueues({ arc, inventory }), - lambdaSrcDirs + lambdaSrcDirs, } let shared = populateShared({ arc, pragmas, inventory }) @@ -540,7 +540,7 @@ get /foo @shared idk whatev`) pragmas = { - http: populateHTTP({ arc, inventory }), lambdaSrcDirs + http: populateHTTP({ arc, inventory }), lambdaSrcDirs, } errors = [] populateShared({ arc, pragmas, inventory, errors }) diff --git a/test/unit/src/config/pragmas/static-test.js b/test/unit/src/config/pragmas/static-test.js index fe33a6f2..113c8796 100644 --- a/test/unit/src/config/pragmas/static-test.js +++ b/test/unit/src/config/pragmas/static-test.js @@ -160,7 +160,7 @@ test('Individual @static setting: ignore merged by plugin + userland arc', t => let _static let valid let setter = () => ({ - ignore: [ 'some-filename' ] + ignore: [ 'some-filename' ], }) /** diff --git a/test/unit/src/config/pragmas/tables-test.js b/test/unit/src/config/pragmas/tables-test.js index 8e791812..c3d956f1 100644 --- a/test/unit/src/config/pragmas/tables-test.js +++ b/test/unit/src/config/pragmas/tables-test.js @@ -308,7 +308,7 @@ test('@tables: plugin errors', t => { run([ { name: 'hello', partitionKey, partitionKeyType }, - { name: 'hello', partitionKey: 'data', partitionKeyType } + { name: 'hello', partitionKey: 'data', partitionKeyType }, ]) check(`Similarly duplicate tables errored`) diff --git a/test/unit/src/config/project/index-test.js b/test/unit/src/config/project/index-test.js index 1f56c5a6..6637615f 100644 --- a/test/unit/src/config/project/index-test.js +++ b/test/unit/src/config/project/index-test.js @@ -90,7 +90,7 @@ testing @sandbox useAWS true` tmp = mockTmp({ - [globalPrefsFile]: globalPrefs + [globalPrefsFile]: globalPrefs, }) overrideHomedir(tmp) inventory = inventoryDefaults({ cwd: process.cwd() }) @@ -163,7 +163,7 @@ test('Project plugins', t => { testing foo bar` cwd = mockTmp({ - [localPrefsFile]: localPrefs + [localPrefsFile]: localPrefs, }) inventory = inventoryDefaults({ cwd }) inventory.plugins = plugins diff --git a/test/unit/src/config/project/prefs/index-test.js b/test/unit/src/config/project/prefs/index-test.js index 51ea9fab..58864fac 100644 --- a/test/unit/src/config/project/prefs/index-test.js +++ b/test/unit/src/config/project/prefs/index-test.js @@ -76,7 +76,7 @@ testing env_var_2 bar ` let tmp = mockTmp({ - [path]: prefsText + [path]: prefsText, }) overrideHomedir(tmp) let inventory = inventoryDefaults({ cwd }) @@ -119,7 +119,7 @@ staging env_var_2 bar ` cwd = mockTmp({ - 'prefs.arc': prefsText + 'prefs.arc': prefsText, }) inventory = inventoryDefaults({ cwd }) @@ -135,11 +135,11 @@ staging */ prefs = { sandbox: { environment: 'testing' }, - env: { testing: null, staging: null, production: null } + env: { testing: null, staging: null, production: null }, } cwd = mockTmp({ '.env': '# eventually', - 'prefs.arc': prefsText + 'prefs.arc': prefsText, }) inventory = inventoryDefaults({ cwd }) errors = [] @@ -165,7 +165,7 @@ from-dotenv = lol } cwd = mockTmp({ '.env': dotenv, - 'prefs.arc': prefsText + 'prefs.arc': prefsText, }) inventory = inventoryDefaults({ cwd }) errors = [] @@ -209,7 +209,7 @@ test('Get preferences (only unknown items)', t => { userland true ` let tmp = mockTmp({ - [path]: prefsText + [path]: prefsText, }) overrideHomedir(tmp) let inventory = inventoryDefaults({ cwd }) diff --git a/test/unit/src/env/index-test.js b/test/unit/src/env/index-test.js index 4bd7aaea..48d6236e 100644 --- a/test/unit/src/env/index-test.js +++ b/test/unit/src/env/index-test.js @@ -7,13 +7,13 @@ async function awsLite () { GetParametersByPath: async () => { if (response instanceof Error) throw response return response - } + }, } } } let sut = join(process.cwd(), 'src', 'env') let getEnv = proxyquire(sut, { - '@aws-lite/client': awsLite + '@aws-lite/client': awsLite, }) let app = 'an-app' @@ -217,7 +217,7 @@ test('SSM env vars conflict with plugin env vars', t => { t.test('Partial SSM + plugin merge failure', t => { t.plan(2) inventory = newInv({ - testing: { foo: 'idk' } + testing: { foo: 'idk' }, }) response.Parameters.push( { Name: `/${app}/testing/foo`, Value: 'a' }, diff --git a/test/unit/src/lib/get-lambda-dirs-test.js b/test/unit/src/lib/get-lambda-dirs-test.js index 2b4efab5..d5a05e40 100644 --- a/test/unit/src/lib/get-lambda-dirs-test.js +++ b/test/unit/src/lib/get-lambda-dirs-test.js @@ -22,15 +22,15 @@ test('Get dirs for pragma-defined Lambdas', t => { // Just a normal Lambda dirs = getLambdaDirs( - { cwd, projSrc, type, }, - { name, }, + { cwd, projSrc, type }, + { name }, ) t.equal(Object.keys(dirs).length, 1, 'Only back a single Lambda dir') t.equal(dirs.src, join(projSrc, type, name), 'Got back the correct src dir') // A Lambda with a custom src property dirs = getLambdaDirs( - { cwd, projSrc, type, }, + { cwd, projSrc, type }, { name, customSrc: customLambdaSrc(name) }, ) t.equal(Object.keys(dirs).length, 1, 'Only back a single Lambda dir') @@ -38,7 +38,7 @@ test('Get dirs for pragma-defined Lambdas', t => { // A normal transpiled Lambda dirs = getLambdaDirs( - { cwd, projSrc, projBuild, type, }, + { cwd, projSrc, projBuild, type }, { name }, ) t.equal(Object.keys(dirs).length, 2, 'Only back two Lambda dirs') @@ -47,7 +47,7 @@ test('Get dirs for pragma-defined Lambdas', t => { // A normal transpiled Lambda with a custom src property dirs = getLambdaDirs( - { cwd, projSrc, projBuild, type, }, + { cwd, projSrc, projBuild, type }, { name, customSrc: customLambdaSrc(name) }, ) t.equal(Object.keys(dirs).length, 2, 'Only back two Lambda dirs') @@ -62,8 +62,8 @@ test('Get dirs for plugin-defined Lambdas', t => { // Just a normal plugin Lambda item = { src: customLambdaSrc(name) } dirs = getLambdaDirs( - { cwd, item, projSrc, type, }, - { name, plugin, }, + { cwd, item, projSrc, type }, + { name, plugin }, ) t.equal(Object.keys(dirs).length, 1, 'Only back a single Lambda dir') t.equal(dirs.src, join(cwd, 'whatev', name), 'Got back the correct plugin src dir') @@ -71,8 +71,8 @@ test('Get dirs for plugin-defined Lambdas', t => { // Just a normal plugin Lambda returning an absolute dir item = { src: join(__dirname, cwd, customLambdaSrc(name)) } dirs = getLambdaDirs( - { cwd, item, projSrc, type, }, - { name, plugin, }, + { cwd, item, projSrc, type }, + { name, plugin }, ) t.equal(Object.keys(dirs).length, 1, 'Only back a single Lambda dir') t.equal(dirs.src, join(__dirname, cwd, 'whatev', name), 'Got back the correct plugin src dir') @@ -80,8 +80,8 @@ test('Get dirs for plugin-defined Lambdas', t => { // A normal transpiled Lambda item = { src: customLambdaSrc(name) } dirs = getLambdaDirs( - { cwd, item, projSrc, projBuild, type, }, - { name, plugin, }, + { cwd, item, projSrc, projBuild, type }, + { name, plugin }, ) t.equal(Object.keys(dirs).length, 2, 'Only back two Lambda dirs') t.equal(dirs.src, join(cwd, 'whatev', name), 'Got back the correct plugin src dir') @@ -90,8 +90,8 @@ test('Get dirs for plugin-defined Lambdas', t => { // A normal transpiled Lambda returning an absolute dir item = { src: join(__dirname, cwd, customLambdaSrc(name)) } dirs = getLambdaDirs( - { cwd, item, projSrc, projBuild, type, }, - { name, plugin, }, + { cwd, item, projSrc, projBuild, type }, + { name, plugin }, ) t.equal(Object.keys(dirs).length, 2, 'Only back two Lambda dirs') t.equal(dirs.src, join(__dirname, cwd, 'whatev', name), 'Got back the correct plugin src dir') diff --git a/test/unit/src/lib/merge-env-vars-test.js b/test/unit/src/lib/merge-env-vars-test.js index a7eec5a6..433104ce 100644 --- a/test/unit/src/lib/merge-env-vars-test.js +++ b/test/unit/src/lib/merge-env-vars-test.js @@ -21,7 +21,7 @@ test('Do nothing', t => { let result = mergeEnvVars({ source: null, target: null, - errors + errors, }) t.deepEqual(result, null, 'No source and target envs returned empty env object') t.equal(errors.length, 0, 'No errors returned') diff --git a/test/unit/src/validate/config-test.js b/test/unit/src/validate/config-test.js index c8c20978..5dc9548f 100644 --- a/test/unit/src/validate/config-test.js +++ b/test/unit/src/validate/config-test.js @@ -22,7 +22,7 @@ let okStorage = 1024 function createPragma (memory, runtime, storage, timeout) { return [ { name, - config: { memory, runtime, storage, timeout } + config: { memory, runtime, storage, timeout }, } ] } @@ -275,7 +275,7 @@ test('Minimum timeout not met', t => { test('Maximum timeout exceeded', t => { t.plan(6) - let timeout = 1 * 60 * 15 + 1 + let timeout = (60 * 15) + 1 defaults.aws.timeout = timeout validateConfig(params, defaults, errors) diff --git a/test/unit/src/validate/layers-test.js b/test/unit/src/validate/layers-test.js index 880b1410..d4a93c9c 100644 --- a/test/unit/src/validate/layers-test.js +++ b/test/unit/src/validate/layers-test.js @@ -36,7 +36,7 @@ test('Do nothing', t => { test('Valid layer', t => { t.plan(1) defaults.aws.layers = [ - `arn:aws:lambda:${region}:123456789012:layer:layer-name:version` + `arn:aws:lambda:${region}:123456789012:layer:layer-name:version`, ] validateLayers(params, defaults, errors) t.equal(errors.length, 0, `No errors reported`) @@ -79,7 +79,7 @@ test('Too many layers', t => { test('Invalid layers', t => { t.plan(8) defaults.aws.layers = [ - `arn:aws:lambda:us-east-1:123456789012:layer:layer-name:version` + `arn:aws:lambda:us-east-1:123456789012:layer:layer-name:version`, ] validateLayers(params, defaults, errors) t.equal(errors.length, 1, `Got back an error`) @@ -87,7 +87,7 @@ test('Invalid layers', t => { reset() defaults.aws.layers = [ - `arn:aws:lambda:${region}:123456789012:layer` + `arn:aws:lambda:${region}:123456789012:layer`, ] validateLayers(params, defaults, errors) t.equal(errors.length, 1, `Got back an error`) @@ -102,7 +102,7 @@ test('Invalid layers', t => { defaults.aws.layers = [ `arn:aws:lambda:${region}:123456789012:layer`, - true + true, ] let layers = defaults.aws.layers validateLayers(params, defaults, errors)