Skip to content

Commit

Permalink
fix: pass system log to runCoreSteps (#4429)
Browse files Browse the repository at this point in the history
* fix: pass system log to runCoreSteps

* fix: disable eslint max-lines
  • Loading branch information
khendrikse committed Aug 12, 2022
1 parent 1337b1b commit 9a42605
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Expand Up @@ -4,7 +4,7 @@ module.exports = {
extends: ['plugin:fp/recommended', '@netlify/eslint-config-node/.eslintrc_esm.cjs'],
rules: {
strict: 2,

'max-lines': 'off',
// eslint-plugin-ava needs to know where test files are located
'ava/no-ignored-test-files': [
2,
Expand Down
4 changes: 2 additions & 2 deletions packages/build/src/core/main.js
@@ -1,4 +1,4 @@
/* eslint-disable max-lines, import/max-dependencies */
/* eslint-disable import/max-dependencies */
import { handleBuildError } from '../error/handle.js'
import { getErrorInfo } from '../error/info.js'
import { startErrorMonitor } from '../error/monitor/start.js'
Expand Down Expand Up @@ -700,4 +700,4 @@ const telemetryReport = async function ({
await handleBuildError(error, errorParams)
}
}
/* eslint-enable max-lines, import/max-dependencies */
/* eslint-enable import/max-dependencies */
8 changes: 7 additions & 1 deletion packages/build/src/steps/run_core_steps.js
Expand Up @@ -5,7 +5,7 @@ import { getSeverity } from '../core/severity.js'
import { handleBuildError } from '../error/handle.js'
import { getErrorInfo } from '../error/info.js'
import { startErrorMonitor } from '../error/monitor/start.js'
import { getBufferLogs } from '../log/logger.js'
import { getBufferLogs, getSystemLogger } from '../log/logger.js'
import { logBuildStart } from '../log/messages/core.js'
import { reportStatuses } from '../status/report.js'

Expand Down Expand Up @@ -39,6 +39,7 @@ import { runSteps } from './run_steps.js'
export const runCoreSteps = async (buildSteps, flags = {}) => {
const { errorMonitor, mode, logs, debug, ...flagsA } = startBuild(flags)
const errorParams = { errorMonitor, mode, logs, debug }
const systemLog = getSystemLogger(logs, debug)

try {
const { netlifyConfig: netlifyConfigA, configMutations } = await executeBuildStep({
Expand All @@ -49,6 +50,7 @@ export const runCoreSteps = async (buildSteps, flags = {}) => {
debug,
errorParams,
buildSteps,
systemLog,
})
const { success, severityCode } = getSeverity('success')

Expand Down Expand Up @@ -93,6 +95,7 @@ const executeBuildStep = async function ({
featureFlags,
buildSteps,
repositoryRoot,
systemLog,
}) {
const configOpts = getConfigOpts({
config,
Expand Down Expand Up @@ -140,6 +143,7 @@ const executeBuildStep = async function ({
childEnv,
buildSteps,
repositoryRoot: repositoryRootA,
systemLog,
})

return {
Expand Down Expand Up @@ -175,6 +179,7 @@ const runBuildStep = async function ({
childEnv,
buildSteps,
repositoryRoot,
systemLog,
}) {
const { netlifyConfig: netlifyConfigA, configMutations } = await runSteps({
steps: getBuildSteps(buildSteps),
Expand All @@ -188,6 +193,7 @@ const runBuildStep = async function ({
featureFlags,
childEnv,
repositoryRoot,
systemLog,
})

return { netlifyConfig: netlifyConfigA, configMutations }
Expand Down
2 changes: 0 additions & 2 deletions packages/build/src/steps/run_step.js
@@ -1,4 +1,3 @@
/* eslint-disable max-lines */
import { addMutableConstants } from '../core/constants.js'
import { logStepStart } from '../log/messages/steps.js'
import { runsAlsoOnBuildFailure, runsOnlyOnBuildFailure } from '../plugins/events.js'
Expand Down Expand Up @@ -303,4 +302,3 @@ const tFireStep = function ({
verbose,
})
}
/* eslint-enable max-lines */
2 changes: 0 additions & 2 deletions packages/build/src/steps/run_steps.js
@@ -1,4 +1,3 @@
/* eslint-disable max-lines */
import pReduce from 'p-reduce'

import { addErrorInfo } from '../error/info.js'
Expand Down Expand Up @@ -178,4 +177,3 @@ export const runSteps = async function ({
configMutations: configMutationsB,
}
}
/* eslint-enable max-lines */
3 changes: 0 additions & 3 deletions packages/config/src/bin/flags.js
@@ -1,5 +1,3 @@
/* eslint-disable max-lines */

import process from 'process'

import filterObj from 'filter-obj'
Expand Down Expand Up @@ -181,4 +179,3 @@ const isUserFlag = function (key, value) {
}

const INTERNAL_KEYS = new Set(['help', 'version', '_', '$0'])
/* eslint-enable max-lines */
2 changes: 0 additions & 2 deletions packages/config/src/main.js
@@ -1,4 +1,3 @@
/* eslint-disable max-lines */
import { getApiClient } from './api/client.js'
import { getSiteInfo } from './api/site_info.js'
import { getInitialBase, getBase, addBase } from './base.js'
Expand Down Expand Up @@ -284,4 +283,3 @@ const resolveFiles = async function ({ config, repositoryRoot, base, baseRelDir
const configB = addBase(configA, baseA)
return { config: configB, buildDir, base: baseA }
}
/* eslint-enable max-lines */
3 changes: 0 additions & 3 deletions packages/config/src/validate/validations.js
@@ -1,5 +1,3 @@
/* eslint-disable max-lines */

import CronParser from 'cron-parser'
import isPlainObj from 'is-plain-obj'
import validateNpmPackageName from 'validate-npm-package-name'
Expand Down Expand Up @@ -289,4 +287,3 @@ export const POST_NORMALIZE_VALIDATIONS = [
example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
},
]
/* eslint-enable max-lines */

0 comments on commit 9a42605

Please sign in to comment.