Merge pull request #26 from Mixeway/v135FixingScripts

V135 fixing scripts

Author: siewer

MixewayBackend

@@ -1,3 +1,7 @@
+## 1.3.5 (2020-11-26)
+#### Bug Fixes
+* Fixing CI Script to fit newest version of MixewayBackend
+
 <a name="1.3.4"></a>
 ## 1.3.4 (2020-09-02)
 

releasenote.md

@@ -66,16 +66,23 @@ while [ $# -gt 0 ]; do
 done
 get_commit_id() {
   COMMITID=$(git rev-parse HEAD)
+  group_name=$(git remote get-url origin | xargs basename -s .git)
+  app_name=$(git remote get-url origin | xargs basename -s .git)
   echo "CommitID: $COMMITID"
 }
+
 get_repo_url() {
   REPO_URL=$(cat .git/config | grep "url = " | sed -E 's/\/\/(.*:.*@)/\/\//g' | gsed -E 's\url = \\g' |xargs)
   echo "REPO_URL: $REPO_URL"
 }
 #CHANGEIT
 run_sast() {
+  BODY='{"scope":"opensource","repoUrl":"'$REPO_URL'","branch":"'$branch'","repoName":"'$app_name'"}'
+  MIXEWAY_GET_INFO_RESPONSE=$(curl --request POST --url $mixeway_url/v2/api/cicd/getscannerinfo --header 'apikey: '"$mixeway_api_key"'' --header 'content-type: application/json' -d $BODY -k -s)
+  MIXEWAY_PROJECT_ID=$(echo $MIXEWAY_GET_INFO_RESPONSE | jq '.codeProjectId')
   echo "Request for a SAST"
-  curl -k -s --request PUT --url $mixeway_url/v2/api/cicd/project/$mixeway_project_id/code/scan/$group_name/$app_name/$COMMITID --header 'apikey: '"$mixeway_api_key"'' --output /dev/null
+  RUN_SCAN_RESPONSE=$(curl -k -s --request GET --url $mixeway_url/v2/api/cicd/sast/performscan/codeproject/$MIXEWAY_PROJECT_ID --header 'apikey: '"$mixeway_api_key"'')
+  echo $RUN_SCAN_RESPONSE
 }
 send_bom() {
   POSTDATA="{\"project\":\"$OS_ID\",\"bom\":\"$BOM\"}"
@@ -191,8 +198,8 @@ verify() {
 }
 if [ ! -z "$branch" ] && [ ! -z "$TECH" ] && [ -d .git ]; then
   verify_mixeway_data
-  get_commit_id
   get_repo_url
+  get_commit_id
   if [ $skip_sast = "false" ]; then
     run_sast
   fi