Skip to content

Commit c95648b

Browse files
robsymeclaude
robsyme
and
claude
committed
Remove trailing whitespace from S3BashLib
Clean up trailing spaces in retryEnv(), s3Lib(), and s5cmdLib() methods, and update corresponding test expectations. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Rob Syme <rob.syme@gmail.com>
1 parent 49425d8 commit c95648b

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎plugins/nf-amazon/src/main/nextflow/cloud/aws/util/S3BashLib.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class S3BashLib extends BashFunLib<S3BashLib> {
9595
return ''
9696
"""
9797
# aws cli retry config
98-
export AWS_RETRY_MODE=${retryMode}
98+
export AWS_RETRY_MODE=${retryMode}
9999
export AWS_MAX_ATTEMPTS=${maxTransferAttempts}
100100
""".stripIndent().rightTrim()
101101
}
@@ -127,7 +127,7 @@ class S3BashLib extends BashFunLib<S3BashLib> {
127127
local is_dir=\$($cli s3 ls \$source | grep -F "PRE \${file_name}/" -c)
128128
if [[ \$is_dir == 1 ]]; then
129129
$cli s3 cp --only-show-errors --recursive "\$source" "\$target"
130-
else
130+
else
131131
$cli s3 cp --only-show-errors "\$source" "\$target"
132132
fi
133133
}
@@ -165,7 +165,7 @@ class S3BashLib extends BashFunLib<S3BashLib> {
165165
local is_dir=\$($cli ls \$source | grep -F "DIR \${file_name}/" -c)
166166
if [[ \$is_dir == 1 ]]; then
167167
$cli cp "\$source/*" "\$target"
168-
else
168+
else
169169
$cli cp "\$source" "\$target"
170170
fi
171171
}

