File tree Expand file tree Collapse file tree 7 files changed +52
-14
lines changed
examples/roles/name_casing/tasks Expand file tree Collapse file tree 7 files changed +52
-14
lines changed Original file line number Diff line number Diff line change 69
69
env :
70
70
# Number of expected test passes, safety measure for accidental skip of
71
71
# tests. Update value if you add/remove tests.
72
- PYTEST_REQPASS : 850
72
+ PYTEST_REQPASS : 851
73
73
steps :
74
74
- uses : actions/checkout@v4
75
75
with :
Original file line number Diff line number Diff line change
1
+ ---
2
+ - name : Test nested tasks within block and always
3
+ block :
4
+ - name : Test1
5
+ ansible.builtin.debug :
6
+ msg : Foo
7
+
8
+ - name : Test2
9
+ ansible.builtin.debug :
10
+ msg : Bar
11
+
12
+ always :
13
+ - name : From always block to be auto fixed as name[casing] scenario
14
+ ansible.builtin.debug :
15
+ msg : Baz
Original file line number Diff line number Diff line change
1
+ ---
2
+ - name : Test nested tasks within block and always
3
+ block :
4
+ - name : test1
5
+ ansible.builtin.debug :
6
+ msg : Foo
7
+
8
+ - name : Test2
9
+ ansible.builtin.debug :
10
+ msg : Bar
11
+
12
+ always :
13
+ - name : from always block to be auto fixed as name[casing] scenario
14
+ ansible.builtin.debug :
15
+ msg : Baz
Original file line number Diff line number Diff line change @@ -174,17 +174,16 @@ def transform(
174
174
if match .tag == "name[casing]" :
175
175
target_task = self .seek (match .yaml_path , data )
176
176
# Not using capitalize(), since that rewrites the rest of the name to lower case
177
- task_name = target_task ["name" ]
178
- if "|" in task_name : # if using prefix
179
- [file_name , update_task_name ] = task_name .split ("|" )
180
- target_task [
181
- "name"
182
- ] = f"{ file_name .strip ()} | { update_task_name .strip ()[:1 ].upper ()} { update_task_name .strip ()[1 :]} "
183
- else :
184
- target_task [
185
- "name"
186
- ] = f"{ target_task ['name' ][:1 ].upper ()} { target_task ['name' ][1 :]} "
187
- match .fixed = True
177
+ task_name = target_task .get ("name" , None )
178
+ if task_name :
179
+ if "|" in task_name : # if using prefix
180
+ [file_name , update_task_name ] = task_name .split ("|" )
181
+ target_task [
182
+ "name"
183
+ ] = f"{ file_name .strip ()} | { update_task_name .strip ()[:1 ].upper ()} { update_task_name .strip ()[1 :]} "
184
+ else :
185
+ target_task ["name" ] = f"{ task_name [:1 ].upper ()} { task_name [1 :]} "
186
+ match .fixed = True
188
187
189
188
190
189
if "pytest" in sys .modules :
Original file line number Diff line number Diff line change 24
24
"url" : " https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json"
25
25
},
26
26
"meta" : {
27
- "etag" : " 097a20155bc7936b6eae292a556bb38202d34a0a333ff5cbaaa1b4d3a4cc7bf5 " ,
27
+ "etag" : " fb58deb0f5f2a3b77ba298764f74bc6e3bd38a761f368a50bb285042f6260354 " ,
28
28
"url" : " https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta.json"
29
29
},
30
30
"meta-runtime" : {
Original file line number Diff line number Diff line change @@ -422,6 +422,8 @@ def _get_path_to_task_in_nested_tasks_block(
422
422
continue
423
423
next_task_key = task_keys_by_index .get (task_index + 1 , None )
424
424
if next_task_key is not None :
425
+ if task .lc .data [next_task_key ][2 ] < lineno :
426
+ continue
425
427
next_task_key_line_index = task .lc .data [next_task_key ][0 ]
426
428
else :
427
429
next_task_key_line_index = None
Original file line number Diff line number Diff line change @@ -174,7 +174,14 @@ def fixture_runner_result(
174
174
1 ,
175
175
True ,
176
176
True ,
177
- id = "name_case_with_prefix" ,
177
+ id = "name_casing_prefix" ,
178
+ ),
179
+ pytest .param (
180
+ "examples/roles/name_casing/tasks/main.yml" ,
181
+ 2 ,
182
+ True ,
183
+ True ,
184
+ id = "name_case" ,
178
185
),
179
186
),
180
187
)
You can’t perform that action at this time.
0 commit comments