Merge pull request #21 from gitbito/release/1.2.9

exclude branches property added in bash script

Author: rishabhbohra-bito

cra-scripts/bito-cra.properties

@@ -14,3 +14,4 @@ dependency_check.snyk_auth_token=
 review_comments=2
 server_port=10051
 cra_version=latest
+exclude_branches=

cra-scripts/bito-cra.ps1

@@ -355,6 +355,7 @@ $optional_params_cli = @(
     "static_analysis",
     "static_analysis_tool",
     "review_scope",
+    "exclude_branches",
     "dependency_check",
     "dependency_check.snyk_auth_token",
     "cra_version",
@@ -379,6 +380,7 @@ $optional_params_server = @(
     "static_analysis",
     "static_analysis_tool",
     "review_scope",
+    "exclude_branches",
     "dependency_check",
     "dependency_check.snyk_auth_token",
     "server_port",
@@ -423,6 +425,7 @@ $mode = "cli"
 $param_mode = "mode"
 $server_port = "10051"
 $param_server_port = "server_port"
+$command = "review"
 $docker_cmd = ""
 # handle if CRA is starting in server mode using start command.
 if ($force_mode) {
@@ -454,7 +457,7 @@ foreach ($param in $required_params) {
 foreach ($param in $optional_params) {
     if ($param -eq "dependency_check.snyk_auth_token" -and $props["dependency_check"] -eq "True") {
         Ask-For-Param $param $false
-    } elseif ($param -ne "dependency_check.snyk_auth_token" -and $param -ne "env" -and $param -ne "cli_path" -and $param -ne "output_path" -and $param -ne "static_analysis_tool" -and $param -ne "git.domain" -and $param -ne "review_scope") {
+    } elseif ($param -ne "dependency_check.snyk_auth_token" -and $param -ne "env" -and $param -ne "cli_path" -and $param -ne "output_path" -and $param -ne "static_analysis_tool" -and $param -ne "git.domain" -and $param -ne "review_scope" -and $param -ne "exclude_branches") {
         Ask-For-Param $param $false
     }
 }
@@ -471,7 +474,7 @@ foreach ($param in $required_params + $bee_params + $optional_params) {
         } elseif ($param -eq "pr_url") {
             $trimmedUrl = $props[$param].Trim()
             Validate-Url $trimmedUrl
-            $docker_cmd += " --$param=$($trimmedUrl) review"
+            $docker_cmd += " --$param=$($trimmedUrl) --command=$($command) rest"
         } elseif ($param -eq "git.provider") {
             $validated_gitprovider = Validate-GitProvider $props[$param]
             $docker_cmd += " --$param=$validated_gitprovider"
@@ -483,6 +486,8 @@ foreach ($param in $required_params + $bee_params + $optional_params) {
         } elseif ($param -eq "review_scope") {
             $scopes = $($props[$param]) -replace ',\s*', ','
             $docker_cmd += " --$param='[$scopes]'"
+        } elseif ($param -eq "exclude_branches") {
+            $docker_cmd += " --exclude_branches=$($props[$param])"
         } elseif ($param -eq "dependency_check") {
             $validated_boolean = Validate-Boolean $props[$param]
             $docker_cmd += " --dependency_check.enabled=$validated_boolean"

cra-scripts/bito-cra.sh

@@ -372,6 +372,7 @@ optional_params_cli=(
   "static_analysis"
   "static_analysis_tool"
   "review_scope"
+  "exclude_branches"
   "dependency_check"
   "dependency_check.snyk_auth_token"
   "cra_version"
@@ -396,6 +397,7 @@ optional_params_server=(
   "static_analysis"
   "static_analysis_tool"
   "review_scope"
+  "exclude_branches"
   "dependency_check"
   "dependency_check.snyk_auth_token"
   "server_port"
@@ -434,6 +436,7 @@ required_params=("${required_params_cli[@]}")
 optional_params=("${optional_params_cli[@]}")
 mode="cli"
 param_mode="mode"
+command="review"
 docker_cmd=""
 #handle if CRA is starting in server mode using start command.
 if [ -n "$force_mode" ]; then
@@ -465,7 +468,7 @@ done
 for param in "${optional_params[@]}"; do
   if [ "$param" == "dependency_check.snyk_auth_token" ] && [ "${props["dependency_check"]}" == "True" ]; then
       ask_for_param "$param" "False"
-  elif [ "$param" != "dependency_check.snyk_auth_token" ] && [ "$param" != "env" ] && [ "$param" != "cli_path" ] && [ "$param" != "output_path" ] && [ "$param" != "static_analysis_tool" ] && [ "$param" != "git.domain" ] && [ "$param" != "review_scope" ]; then
+  elif [ "$param" != "dependency_check.snyk_auth_token" ] && [ "$param" != "env" ] && [ "$param" != "cli_path" ] && [ "$param" != "output_path" ] && [ "$param" != "static_analysis_tool" ] && [ "$param" != "git.domain" ] && [ "$param" != "review_scope" ] && [ "$param" != "exclude_branches" ]; then
       ask_for_param "$param" "False"
   fi
 done
@@ -486,7 +489,7 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
         #validate the URL
         trimmed_url=$(echo "${props[$param]}" | sed 's/^[ \t]*//;s/[ \t]*$//')
         validate_url $trimmed_url
-        docker_cmd+=" --$param=${trimmed_url} review"
+        docker_cmd+=" --$param=${trimmed_url} --command='${command}' rest"
     elif [ "$param" == "git.provider" ]; then
         #validate the URL
         props[$param]=$(validate_git_provider "${props[$param]}")
@@ -500,6 +503,8 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
     elif [ "$param" == "review_scope" ]; then
         scopes=$(echo ${props[$param]} | sed 's/, */,/g')
         docker_cmd+=" --review_scope='[$scopes]'"
+    elif [ "$param" == "exclude_branches" ]; then
+        docker_cmd+=" --exclude_branches=${props[$param]}"
     elif [ "$param" == "dependency_check" ]; then
         #validate the dependency check boolean value
         props[$param]=$(validate_boolean "${props[$param]}")