Merge branch 'main' of github.com:codefresh-io/csdp-report-image

Author: denis-codefresh

action.yaml

@@ -1,52 +1,64 @@
 name: 'csdp-report-image'
 description: 'Report image to csdp'
 inputs:
-  inputs:
-    CF_IMAGE:
-      required: true
-      type: string
-    CONTAINER_REGISTRY_INTEGRATION:
-      required: false
-      type: string
-    CF_ENRICHERS:
-      required: false
-      type: string
-    CF_INSECURE:
-      required: false
-      type: string
-    CF_WORKFLOW_URL:
-      required: false
-      type: string
-    CF_LOGS_URL:
-      required: false
-      type: string
-    CF_GIT_BRANCH:
-      required: false
-      type: string
-    CF_GIT_SHA:
-      required: false
-      type: string
-    CF_GIT_REPO:
-      required: false
-      type: string
-    CF_GIT_INTEGRATION:
-      required: false
-      type: string
-    CF_JIRA_PROJECT_PREFIX:
-      required: false
-      type: string
-    CF_JIRA_MESSAGE:
-      required: false
-      type: string
-    CF_JIRA_INTEGRATION:
-      required: false
-      type: string
-    CF_JIRA_FAIL_ON_NOT_FOUND:
-      required: false
-      type: string
-    secrets:
-      CF_API_KEY:
-        required: true
+  VERSION:
+    description: specify client version
+    required: false
+    default: 0.0.21
+  CF_IMAGE:
+    description: image reported, quay.io/codefresh/newly-built-image:0.0.1
+    required: true
+  CF_HOST:
+    description: "cluster address address: https://g.codefresh.io"
+    required: false
+  CF_VERBOSE:
+    description: "verbose output"
+    required: false
+  CONTAINER_REGISTRY_INTEGRATION:
+    required: false
+    description: list of enrichers separated by commas
+  CF_ENRICHERS:
+    required: false
+    description: "list of integrations separated by commas: jira, github"
+  CF_INSECURE:
+    required: false
+    description: "security flag for standard registry protocol, when set to true it enables http protocol"
+  CF_WORKFLOW_URL:
+    required: false
+    description: "external url for the workflow"
+  CF_LOGS_URL:
+    required: false
+    description: "external url for the logs"
+  CF_GIT_BRANCH:
+    required: false
+    description: "The git branch to use to enrich"
+  CF_GIT_SHA:
+    required: false
+    description: "The git SHA to use to enrich"
+  CF_GIT_REPO:
+    required: false
+    description: "The GitHub repo to use to enrich"
+  CF_GIT_INTEGRATION:
+    required: false
+    description: "The integration key"
+  CF_JIRA_PROJECT_PREFIX:
+    required: false
+    description: "Jira project prefix"
+  CF_JIRA_MESSAGE:
+    required: false
+    description: "String that contains PREFIX-ISSUE_ID"
+  CF_JIRA_INTEGRATION:
+    required: false
+    description: "The integration key"
+  CF_JIRA_FAIL_ON_NOT_FOUND:
+    required: false
+    description: "fail in case of ticket not found"
+  CF_API_KEY:
+    description: "Codefresh API KEY"
+    required: true
 runs:
-  using: 'docker'
-  image: 'safficodefresh/csdp-report-image:latest'
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        docker run --env-file=cf_env quay.io/codefresh/csdp-report-image:$INPUT_VERSION

service.yaml

@@ -1,2 +1,2 @@
 name: csdp-report-image
-version: 0.0.14
+version: 0.0.21

src/validate.ts

@@ -2,7 +2,7 @@
  * Validate mandatory env vars. address host default
  */
 export function validate(payload: Record<string, string|undefined>): Record<string, string|undefined> {
-    const filtered = filterEnvVarPattern(payload)
+    const filtered = { ...filterEnvVarPattern(payload), ...filterGitActionsEnvVarInputPattern(payload) }
     const messages: string[] = []
     if (!filtered['CF_API_KEY']) {
         messages.push(`CF_API_KEY must be provided as environment variable.`)
@@ -30,3 +30,17 @@ function filterEnvVarPattern(env: Record<string, string|undefined>): Record<stri
             return obj
         }, {})
 }
+
+/**
+ * Filter git actions env for codefresh vars prefix
+ * @param env
+ */
+function filterGitActionsEnvVarInputPattern(env: Record<string, string|undefined>): Record<string, string|undefined> {
+    const from = 'INPUT_'.length
+    return Object.keys(env)
+        .filter(key => (/^INPUT_CF_[A-Z_]+$/.test(key)))
+        .reduce((obj, key) => {
+            obj[key.slice(from)] = env[key]
+            return obj
+        }, {})
+}