Merge pull request #13 from gitbito/release/1.1.9

Update bito-cra.sh

Author: rishabhbohra-bito

cra-scripts/bito-cra.properties

@@ -6,7 +6,10 @@ git.provider=
 git.access_token=
 git.domain=
 static_analysis=True
+static_analysis_tool=fb_infer,astral_ruff,mypy
 dependency_check=False
+code_context=True
 dependency_check.snyk_auth_token=
+review_comments=2
 server_port=10051
 cra_version=latest

cra-scripts/bito-cra.ps1

@@ -93,6 +93,25 @@ function Validate-Env {
     }
 }
 
+# Function to validate a review_comments vallue i.e. 1 mapped to "FULLPOST" or 2 mapped to "INLINE"
+function Validate-ReviewComments {
+    param($reviewcomments_val)
+
+    # Check if the provided value is either "1" or "2"
+    if ($reviewcomments_val -ne "1" -and $reviewcomments_val -ne "2") {
+        Write-Host "Invalid review comments value. Please enter either 1 or 2."
+        exit 1
+    }
+
+    if ($reviewcomments_val -eq "1") {
+        return "FULLPOST"
+    }
+
+    if ($reviewcomments_val -eq "2") {
+        return "INLINE"
+    }
+}
+
 # Function to display URL using IP address and port
 # Run docker ps -l command and store the output
 function Display-DockerUrl {
@@ -332,14 +351,17 @@ $required_params_cli = @(
 )
 
 $optional_params_cli = @(
+    "review_comments",
     "static_analysis",
+    "static_analysis_tool",
     "dependency_check",
     "dependency_check.snyk_auth_token",
     "cra_version",
     "env",
     "cli_path",
     "output_path"
     "git.domain"
+    "code_context"
 )
 
 # Parameters that are required/optional in mode server
@@ -352,14 +374,17 @@ $optional_params_server = @(
     "git.provider",
     "git.access_token",
     "bito_cli.bito.access_key",
+    "review_comments",
     "static_analysis",
+    "static_analysis_tool",
     "dependency_check",
     "dependency_check.snyk_auth_token",
     "server_port",
     "cra_version"
     "env"
     "cli_path"
     "git.domain"
+    "code_context"
 )
 
 $bee_params = @(
@@ -427,7 +452,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 "git.domain") {
+    } 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") {
         Ask-For-Param $param $false
     }
 }
@@ -451,12 +476,18 @@ foreach ($param in $required_params + $bee_params + $optional_params) {
         } elseif ($param -eq "static_analysis") {
             $validated_boolean = Validate-Boolean $props[$param]
             $docker_cmd += " --static_analysis.fb_infer.enabled=$validated_boolean"
+        } elseif ($param -eq "static_analysis_tool") {
+            $docker_cmd += " --$param=$($props[$param])"
         } elseif ($param -eq "dependency_check") {
             $validated_boolean = Validate-Boolean $props[$param]
             $docker_cmd += " --dependency_check.enabled=$validated_boolean"
         } elseif ($param -eq "code_feedback") {
             $validated_boolean = Validate-Boolean $props[$param]
             $docker_cmd += " --$param=$validated_boolean"
+        } elseif ($param -eq "code_context") {
+            #validate the code context boolean value
+            $validated_boolean = Validate-Boolean $props[$param]
+            $docker_cmd += " --$param=$validated_boolean"
         } elseif ($param -eq "mode") {
             Validate-Mode $props[$param]
             $docker_cmd += " --$param=$($props[$param])"
@@ -474,6 +505,9 @@ foreach ($param in $required_params + $bee_params + $optional_params) {
                     $docker_cmd += " --$param=/output_path"
                 }
             }
+        } elseif ($param -eq "review_comments") {
+            $review_comments = Validate-ReviewComments $props[$param]
+            $docker_cmd += " --$param=$review_comments"
         } else {
             $docker_cmd += " --$param=$($props[$param])"
         }

