Skip to content

Commit 3b9adcb

Browse files
CR
1 parent 496e5f6 commit 3b9adcb

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

src/index.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ async function main(): Promise<void> {
1111
if (verbose) {
1212
console.debug('Running with verbose log')
1313
}
14-
const payload = validate()
14+
const payload = validate(process.env)
1515
const { url, headers } = buildUrlHeaders(payload, encodeURIComponent)
1616
if (verbose) {
1717
console.debug(`Payload: ${JSON.stringify(payload, null, 2)}`)
@@ -30,14 +30,7 @@ async function main(): Promise<void> {
3030
})
3131
eventSource.addEventListener('error', (err) => {
3232
eventSource.close()
33-
if (err.data) {
34-
const { error, parameters } = JSON.parse(err.data)
35-
const message = `Error:\t${error.name}: ${error.message}, parameters provided: ${Object.keys(parameters)}`
36-
console.error(message)
37-
reject(new Error(message))
38-
} else {
39-
reject(err)
40-
}
33+
reject(err)
4134
})
4235
eventSource.addEventListener('end', (ev) => {
4336
eventSource.close()
@@ -49,6 +42,11 @@ async function main(): Promise<void> {
4942

5043
main().then(() => { return }).catch((error) => {
5144
console.error(error)
45+
if (error.type=='error' && error.status===500) {
46+
const tokenStart = (process.env['CF_API_KEY'] || '').slice(0, 6)
47+
const tokenEnd = (process.env['CF_API_KEY'] || '').slice(-6)
48+
console.info(`Error 500 are usually caused by providing an invalid CF_API_KEY, please check that the validity of the provided codefresh api token ${tokenStart}..${tokenEnd}`)
49+
}
5250
// Catchall for general errors
5351
process.exit(1)
5452
}

src/validate.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
/**
22
* Validate mandatory env vars. address host default
33
*/
4-
export function validate(): Record<string, string|undefined> {
5-
const payload = filterEnvVarPattern(process.env)
6-
if (!payload['CF_API_KEY']) {
7-
const message = `CF_API_KEY must be provided as environment variable.`
8-
console.error(message)
9-
throw new Error(message)
4+
export function validate(payload: Record<string, string|undefined>): Record<string, string|undefined> {
5+
const filtered = filterEnvVarPattern(payload)
6+
const messages: string[] = []
7+
if (!filtered['CF_API_KEY']) {
8+
messages.push(`CF_API_KEY must be provided as environment variable.`)
109
}
11-
if (!payload['CF_IMAGE']) {
12-
const message = `CF_IMAGE must be provided as environment variable.`
13-
console.error(message)
14-
throw new Error(message)
10+
if (!filtered['CF_IMAGE']) {
11+
messages.push(`CF_IMAGE must be provided as environment variable.`)
1512
}
16-
payload['CF_HOST'] = payload['CF_HOST'] || 'g.codefresh.io'
13+
if (messages.length>0) {
14+
console.error()
15+
throw new Error(`Validation Error: ${JSON.stringify(messages)}`)
16+
}
17+
filtered['CF_HOST'] = filtered['CF_HOST'] || 'g.codefresh.io'
1718

18-
return payload
19+
return filtered
1920
}
2021

2122
/**

0 commit comments

Comments
 (0)