TEST

Author: eti-codefresh

src/__tests__/validate.spec.ts

@@ -6,14 +6,13 @@ describe('client report-image validation', () => {
         try {
             validate({ ENV1: '1', someVal: 'ignored' })
         } catch (error) {
-            expect(error.message).toBe(`Validation Error: ["CF_API_KEY must be provided as environment variable.",` +
-                `"CF_IMAGE must be provided as environment variable.",`+
-                `"CF_HOST must be provided as app-proxy http/s address TEST2"]`)
+            const expectedErrorMsg = 'Validation Error: ["CF_API_KEY must be provided as environment variable.","CF_IMAGE must be provided as environment variable.","CF_RUNTIME_NAME must be provided as environment variable."]'
+            expect(error.message).toBe(expectedErrorMsg)
             return
         }
         fail(`should have thrown Validation Error`)
     })
-    it('All OK', async () => {
+    it('All OK', async () => { //todo: change tests
         let res
         try {
             res = validate({ CF_API_KEY: '1', alsoIgnored: 'ignored', IGNORED: 'ignored too', CF_IMAGE: 'testImage', CF_HOST: `host.io` })

src/validate.ts

@@ -12,8 +12,14 @@ export function validate(payload: Record<string, string|undefined>): Record<stri
     if (!filtered['CF_IMAGE']) {
         messages.push(`CF_IMAGE must be provided as environment variable.`)
     }
-    if (!filtered['CF_HOST']) {
-        messages.push(`CF_HOST must be provided as app-proxy http/s address TEST2`)
+    // if (!filtered['CF_HOST']) {
+    //     messages.push(`CF_HOST must be provided as app-proxy http/s address TEST2`)
+    // }
+    if (!filtered['CF_RUNTIME_NAME'] && !filtered['CF_HOST'] ) {
+        messages.push(`CF_RUNTIME_NAME must be provided as environment variable.`)
+    }
+    if (filtered['CF_RUNTIME_NAME'] && filtered['CF_HOST'] ) {
+        messages.push(`you can only specify CF_RUNTIME_NAME or CF_HOST. please delete one of them.`)
     }
     if (messages.length > 0) {
         throw new errors.ValidationError(`Validation Error: ${JSON.stringify(messages)}`)