cra-scripts/bito-cra.sh

@@ -93,6 +93,19 @@ validate_env() {
   fi
 }
 
+# Function to validate a review_comments vallue i.e. 1 mapped to "FULLPOST" or 2 mapped to "INLINE"
+validate_review_comments() {
+  local review_comments="$1"
+  if [ "$review_comments" == "1" ]; then
+    echo "FULLPOST"
+  elif [ "$review_comments" == "2" ]; then
+    echo "INLINE"
+  else
+    echo "Invalid review comments value. Please enter either 1 or 2."
+    exit 1
+  fi
+}
+
 # Function to display URL using IP address and port
 # Run docker ps -l command and store the output
 display_docker_url() {
@@ -355,14 +368,17 @@ required_params_cli=(
 )
 
 optional_params_cli=(
+  "review_comments"
   "static_analysis"
+  "static_analysis_tool"
   "dependency_check"
   "dependency_check.snyk_auth_token"
   "cra_version"
   "env"
   "cli_path"
   "output_path"
   "git.domain"
+  "code_context"
 )
 
 # Parameters that are required/optional in mode server
@@ -375,14 +391,17 @@ optional_params_server=(
   "git.provider"
   "git.access_token"
   "bito_cli.bito.access_key"
+  "review_comments"
   "static_analysis"
+  "static_analysis_tool"
   "dependency_check"
   "dependency_check.snyk_auth_token"
   "server_port"
   "cra_version"
   "env"
   "cli_path"
   "git.domain"
+  "code_context"
 )
 
 bee_params=(
@@ -444,15 +463,14 @@ 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" != "git.domain" ]; then
+  elif [ "$param" != "dependency_check.snyk_auth_token" ] && [ "$param" != "env" ] && [ "$param" != "cli_path" ] && [ "$param" != "output_path" ] && [ "$param" != "static_analysis_tool" ] && [ "$param" != "git.domain" ]; then
       ask_for_param "$param" "False"
   fi
 done
 
 # Append parameters to the docker command
 for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}"; do
 
-  #echo $param ${props[$param]}
   if [ -n "${props[$param]}" ]; then
 
     if [ "$param" == "cra_version" ]; then
@@ -475,6 +493,8 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
         #handle special case of static_analysis.fb_infer.enabled using static_analysis
         props[$param]=$(validate_boolean "${props[$param]}")
         docker_cmd+=" --static_analysis.fb_infer.enabled=${props[$param]}"
+    elif [ "$param" == "static_analysis_tool" ]; then
+        docker_cmd+=" --static_analysis_tool=${props[$param]}"
     elif [ "$param" == "dependency_check" ]; then
         #validate the dependency check boolean value
         props[$param]=$(validate_boolean "${props[$param]}")
@@ -483,6 +503,10 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
         #validate the code feedback boolean value
         props[$param]=$(validate_boolean "${props[$param]}")
         docker_cmd+=" --$param=${props[$param]}"
+    elif [ "$param" == "code_context" ]; then
+        #validate the code context boolean value
+        props[$param]=$(validate_boolean "${props[$param]}")
+        docker_cmd+=" --$param=${props[$param]}"
     elif [ "$param" == "mode" ]; then
         validate_mode "${props[$param]}"
         docker_cmd+=" --$param=${props[$param]}"
@@ -503,6 +527,16 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
             docker_cmd+=" --$param=/output_path"
           fi
         fi
+    elif [ "$param" == "review_comments" ]; then
+        #validate the review comments value
+        props[$param]=$(validate_review_comments "${props[$param]}")
+        return_val=$? # Capture the return value of the check output directory
+        if [ $return_val -eq 0 ]; then
+          docker_cmd+=" --$param=${props[$param]}"
+        else 
+          echo "Invalid value provided for review_comments. Exiting."
+          exit 1
+        fi
     else
         docker_cmd+=" --$param=${props[$param]}"
     fi