other (#24)

* log calling url if provided &  fix test.

Co-authored-by: saffi <[email protected]>

Author: zarbis

action.yaml

@@ -4,7 +4,7 @@ inputs:
   VERSION:
     description: specify client version
     required: false
-    default: 0.0.28
+    default: 0.0.29
   CF_API_KEY:
     description: "Codefresh API KEY"
     required: true
@@ -126,6 +126,8 @@ runs:
         CF_JIRA_INTEGRATION: ${{ inputs.CF_JIRA_INTEGRATION }}
         CF_JIRA_FAIL_ON_NOT_FOUND: ${{ inputs.CF_JIRA_FAIL_ON_NOT_FOUND }}
       run: |
+        CF_WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
         env>cf_env
-        echo 'CF_CI_TYPE="github-actions"' >> cf_env
+        echo 'CF_CI_TYPE=github-actions' >> cf_env
+        echo "CF_WORKFLOW_URL=$CF_WORKFLOW_URL" >> cf_env
         docker run --env-file=cf_env quay.io/codefresh/csdp-report-image:$VERSION

service.yaml

@@ -1,2 +1,2 @@
 name: csdp-report-image
-version: 0.0.28
+version: 0.0.29

src/__tests__/validate.spec.ts

@@ -6,7 +6,9 @@ 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."]`)
+            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"]`)
             return
         }
         fail(`should have thrown Validation Error`)
@@ -24,17 +26,4 @@ describe('client report-image validation', () => {
             'CF_IMAGE': 'testImage'
         })
     })
-    it('default CF_HOST', async () => {
-        let res
-        try {
-            res = validate({ CF_API_KEY: '1', alsoIgnored: 'ignored', IGNORED: 'ignored too', CF_IMAGE: 'testImage' })
-        } catch (error) {
-            fail(`should have not thrown an error ${JSON.stringify(error)}`)
-        }
-        expect(res).toEqual({
-            'CF_API_KEY': '1',
-            'CF_HOST': 'g.codefresh.io',
-            'CF_IMAGE': 'testImage'
-        })
-    })
 })

src/index.ts

@@ -17,6 +17,9 @@ async function main(): Promise<void> {
         console.debug(`Payload: ${JSON.stringify(payload, null, 2)}`)
         console.debug(`Sending request: ${url}, headers: ${JSON.stringify(headers)}`)
     }
+    if (payload['CF_CI_TYPE'] && payload['CF_WORKFLOW_URL']) {
+        console.info(`Running ${payload['CF_CI_TYPE']} URL: ${payload['CF_WORKFLOW_URL']}`)
+    }
     const waitFor = new Promise((resolve, reject) => {
         const eventSource = new EventSource(url, { headers })
         eventSource.addEventListener('report', function (event) {

src/validate.ts

@@ -10,10 +10,12 @@ 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`)
+    }
     if (messages.length>0) {
         throw new Error(`Validation Error: ${JSON.stringify(messages)}`)
     }
-    filtered['CF_HOST'] = filtered['CF_HOST'] || 'g.codefresh.io'
 
     return filtered
 }