feat(OX-5077) added support for partial flag

ox-eye · Jan 7, 2024 · b6a6d05 · b6a6d05
1 parent dc88f59
commit b6a6d05
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/images/entrypoint-oxeye-scan.sh b/images/entrypoint-oxeye-scan.sh
@@ -14,10 +14,7 @@ secret=$4
 workspace_id=$5
 release=$6
 excludes=$7
-
-if [ -z $release ]; then
-    release="release"
-fi
+partial=$8
 
 # Get Bearer ToKen
 bearerToken=$(curl -s -X POST --location "https://${host}/api/auth/api-token" \
@@ -57,4 +54,24 @@ curl -s -o /app/scm_scan.py --location "https://${host}/api/scm/script?provider=
 --header "Authorization: Bearer ${bearerToken}"
 
 # RUN SCM Scan Script
-python /app/scm_scan.py --host $host --repo-token $token --client-id $client_id --secret $secret --workspace-id $workspace_id --release $release --excludes "$excludes"
+default_flags="--host $host 
+    --repo-token $token
+    --client-id $client_id
+    --secret $secret
+    --workspace-id $workspace_id"
+
+scm_scan_flags=$default_flags
+
+if [ -n "$release" ]; then
+    scm_scan_flags="$scm_scan_flags --release $release"
+fi
+
+if [ -n "$excludes" ]; then
+    scm_scan_flags="$scm_scan_flags --excludes $excludes"
+fi
+
+if [ "$partial" == "true" ]; then
+    scm_scan_flags="$scm_scan_flags --partial"
+fi
+
+python /app/scm_scan.py $scm_scan_flags
diff --git a/images/requirements.txt b/images/requirements.txt
@@ -1,5 +1,3 @@
-logging==0.4.9.6
 requests==2.31.0
-uuid==1.30
 pydantic==2.4.2
 gitpython==3.1.40
diff --git a/oxeye-scan/action.yaml b/oxeye-scan/action.yaml
@@ -24,6 +24,10 @@ inputs:
   excludes:
     description: List of directores to be excluded from scan
     required: false
+  partial:
+    description: Scan only changes
+    required: false
+    default: 'false'
 runs:
   using: docker
   image: docker://ghcr.io/ox-eye/github-actions/oxeye-scan:v0.0.23
@@ -35,3 +39,4 @@ runs:
     - ${{ inputs.workspace-id }}
     - ${{ inputs.release }}
     - ${{ inputs.excludes }}
+    - ${{ inputs.partial }}
diff --git a/oxeye-scan/gitlab-ci.yml b/oxeye-scan/gitlab-ci.yml
@@ -8,6 +8,7 @@ variables:
   OXEYE_SCAN_WORKSPACE_ID: ''
   OXEYE_SCAN_RELEASE: ''
   OXEYE_SCAN_EXCLUDES: ''
+  OXEYE_SCAN_PARTIAL: 'false'
 oxeye_code_scan:
   stage: oxeye_code_scan
   image:
@@ -16,4 +17,4 @@ oxeye_code_scan:
       - /bin/sh
       - '-c'
   script:
-    - /entrypoint.sh ${OXEYE_SCAN_GITLAB_TOKEN} ${OXEYE_SCAN_OXEYE_URL} ${OXEYE_SCAN_CLIENT_ID} ${OXEYE_SCAN_SECRET} ${OXEYE_SCAN_WORKSPACE_ID} "${OXEYE_SCAN_RELEASE}" "${OXEYE_SCAN_EXCLUDES}"
+    - /entrypoint.sh ${OXEYE_SCAN_GITLAB_TOKEN} ${OXEYE_SCAN_OXEYE_URL} ${OXEYE_SCAN_CLIENT_ID} ${OXEYE_SCAN_SECRET} ${OXEYE_SCAN_WORKSPACE_ID} "${OXEYE_SCAN_RELEASE}" "${OXEYE_SCAN_EXCLUDES}" "${OXEYE_SCAN_PARTIAL}"