‎plugins/nf-amazon/src/test/nextflow/cloud/aws/util/S3BashLibTest.groovy‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class S3BashLibTest extends Specification {
104104
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
105105
if [[ $is_dir == 1 ]]; then
106106
aws s3 cp --only-show-errors --recursive "$source" "$target"
107-
else
107+
else
108108
aws s3 cp --only-show-errors "$source" "$target"
109109
fi
110110
}
@@ -203,7 +203,7 @@ class S3BashLibTest extends Specification {
203203
local is_dir=$(/foo/bin/aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
204204
if [[ $is_dir == 1 ]]; then
205205
/foo/bin/aws s3 cp --only-show-errors --recursive "$source" "$target"
206-
else
206+
else
207207
/foo/bin/aws s3 cp --only-show-errors "$source" "$target"
208208
fi
209209
}
@@ -223,7 +223,7 @@ class S3BashLibTest extends Specification {
223223
expect:
224224
S3BashLib.script() == '''
225225
# aws cli retry config
226-
export AWS_RETRY_MODE=standard
226+
export AWS_RETRY_MODE=standard
227227
export AWS_MAX_ATTEMPTS=5
228228
# aws helper
229229
nxf_s3_upload() {
@@ -245,7 +245,7 @@ class S3BashLibTest extends Specification {
245245
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
246246
if [[ $is_dir == 1 ]]; then
247247
aws s3 cp --only-show-errors --recursive "$source" "$target"
248-
else
248+
else
249249
aws s3 cp --only-show-errors "$source" "$target"
250250
fi
251251
}
@@ -261,7 +261,7 @@ class S3BashLibTest extends Specification {
261261
expect:
262262
S3BashLib.script() == '''
263263
# aws cli retry config
264-
export AWS_RETRY_MODE=legacy
264+
export AWS_RETRY_MODE=legacy
265265
export AWS_MAX_ATTEMPTS=100
266266
# aws helper
267267
nxf_s3_upload() {
@@ -283,7 +283,7 @@ class S3BashLibTest extends Specification {
283283
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
284284
if [[ $is_dir == 1 ]]; then
285285
aws s3 cp --only-show-errors --recursive "$source" "$target"
286-
else
286+
else
287287
aws s3 cp --only-show-errors "$source" "$target"
288288
fi
289289
}
@@ -318,7 +318,7 @@ class S3BashLibTest extends Specification {
318318
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
319319
if [[ $is_dir == 1 ]]; then
320320
aws s3 cp --only-show-errors --recursive "$source" "$target"
321-
else
321+
else
322322
aws s3 cp --only-show-errors "$source" "$target"
323323
fi
324324
}
@@ -334,7 +334,7 @@ class S3BashLibTest extends Specification {
334334
expect:
335335
S3BashLib.script() == '''
336336
# aws cli retry config
337-
export AWS_RETRY_MODE=legacy
337+
export AWS_RETRY_MODE=legacy
338338
export AWS_MAX_ATTEMPTS=99
339339
# aws helper
340340
nxf_s3_upload() {
@@ -356,7 +356,7 @@ class S3BashLibTest extends Specification {
356356
local is_dir=$(/some/bin/aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
357357
if [[ $is_dir == 1 ]]; then
358358
/some/bin/aws s3 cp --only-show-errors --recursive "$source" "$target"
359-
else
359+
else
360360
/some/bin/aws s3 cp --only-show-errors "$source" "$target"
361361
fi
362362
}
@@ -450,7 +450,7 @@ class S3BashLibTest extends Specification {
450450
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
451451
if [[ $is_dir == 1 ]]; then
452452
aws s3 cp --only-show-errors --recursive "$source" "$target"
453-
else
453+
else
454454
aws s3 cp --only-show-errors "$source" "$target"
455455
fi
456456
}
@@ -541,7 +541,7 @@ class S3BashLibTest extends Specification {
541541
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
542542
if [[ $is_dir == 1 ]]; then
543543
aws s3 cp --only-show-errors --recursive "$source" "$target"
544-
else
544+
else
545545
aws s3 cp --only-show-errors "$source" "$target"
546546
fi
547547
}
@@ -616,7 +616,7 @@ class S3BashLibTest extends Specification {
616616
}
617617
618618
# aws cli retry config
619-
export AWS_RETRY_MODE=standard
619+
export AWS_RETRY_MODE=standard
620620
export AWS_MAX_ATTEMPTS=5
621621
# aws helper
622622
nxf_s3_upload() {
@@ -638,7 +638,7 @@ class S3BashLibTest extends Specification {
638638
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
639639
if [[ $is_dir == 1 ]]; then
640640
aws s3 cp --only-show-errors --recursive "$source" "$target"
641-
else
641+
else
642642
aws s3 cp --only-show-errors "$source" "$target"
643643
fi
644644
}
@@ -714,7 +714,7 @@ class S3BashLibTest extends Specification {
714714
}
715715
716716
# aws cli retry config
717-
export AWS_RETRY_MODE=standard
717+
export AWS_RETRY_MODE=standard
718718
export AWS_MAX_ATTEMPTS=5
719719
# aws helper
720720
nxf_s3_upload() {
@@ -736,7 +736,7 @@ class S3BashLibTest extends Specification {
736736
local is_dir=$(aws s3 ls $source | grep -F "PRE ${file_name}/" -c)
737737
if [[ $is_dir == 1 ]]; then
738738
aws s3 cp --only-show-errors --recursive "$source" "$target"
739-
else
739+
else
740740
aws s3 cp --only-show-errors "$source" "$target"
741741
fi
742742
}
@@ -773,7 +773,7 @@ class S3BashLibTest extends Specification {
773773
local is_dir=$(s5cmd ls $source | grep -F "DIR ${file_name}/" -c)
774774
if [[ $is_dir == 1 ]]; then
775775
s5cmd cp "$source/*" "$target"
776-
else
776+
else
777777
s5cmd cp "$source" "$target"
778778
fi
779779
}
@@ -810,7 +810,7 @@ class S3BashLibTest extends Specification {
810810
local is_dir=$(s5cmd ls $source | grep -F "DIR ${file_name}/" -c)
811811
if [[ $is_dir == 1 ]]; then
812812
s5cmd cp "$source/*" "$target"
813-
else
813+
else
814814
s5cmd cp "$source" "$target"
815815
fi
816816
}

0 commit comments

Comments
 (0)