Skip to content

Commit f2e5556

Browse files
authored
refactor: rename Stage 3 Execution job to SafeOutputs (#544)
1 parent 9bdb126 commit f2e5556

7 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/compile/common.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,7 @@ pub fn generate_teardown_job(
18541854
let template = format!(
18551855
r#"- job: Teardown
18561856
displayName: "Teardown"
1857-
dependsOn: Execution
1857+
dependsOn: SafeOutputs
18581858
pool:
18591859
{{{{ pool }}}}
18601860
steps:
@@ -6217,7 +6217,7 @@ mod tests {
62176217
let step: serde_yaml::Value = serde_yaml::from_str("bash: echo td").unwrap();
62186218
let out = generate_teardown_job(&[step], "name: MyPool");
62196219
assert!(out.contains("- job: Teardown"), "out: {out}");
6220-
assert!(out.contains("dependsOn: Execution"), "out: {out}");
6220+
assert!(out.contains("dependsOn: SafeOutputs"), "out: {out}");
62216221
assert!(out.contains("name: MyPool"), "out: {out}");
62226222
assert!(out.contains("echo td"), "out: {out}");
62236223
}

src/compile/onees.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ fn generate_teardown_job(teardown_steps: &[serde_yaml::Value]) -> String {
134134
format!(
135135
r#"- job: Teardown
136136
displayName: "Teardown"
137-
dependsOn: Execution
137+
dependsOn: SafeOutputs
138138
templateContext:
139139
type: buildJob
140140
steps:
@@ -190,8 +190,8 @@ mod tests {
190190
"Should use simple display name"
191191
);
192192
assert!(
193-
result.contains("dependsOn: Execution"),
194-
"Should depend on Execution"
193+
result.contains("dependsOn: SafeOutputs"),
194+
"Should depend on SafeOutputs"
195195
);
196196
assert!(result.contains("checkout: self"), "Should include self checkout");
197197
assert!(result.contains("echo teardown"), "Should include the step content");

src/data/1es-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ extends:
617617
displayName: "Copy logs to output directory"
618618
condition: always()
619619
620-
- job: Execution
621-
displayName: "Execution"
620+
- job: SafeOutputs
621+
displayName: "SafeOutputs"
622622
dependsOn:
623623
- Agent
624624
- Detection

src/data/base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,8 @@ jobs:
591591
artifact: analyzed_outputs_$(Build.BuildId)
592592
condition: always()
593593

594-
- job: Execution
595-
displayName: "Execution"
594+
- job: SafeOutputs
595+
displayName: "SafeOutputs"
596596
dependsOn:
597597
- Agent
598598
- Detection

src/data/job-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ jobs:
578578
artifact: analyzed_outputs_$(Build.BuildId)
579579
condition: always()
580580

581-
- job: {{ stage_prefix }}_Execution
582-
displayName: "Execution"
581+
- job: {{ stage_prefix }}_SafeOutputs
582+
displayName: "SafeOutputs"
583583
dependsOn:
584584
- {{ stage_prefix }}_Agent
585585
- {{ stage_prefix }}_Detection

src/data/stage-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ stages:
582582
artifact: analyzed_outputs_$(Build.BuildId)
583583
condition: always()
584584

585-
- job: {{ stage_prefix }}_Execution
586-
displayName: "Execution"
585+
- job: {{ stage_prefix }}_SafeOutputs
586+
displayName: "SafeOutputs"
587587
dependsOn:
588588
- {{ stage_prefix }}_Agent
589589
- {{ stage_prefix }}_Detection

tests/compiler_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn assert_required_markers(content: &str) {
9595
/// Asserts that the pool configuration uses the `{{ pool }}` marker everywhere
9696
/// and that no hardcoded pool name leaks into the template.
9797
fn assert_pool_config(content: &str) {
98-
// Must appear once per job: Agent, Detection, Execution.
98+
// Must appear once per job: Agent, Detection, SafeOutputs.
9999
let pool_marker_count = content.matches("{{ pool }}").count();
100100
assert_eq!(
101101
pool_marker_count, 3,
@@ -3509,8 +3509,8 @@ fn test_1es_compiled_output_is_valid_yaml() {
35093509
"1ES output should contain Detection job"
35103510
);
35113511
assert!(
3512-
compiled.contains("job: Execution"),
3513-
"1ES output should contain Execution job"
3512+
compiled.contains("job: SafeOutputs"),
3513+
"1ES output should contain SafeOutputs job"
35143514
);
35153515

35163516
// Verify no Agency remnants

0 commit comments

Comments
 (0)