Skip to content

Commit fae5262

Browse files
rishabhbohra-bitorishabhbohra-bito
authored
Merge pull request #38 from gitbito/release/1.4.8
Update bito-cra.sh - release-1.4.8
2 parents d054020 + 902d6a4 commit fae5262

File tree

2 files changed

+98
-11
lines changed

2 files changed

+98
-11
lines changed

‎cra-scripts/bito-cra.ps1

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,22 @@ function ValidateCrEventType {
122122
}
123123
}
124124

125+
$postingToPr = "True"
126+
function ValidatePostingToPr {
127+
param($boolean_val)
128+
# Convert the input to title case (first letter uppercase, rest lowercase)
129+
$boolean_val = $boolean_val.Substring(0,1).ToUpper() + $boolean_val.Substring(1).ToLower()
130+
131+
# Check if the converted value is either "True" or "False"
132+
if ($boolean_val -ne "True" -and $boolean_val -ne "False") {
133+
return $postingToPr
134+
}
135+
136+
# Return the properly cased boolean value
137+
return $boolean_val
138+
139+
}
140+
125141
# Function to display URL using IP address and port
126142
# Run docker ps -l command and store the output
127143
function Display-DockerUrl {
@@ -156,6 +172,7 @@ function Display-Usage {
156172
Write-Host "Usage-2: $PSCommandPrefix service start | restart <path-to-properties-file>"
157173
Write-Host "Usage-3: $PSCommandPrefix service stop"
158174
Write-Host "Usage-4: $PSCommandPrefix service status"
175+
Write-Host "Usage-5: $PSCommandPrefix <path-to-properties-file> pr_url=<url-value>"
159176
}
160177

161178
function Check-PropertyFile {
@@ -257,6 +274,18 @@ if ($args.Count -lt 1) {
257274
$properties_file = $null
258275
$action_directory = $null
259276
$force_mode = $null
277+
$pr_url_arg = $null
278+
279+
function Process-PrUrlOrActionDirParam {
280+
param ($func_local_arg)
281+
282+
if ($func_local_arg -like "pr_url=*") {
283+
$pr_url_arg = $arg -replace "pr_url=", ""
284+
} else {
285+
$action_directory = Check-ActionDirectory $func_local_arg
286+
}
287+
}
288+
260289
if ($args.Count -gt 1) {
261290
if ($args[0] -eq "service") {
262291
switch ($args[1]) {
@@ -311,7 +340,15 @@ if ($args.Count -gt 1) {
311340

312341
# Note down the hidden parameter for action directory
313342
if ($args.Count -eq 2) {
314-
$action_directory = Check-ActionDirectory $args[1]
343+
#check if 2nd argument is like pr_url=<value> then extract value else check the action_directory
344+
Process-PrUrlOrActionDirParam $args[1]
345+
}
346+
347+
if ($args.Count -eq 3) {
348+
#check if 2nd argument is like pr_url=<value> then extract value else check the action_directory
349+
Process-PrUrlOrActionDirParam $args[1]
350+
#check if 3rd argument is like pr_url=<value> then extract value else check the action_directory
351+
Process-PrUrlOrActionDirParam $args[2]
315352
}
316353
}
317354
}
@@ -334,6 +371,11 @@ Get-Content $properties_file | ForEach-Object {
334371
}
335372
}
336373

374+
# Override pr_url if provided as an argument
375+
if ($pr_url_arg) {
376+
$props["pr_url"] = $pr_url_arg
377+
}
378+
337379
# Function to ask for missing parameters
338380
function Ask-For-Param {
339381
param($param_name, $exit_on_empty)
@@ -377,6 +419,7 @@ $optional_params_cli = @(
377419
"git.domain"
378420
"code_context"
379421
"cr_event_type"
422+
"posting_to_pr"
380423
)
381424

382425
# Parameters that are required/optional in mode server
@@ -473,7 +516,7 @@ foreach ($param in $required_params) {
473516
foreach ($param in $optional_params) {
474517
if ($param -eq "dependency_check.snyk_auth_token" -and $props["dependency_check"] -eq "True") {
475518
Ask-For-Param $param $false
476-
} 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" -and $param -ne "exclude_files" -and $param -ne "exclude_draft_pr" -and $param -ne "cr_event_type") {
519+
} 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" -and $param -ne "exclude_files" -and $param -ne "exclude_draft_pr" -and $param -ne "cr_event_type" -and $param -ne "posting_to_pr") {
477520
Ask-For-Param $param $false
478521
}
479522
}
@@ -540,12 +583,16 @@ foreach ($param in $required_params + $bee_params + $optional_params) {
540583
$docker_cmd += " --$param=$review_comments"
541584
} elseif ($param -eq "cr_event_type") {
542585
$crEventType = ValidateCrEventType $props[$param]
543-
} else {
586+
} elseif ($param -eq "posting_to_pr") {
587+
$postingToPr = ValidatePostingToPr $props[$param]
588+
}
589+
else {
544590
$docker_cmd += " --$param=$($props[$param])"
545591
}
546592
}
547593
}
548594
$docker_cmd += " --cr_event_type=$crEventType"
595+
$docker_cmd += " --posting_to_pr=$postingToPr"
549596
$docker_cmd = $docker_init_cmd + $docker_cmd
550597

551598
function Encrypt-GitSecret {

‎cra-scripts/bito-cra.sh

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ validate_git_provider() {
5151
if [ "$git_provider_val" == "GITLAB" ] || [ "$git_provider_val" == "GITHUB" ] || [ "$git_provider_val" == "BITBUCKET" ]; then
5252
echo $git_provider_val
5353
else
54-
echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BIBUCKET."
54+
echo "Invalid git provider value. Please enter either GITLAB or GITHUB or BITBUCKET."
5555
exit 1
5656
fi
5757
}
@@ -102,6 +102,16 @@ validate_cr_event_type() {
102102
fi
103103
}
104104

105+
posting_to_pr="True"
106+
validate_posting_to_pr() {
107+
local boolean_val="$(echo "$1" | awk '{print tolower($0)}')"
108+
if [ "$boolean_val" == "true" ]; then
109+
posting_to_pr="True"
110+
elif [ "$boolean_val" == "false" ]; then
111+
posting_to_pr="False"
112+
fi
113+
}
114+
105115
# Function to validate a review_comments vallue i.e. 1 mapped to "FULLPOST" or 2 mapped to "INLINE"
106116
validate_review_comments() {
107117
local review_comments="$1"
@@ -156,6 +166,7 @@ display_usage() {
156166
echo "Usage-2: $0 service start | restart <path-to-properties-file>"
157167
echo "Usage-3: $0 service stop"
158168
echo "Usage-4: $0 service status"
169+
echo "Usage-5: $0 <path-to-properties-file> pr_url=<url-value>"
159170
}
160171

161172
check_properties_file() {
@@ -247,6 +258,22 @@ fi
247258
properties_file=
248259
action_directory=
249260
force_mode=
261+
pr_url_arg=
262+
263+
process_pr_url_or_action_dir_param() {
264+
local param="$1"
265+
266+
if [[ "$param" == pr_url=* ]]; then
267+
pr_url_arg="${param#*=}"
268+
else
269+
action_directory=$(check_action_directory "$param")
270+
if [ $? -ne 0 ]; then
271+
echo "Action directory not found!"
272+
exit 1
273+
fi
274+
fi
275+
}
276+
250277
if [ "$#" -gt 1 ]; then
251278
if [ "$1" == "service" ]; then
252279
case "$2" in
@@ -319,12 +346,16 @@ if [ "$#" -gt 1 ]; then
319346

320347
# Note down the hidden parameter for action directory
321348
if [ "$#" -eq 2 ]; then
322-
action_directory=$(check_action_directory "$2")
323-
if [ $? -ne 0 ]; then
324-
echo "Action directory not found!"
325-
exit 1
326-
fi
327-
#echo "Action Diretory: $action_directory"
349+
#check if 2nd argument is like pr_url=<value> then extract value else check the action_directory
350+
process_pr_url_or_action_dir_param "$2"
351+
fi
352+
353+
if [ "$#" -eq 3 ]; then
354+
#check if 2nd argument is like pr_url=<value> then extract value else check the action_directory
355+
process_pr_url_or_action_dir_param "$2"
356+
357+
#check if 3rd argument is like pr_url=<value> then extract value else check the action_directory
358+
process_pr_url_or_action_dir_param "$3"
328359
fi
329360
fi
330361
else
@@ -349,6 +380,11 @@ while IFS='=' read -r key value; do
349380
fi
350381
done < "$properties_file"
351382

383+
# Override pr_url if provided as an argument
384+
if [ -n "$pr_url_arg" ]; then
385+
props["pr_url"]="$pr_url_arg"
386+
fi
387+
352388
# Function to ask for missing parameters
353389
ask_for_param() {
354390
local param_name=$1
@@ -394,6 +430,7 @@ optional_params_cli=(
394430
"code_context"
395431
"nexus_url"
396432
"cr_event_type"
433+
"posting_to_pr"
397434
)
398435

399436
# Parameters that are required/optional in mode server
@@ -488,7 +525,7 @@ done
488525
for param in "${optional_params[@]}"; do
489526
if [ "$param" == "dependency_check.snyk_auth_token" ] && [ "${props["dependency_check"]}" == "True" ]; then
490527
ask_for_param "$param" "False"
491-
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" ] && [ "$param" != "nexus_url" ] && [ "$param" != "exclude_files" ] && [ "$param" != "exclude_draft_pr" ] && [ "$param" != "cr_event_type" ]; then
528+
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" ] && [ "$param" != "nexus_url" ] && [ "$param" != "exclude_files" ] && [ "$param" != "exclude_draft_pr" ] && [ "$param" != "cr_event_type" ] && [ "$param" != "posting_to_pr" ]; then
492529
ask_for_param "$param" "False"
493530
fi
494531
done
@@ -575,13 +612,16 @@ for param in "${required_params[@]}" "${bee_params[@]}" "${optional_params[@]}";
575612
nexus_url=$(echo "${props[$param]}" | sed 's/^[ \t]*//;s/[ \t]*$//')
576613
elif [ "$param" == "cr_event_type" ]; then
577614
validate_cr_event_type "${props[$param]}"
615+
elif [ "$param" == "posting_to_pr" ]; then
616+
validate_posting_to_pr "${props[$param]}"
578617
else
579618
docker_cmd+=" --$param=${props[$param]}"
580619
fi
581620

582621
fi
583622
done
584623
docker_cmd+=" --cr_event_type=${cr_event_type}"
624+
docker_cmd+=" --posting_to_pr=${posting_to_pr}"
585625
docker_cmd=$docker_init_cmd$docker_cmd
586626
docker_cmd+=' ${docker_enc_params}'
587627

0 commit comments

Comments
 (0)