-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update bito-cra.ps1 - default branch and acceptable suggestions #46
Conversation
Code Review Agent Run Status
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved.
Code Review Agent Run #9f0e9dActionable Suggestions - 3
Review Details
|
Changelist by BitoThis pull request implements the following key changes.
|
@@ -542,7 +546,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" != "linters_feedback" ] && [ "$param" != "secret_scanner_feedback" ] && [ "$param" != "git.domain" ] && [ "$param" != "review_scope" ] && [ "$param" != "exclude_branches" ] && [ "$param" != "nexus_url" ] && [ "$param" != "exclude_files" ] && [ "$param" != "exclude_draft_pr" ] && [ "$param" != "cr_event_type" ] && [ "$param" != "posting_to_pr" ] && [ "$param" != "custom_rules.configured_ws_ids" ] && [ "$param" != "custom_rules.aws_access_key_id" ] && [ "$param" != "custom_rules.aws_secret_access_key" ] && [ "$param" != "custom_rules.region_name" ] && [ "$param" != "custom_rules.bucket_name" ] && [ "$param" != "custom_rules.aes_key" ] && [ "$param" != "code_context_config.partial_timeout" ] && [ "$param" != "code_context_config.max_depth" ] && [ "$param" != "code_context_config.kill_timeout_sec" ]; then | |||
elif [ "$param" != "acceptable_suggestions_enabled" ] && [ "$param" != "dependency_check.snyk_auth_token" ] && [ "$param" != "env" ] && [ "$param" != "cli_path" ] && [ "$param" != "output_path" ] && [ "$param" != "static_analysis_tool" ] && [ "$param" != "linters_feedback" ] && [ "$param" != "secret_scanner_feedback" ] && [ "$param" != "enable_default_branch" ] && [ "$param" != "git.domain" ] && [ "$param" != "review_scope" ] && [ "$param" != "exclude_branches" ] && [ "$param" != "nexus_url" ] && [ "$param" != "exclude_files" ] && [ "$param" != "exclude_draft_pr" ] && [ "$param" != "cr_event_type" ] && [ "$param" != "posting_to_pr" ] && [ "$param" != "custom_rules.configured_ws_ids" ] && [ "$param" != "custom_rules.aws_access_key_id" ] && [ "$param" != "custom_rules.aws_secret_access_key" ] && [ "$param" != "custom_rules.region_name" ] && [ "$param" != "custom_rules.bucket_name" ] && [ "$param" != "custom_rules.aes_key" ] && [ "$param" != "code_context_config.partial_timeout" ] && [ "$param" != "code_context_config.max_depth" ] && [ "$param" != "code_context_config.kill_timeout_sec" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The condition check contains a long chain of !=
comparisons which makes the code hard to maintain and error-prone. Consider using an array or associative array to store these parameter names and using a loop to check if the parameter exists in the array.
Code suggestion
Check the AI-generated fix before applying
@@ -546,7 +546,19 @@
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" != "acceptable_suggestions_enabled" ] && [ "$param" != "dependency_check.snyk_auth_token" ] && [ "$param" != "env" ] && [ "$param" != "cli_path" ] && [ "$param" != "output_path" ] && [ "$param" != "static_analysis_tool" ] && [ "$param" != "linters_feedback" ] && [ "$param" != "secret_scanner_feedback" ] && [ "$param" != "enable_default_branch" ] && [ "$param" != "git.domain" ] && [ "$param" != "review_scope" ] && [ "$param" != "exclude_branches" ] && [ "$param" != "nexus_url" ] && [ "$param" != "exclude_files" ] && [ "$param" != "exclude_draft_pr" ] && [ "$param" != "cr_event_type" ] && [ "$param" != "posting_to_pr" ] && [ "$param" != "custom_rules.configured_ws_ids" ] && [ "$param" != "custom_rules.aws_access_key_id" ] && [ "$param" != "custom_rules.aws_secret_access_key" ] && [ "$param" != "custom_rules.region_name" ] && [ "$param" != "custom_rules.bucket_name" ] && [ "$param" != "custom_rules.aes_key" ] && [ "$param" != "code_context_config.partial_timeout" ] && [ "$param" != "code_context_config.max_depth" ] && [ "$param" != "code_context_config.kill_timeout_sec" ]; then
+ else
+ skip_params=(
+ "acceptable_suggestions_enabled" "dependency_check.snyk_auth_token" "env" "cli_path" "output_path"
+ "static_analysis_tool" "linters_feedback" "secret_scanner_feedback" "enable_default_branch" "git.domain"
+ "review_scope" "exclude_branches" "nexus_url" "exclude_files" "exclude_draft_pr" "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" "code_context_config.partial_timeout" "code_context_config.max_depth"
+ "code_context_config.kill_timeout_sec"
+ )
+ skip_param=false
+ for skip in "${skip_params[@]}"; do
+ [[ "$param" == "$skip" ]] && skip_param=true && break
+ done
+ [[ "$skip_param" == false ]] && ask_for_param "$param" "False"
Code Review Run #9f0e9d
Is this a valid issue, or was it incorrectly flagged by the Agent?
- it was incorrectly flagged
elif [ "$param" == "acceptable_suggestions_enabled" ]; then | ||
props[$param]=$(validate_boolean "${props[$param]}") | ||
docker_cmd+=" --acceptable_suggestions_enabled=${props[$param]}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider consolidating the boolean parameter handling into a helper function to reduce code duplication. The pattern validate_boolean
followed by setting docker command is repeated multiple times. A similar issue was also found in cra-scripts/bito-cra.ps1 (line 570-581).
Code suggestion
Check the AI-generated fix before applying
@@ -584,15 +584,7 @@
function handle_boolean_param() {
local param=$1
local value=$2
props[$param]=$(validate_boolean "$value")
docker_cmd+=" --$param=${props[$param]}"
}
elif [ "$param" == "secret_scanner_feedback" ]; then
- props[$param]=$(validate_boolean "${props[$param]}")
- docker_cmd+=" --secret_scanner_feedback=${props[$param]}"
- elif [ "$param" == "acceptable_suggestions_enabled" ]; then
- props[$param]=$(validate_boolean "${props[$param]}")
- docker_cmd+=" --acceptable_suggestions_enabled=${props[$param]}"
+ handle_boolean_param "$param" "${props[$param]}"
+ elif [ "$param" == "acceptable_suggestions_enabled" ]; then
+ handle_boolean_param "$param" "${props[$param]}"
Code Review Run #9f0e9d
Is this a valid issue, or was it incorrectly flagged by the Agent?
- it was incorrectly flagged
@@ -534,7 +538,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 "linters_feedback" -and $param -ne "secret_scanner_feedback" -and $param -ne "git.domain" -and $param -ne "review_scope" -and $param -ne "exclude_branches" -and $param -ne "exclude_files" -and $param -ne "exclude_draft_pr" -and $param -ne "cr_event_type" -and $param -ne "posting_to_pr" -and $param -ne "custom_rules.configured_ws_ids" -and $param -ne "custom_rules.aws_access_key_id" -and $param -ne "custom_rules.aws_secret_access_key" -and $param -ne "custom_rules.region_name" -and $param -ne "custom_rules.bucket_name" -and $param -ne "custom_rules.aes_key" -and $param -ne "code_context_config.partial_timeout" -and $param -ne "code_context_config.max_depth" -and $param -ne "code_context_config.kill_timeout_sec") { | |||
} elseif ($param -ne "acceptable_suggestions_enabled" -and $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 "linters_feedback" -and $param -ne "secret_scanner_feedback" -and $param -ne "enable_default_branch" -and $param -ne "git.domain" -and $param -ne "review_scope" -and $param -ne "exclude_branches" -and $param -ne "exclude_files" -and $param -ne "exclude_draft_pr" -and $param -ne "cr_event_type" -and $param -ne "posting_to_pr" -and $param -ne "custom_rules.configured_ws_ids" -and $param -ne "custom_rules.aws_access_key_id" -and $param -ne "custom_rules.aws_secret_access_key" -and $param -ne "custom_rules.region_name" -and $param -ne "custom_rules.bucket_name" -and $param -ne "custom_rules.aes_key" -and $param -ne "code_context_config.partial_timeout" -and $param -ne "code_context_config.max_depth" -and $param -ne "code_context_config.kill_timeout_sec") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider breaking down the long condition into multiple lines or extracting it into a helper function for better readability. The current line exceeds recommended line length and makes code maintenance difficult.
Code suggestion
Check the AI-generated fix before applying
@@ -534,11 +534,20 @@
function Should-Prompt-Parameter($param) {
$excluded_params = @(
"acceptable_suggestions_enabled", "dependency_check.snyk_auth_token", "env", "cli_path",
"output_path", "static_analysis_tool", "linters_feedback", "secret_scanner_feedback",
"enable_default_branch", "git.domain", "review_scope", "exclude_branches", "exclude_files",
"exclude_draft_pr", "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", "code_context_config.partial_timeout",
"code_context_config.max_depth", "code_context_config.kill_timeout_sec"
)
return $excluded_params -notcontains $param
}
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 "acceptable_suggestions_enabled" -and $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 "linters_feedback" -and $param -ne "secret_scanner_feedback" -and $param -ne "enable_default_branch" -and $param -ne "git.domain" -and $param -ne "review_scope" -and $param -ne "exclude_branches" -and $param -ne "exclude_files" -and $param -ne "exclude_draft_pr" -and $param -ne "cr_event_type" -and $param -ne "posting_to_pr" -and $param -ne "custom_rules.configured_ws_ids" -and $param -ne "custom_rules.aws_access_key_id" -and $param -ne "custom_rules.aws_secret_access_key" -and $param -ne "custom_rules.region_name" -and $param -ne "custom_rules.bucket_name" -and $param -ne "custom_rules.aes_key" -and $param -ne "code_context_config.partial_timeout" -and $param -ne "code_context_config.max_depth" -and $param -ne "code_context_config.kill_timeout_sec") {
+ } elseif (Should-Prompt-Parameter $param) {
Ask-For-Param $param $false
}
Code Review Run #9f0e9d
Is this a valid issue, or was it incorrectly flagged by the Agent?
- it was incorrectly flagged
Summary by Bito
This PR adds two new configuration parameters ('acceptable_suggestions_enabled' and 'enable_default_branch') to both PowerShell and Shell scripts. The parameters are integrated into CLI and server optional parameters lists with appropriate validation and command-line argument handling. The implementation maintains consistency across both scripting environments.Unit tests added: False
Estimated effort to review (1-5, lower is better): 2