Merge pull request #25 from gitbito/release/1.3.2-new

Update bito-cra.sh

Author: rishabhbohra-bito

cra-scripts/bito-cra.sh

@@ -423,7 +423,6 @@ optional_params_server=(
   "code_context"
   "nexus_url"
   "cr_event_type"
-  "encryption_key"
 )
 
 bee_params=(
@@ -576,8 +575,6 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
         nexus_url=$(echo "${props[$param]}" | sed 's/^[ \t]*//;s/[ \t]*$//')
     elif [ "$param" == "cr_event_type" ]; then
         validate_cr_event_type "${props[$param]}"
-    elif [ "$param" == "encryption_key" ]; then
-        encryption_key_value=${props[$param]}
     else
         docker_cmd+=" --$param=${props[$param]}"
     fi
@@ -614,22 +611,15 @@ encrypt_git_secret() {
 
 param_bito_access_key="bito_cli.bito.access_key"
 param_git_access_token="git.access_token"
-param_encryption_key="encryption_key"
+
 docker_enc_params=
 if [ "$mode" == "server" ]; then
     if [ -n "${props[$param_bito_access_key]}" ] && [ -n "${props[$param_git_access_token]}" ]; then
         git_secret="${props[$param_bito_access_key]}@#~^${props[$param_git_access_token]}"
-
-        if [ -n "${props[$param_encryption_key]}" ]; then
-            encryption_key="${props[$param_encryption_key]}"
-            if [[ ${#encryption_key} -eq 44 ]] && [[ $encryption_key =~ ^[A-Za-z0-9+/]{43}=$ ]]; then
-                git_secret=$(encrypt_git_secret "$encryption_key" "$git_secret")
-                docker_enc_params=" --git.secret=$git_secret --encryption_key=$encryption_key"
-            else
-                echo "Error: Encryption key must be a 44-character base64 string generated by openssl rand -base64 32."
-                exit 1
-            fi
-        fi
+        encryption_key=$(openssl rand -base64 32)
+        git_secret=$(encrypt_git_secret "$encryption_key" "$git_secret")
+        docker_enc_params=" --git.secret=$git_secret --encryption_key=$encryption_key"
+        
 
         echo "Use below as Gitlab and Github Webhook secret:"
         echo "$git_secret"