Merge pull request #40 from gitbito/release/1.5.6

Update bito-cra.sh & bito-cra.ps1 - release/1.5.6

Author: adhirpotdarbito

cra-scripts/bito-cra.ps1

@@ -87,8 +87,8 @@ function Validate-Mode {
 function Validate-Env {
     param($env_val)
 
-    if ($env_val -ne "prod" -and $env_val -ne "staging") {
-      Write-Host "Invalid env value. Please enter either prod or staging."
+    if ($env_val -ne "prod" -and $env_val -ne "staging" -and $env_val -ne "preprod") {
+      Write-Host "Invalid env value. Please enter either prod or staging or preprod."
       exit 1
     }
 }
@@ -420,6 +420,12 @@ $optional_params_cli = @(
     "code_context"
     "cr_event_type"
     "posting_to_pr"
+    "custom_rules.configured_ws_ids"
+    "custom_rules.aws_access_key_id"
+    "custom_rules.aws_secret_access_key"
+    "custom_rules.region_name"
+    "custom_rules.bucket_name"
+    "custom_rules.aes_key"
 )
 
 # Parameters that are required/optional in mode server
@@ -448,6 +454,12 @@ $optional_params_server = @(
     "git.domain"
     "code_context"
     "cr_event_type"
+    "custom_rules.configured_ws_ids"
+    "custom_rules.aws_access_key_id"
+    "custom_rules.aws_secret_access_key"
+    "custom_rules.region_name"
+    "custom_rules.bucket_name"
+    "custom_rules.aes_key"
 )
 
 $bee_params = @(

cra-scripts/bito-cra.sh

@@ -84,11 +84,11 @@ validate_mode() {
 # Function to validate a env value i.e. prod or staging
 validate_env() {
   local env="$1"
-  if [ "$env" == "prod" ] || [ "$env" == "staging" ]; then
+  if [ "$env" == "prod" ] || [ "$env" == "staging" ] || [ "$env" == "preprod" ]; then
     #echo "Valid mode value"
     echo
   else
-    echo "Invalid mode value. Please enter either prod or staging."
+    echo "Invalid mode value. Please enter either prod or staging or preprod."
     exit 1
   fi
 }
@@ -431,6 +431,12 @@ optional_params_cli=(
   "nexus_url"
   "cr_event_type"
   "posting_to_pr"
+  "custom_rules.configured_ws_ids"
+  "custom_rules.aws_access_key_id"
+  "custom_rules.aws_secret_access_key"
+  "custom_rules.region_name"
+  "custom_rules.bucket_name"
+  "custom_rules.aes_key"
 )
 
 # Parameters that are required/optional in mode server
@@ -460,6 +466,12 @@ optional_params_server=(
   "code_context"
   "nexus_url"
   "cr_event_type"
+  "custom_rules.configured_ws_ids"
+  "custom_rules.aws_access_key_id"
+  "custom_rules.aws_secret_access_key"
+  "custom_rules.region_name"
+  "custom_rules.bucket_name"
+  "custom_rules.aes_key"
 )
 
 bee_params=(