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

Jump to bottom

Update to matches latest submit vars; check 'WORK_SUBMIT_HAS_QA_EXCEPTIONS' and fix 'answerData' parse in empty case #145

Merged
merged 5 commits into from
Oct 30, 2023
Merged

Update to matches latest submit vars; check 'WORK_SUBMIT_HAS_QA_EXCEPTIONS' and fix 'answerData' parse in empty case #145

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d5212f
WORK_SUBMIT_HAS_QA_EXCEPTIONS
zanerock Oct 30, 2023
47f6958
Update to matches latest submit vars; check 'WORK_SUBMIT_HAS_QA_EXCEP…
zanerock Oct 30, 2023
635e557
Merge branch 'work-liquid-labs/liq-work/144' of github.com:zanerock/l…
zanerock Oct 30, 2023
da727b1
Save QA files.
zanerock Oct 30, 2023
254a068
removed QA files
zanerock Oct 30, 2023
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
18 changes: 13 additions & 5 deletions src/handlers/work/_lib/submit-lib.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { existsSync } from 'node:fs'
import * as fsPath from 'node:path'

import createError from 'http-errors'

import { determineOriginAndMain, verifyBranchInSync, verifyClean } from '@liquid-labs/git-toolkit'
Expand Down Expand Up @@ -84,7 +87,7 @@ const doSubmit = async({ all, app, cache, projects, reporter, req, res, workKey
return {}
}

const controlsSpec = app.ext.integrations.callHook({
const controlsSpec = await app.ext.integrations.callHook({
providerFor : 'controls',
hook : 'getQuestionControls',
hookArgs : { app, controlsName : 'work-submit', projectName, reporter }
Expand All @@ -109,8 +112,9 @@ const doSubmit = async({ all, app, cache, projects, reporter, req, res, workKey

if (noQA === true) {
// 'NONE' is a reserved word that evaluations to 0
env.CHANGES_UNIT_TEST_REPORT_URL = 'TEST SKIPPED'
env.CHANGES_LINT_REPORT_URL = 'LINT SKIPPED'
env.WORK_SUBMIT_UNIT_TEST_REPORT_URL = 'TEST SKIPPED'
env.WORK_SUBMIT_LINT_REPORT_URL = 'LINT SKIPPED'
env.WORK_SUBMIT_HAS_QA_EXCEPTIONS = false
}
else {
const qaFileLinkIndex = await app.ext.integrations.callHook({
Expand All @@ -122,9 +126,12 @@ const doSubmit = async({ all, app, cache, projects, reporter, req, res, workKey

for (const qaFile of Object.keys(qaFileLinkIndex)) {
const { fileType, url } = qaFileLinkIndex[qaFile]
const urlParam = 'CHANGES_' + fileType.replaceAll(/ /g, '_').toUpperCase() + '_REPORT_URL'
const urlParam = 'WORK_SUBMIT_' + fileType.replaceAll(/ /g, '_').toUpperCase() + '_REPORT_URL'
env[urlParam] = url
}

const unitTestPassedMarkerPath = fsPath.join(projectPath, 'qa', '.unit-test.passed')
env.WORK_SUBMIT_HAS_QA_EXCEPTIONS = !existsSync(unitTestPassedMarkerPath)
}

return questionBundle
Expand All @@ -141,7 +148,8 @@ const doSubmit = async({ all, app, cache, projects, reporter, req, res, workKey
}
// else, there are no questions to ask, let's move on
} // if (answers === undefined); else:
const answerData = JSON.parse(answers || '{}')

const answerData = JSON.parse(answers || '[]')
for (const { name: projectFQN } of projects) {
if (!answerData.some((a) => a.key === projectFQN)) {
throw createError.BadRequest(`Missing attestation results (qna answers) for project '${projectFQN}'.`)
Expand Down