1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
//! Apply command.
use super::apply_helpers::*;
use super::apply_output::*;
use super::apply_scope::{apply_scope, ApplyScope};
use super::apply_selection::*;
use super::apply_summary::print_apply_summary;
use super::helpers::*;
use super::helpers_state::*;
use super::workspace::*;
use crate::core::{executor, resolver, state, types};
use std::path::Path;
pub(crate) use super::apply_scope::cmd_apply;
#[allow(clippy::too_many_arguments)]
pub(crate) fn cmd_apply_scoped(
file: &Path,
state_dir: &Path,
machine_filter: Option<&str>,
resource_filter: Option<&str>,
tag_filter: Option<&str>,
group_filter: Option<&str>,
force: bool,
dry_run: bool,
no_tripwire: bool,
param_overrides: &[String],
auto_commit: bool,
timeout_secs: Option<u64>,
json: bool,
verbose: bool,
env_file: Option<&Path>,
workspace: Option<&str>,
report: bool,
force_unlock: bool,
output_mode: Option<&str>,
progress: bool,
timing: bool,
retry: u32,
yes: bool,
parallel: bool,
resource_timeout: Option<u64>,
rollback_on_failure: bool,
max_parallel: Option<usize>,
notify: Option<&str>,
subset: Option<&str>,
confirm_destructive: bool,
exclude: Option<&str>,
sequential: bool,
telemetry_endpoint: Option<&str>,
refresh: bool,
force_tag: Option<&str>,
// FJ-2724: `make`-style goals. Empty means "the whole config".
goals: &[String],
// GH-211: --skip / --only-machine / --exclude-machine / --resource-filter.
scope: &ApplyScope,
) -> Result<(), String> {
warn_sequential_ignored(sequential);
use std::time::Instant;
let t_total = Instant::now();
let events_mode = output_mode == Some("events");
let t_parse = Instant::now();
let mut config = load_apply_config(file, env_file, workspace)?;
let dur_parse = t_parse.elapsed();
print_apply_banner(&config, verbose);
if no_tripwire {
config.policy.tripwire = false;
}
apply_param_overrides(&mut config, param_overrides)?;
reject_empty_selection(&config, resource_filter, tag_filter, group_filter)?;
apply_scope(&mut config, scope, verbose)?;
apply_goal_closure(&mut config, goals, verbose)?;
strip_unrequested_phony(&mut config, goals);
apply_filters(&mut config, subset, exclude, verbose)?;
let observed_drift = super::apply_preflight::apply_pre_validate(
&config,
state_dir,
machine_filter,
tag_filter,
resource_filter,
confirm_destructive,
dry_run,
force,
yes,
verbose,
)?;
let cfg = executor::ApplyConfig {
config: &config,
state_dir,
force,
dry_run,
machine_filter,
resource_filter,
tag_filter,
group_filter,
timeout_secs,
force_unlock,
progress,
retry,
parallel: super::apply_gates::parallel_flag(parallel),
resource_timeout,
rollback_on_failure,
max_parallel,
trace: verbose,
run_id: apply_run_id(dry_run),
refresh,
force_tag,
};
super::apply_snapshot::maybe_auto_snapshot(&config, state_dir, dry_run, verbose);
// FJ-1388: Record pre-apply generation for rollback-on-failure. GH-376 made
// this literal: it is now the generation of the last SUCCESSFUL apply, not
// one this apply just created holding the same pre-apply state.
let pre_apply_gen = pre_apply_generation(state_dir);
// GH-210 (FJ-129): measured BEFORE the apply. Measuring afterwards read a
// lock the apply had just rewritten, so every resource looked unchanged.
let forced_noop_count = measure_forced_noops(&cfg, dry_run);
let t_apply = Instant::now();
let results = executor::apply(&cfg)?;
let dur_apply = t_apply.elapsed();
if dry_run {
return apply_dry_run_output(&config, state_dir, machine_filter, tag_filter, json);
}
let (total_converged, total_unchanged, total_failed) = count_results(&results);
// GH-336: intersect what drifted BEFORE the run with what the run actually
// converged. Raw findings would claim repairs for resources the filters
// excluded or that failed.
let drift_repaired = super::apply_drift::repaired(&observed_drift, &results);
save_apply_reports(state_dir, &results);
// GH-376: record the generation AFTER the host converged, so it pairs the
// state this apply produced with the config that produced it — the pair
// `undo` replays. Placed above the `--output events` return so every path
// records one.
//
// UNCONDITIONAL, and that is load-bearing. This was briefly gated on
// `total_failed == 0`, reasoning that a half-applied host should not become
// an undo target. Measured against the pre-change parent, that gate meant a
// stack with ONE persistently failing resource recorded ZERO generations
// for ever: `generation list` empty, `rollback --generation` dead, `undo`
// refusing with advice that could not succeed, and `--rollback-on-failure`
// silently never firing — including on every FIRST apply, with no message.
// Strictly worse than the defect it was part of fixing.
//
// A generation is a RECORD OF WHAT HAPPENED, not a certificate that it went
// well. The lock it carries describes the partial state faithfully, which
// is exactly what `--rollback-on-failure` needs to rewind to. Refusing to
// record is how you lose the ability to recover from the failure.
super::apply_snapshot::maybe_record_generation(&config, state_dir, dry_run, verbose);
if events_mode {
return print_events_output(&results);
}
print_apply_summary(
&config,
&results,
total_converged,
total_unchanged,
total_failed,
forced_noop_count,
&drift_repaired,
dur_apply,
json,
)?;
if report {
print_resource_report(&results);
}
if timing {
print_timing(dur_parse, dur_apply, t_total.elapsed());
}
check_convergence_budget(&config, dur_apply)?;
if total_failed > 0 {
return Err(apply_failure_path(
&config,
&results,
state_dir,
pre_apply_gen,
rollback_on_failure,
notify,
(total_converged, total_failed, total_unchanged),
&t_total,
verbose,
));
}
// FJ-563: OTLP trace export (post-apply, non-blocking)
export_otlp_traces(state_dir, telemetry_endpoint, &config.name, verbose);
apply_post_actions(
state_dir,
&config,
&results,
total_converged,
auto_commit,
verbose,
notify,
&t_total,
)?;
Ok(())
}
/// GH-91: Warn that --sequential is not yet implemented.
fn warn_sequential_ignored(sequential: bool) {
if sequential {
eprintln!("Warning: --sequential is not yet implemented for apply. Flag ignored.");
}
}
/// A run id is minted for every real apply and withheld for a dry run, which
/// writes no run directory.
fn apply_run_id(dry_run: bool) -> Option<String> {
if dry_run {
None
} else {
Some(crate::core::types::generate_run_id())
}
}
/// The one-line "Applying <name> (N machines, M resources)" banner `--verbose`
/// prints before any work starts.
fn print_apply_banner(config: &types::ForjarConfig, verbose: bool) {
if verbose {
eprintln!(
"Applying {} ({} machines, {} resources)",
config.name,
config.machines.len(),
config.resources.len()
);
}
}
/// Everything `apply` does once it knows resources failed: roll the generation
/// back if asked, fire `--notify`, and return the error the caller propagates.
///
/// GH-210: `--notify` must fire on the failure path too. See
/// `apply_output::notify_on_failure`.
#[allow(clippy::too_many_arguments)]
fn apply_failure_path(
config: &types::ForjarConfig,
results: &[types::ApplyResult],
state_dir: &Path,
pre_apply_gen: Option<u32>,
rollback_on_failure: bool,
notify: Option<&str>,
counts: (u32, u32, u32),
t_total: &std::time::Instant,
verbose: bool,
) -> String {
let (total_converged, total_failed, total_unchanged) = counts;
// FJ-1388: Generation-based rollback on failure
maybe_rollback_generation(rollback_on_failure, state_dir, pre_apply_gen, verbose);
super::apply_output::notify_on_failure(
notify,
config,
results,
(total_converged, total_failed, total_unchanged),
t_total,
verbose,
);
format!("{total_failed} resource(s) failed")
}
/// Parse the config and fold in every *input* that can still change it before
/// planning starts: the `--env-file` params, the injected workspace param and
/// the resolved data sources.
///
/// Exists so `cmd_apply_scoped` names one "read the desired state" step instead
/// of open-coding four, and so the optional `--env-file` branch is decided here
/// rather than in the command body. Order is load-bearing: env params land
/// before the workspace injection, and data sources resolve last so they can
/// see both.
fn load_apply_config(
file: &Path,
env_file: Option<&Path>,
workspace: Option<&str>,
) -> Result<types::ForjarConfig, String> {
let mut config = parse_and_validate(file)?;
if let Some(path) = env_file {
load_env_params(&mut config, path)?;
}
inject_workspace_param(&mut config, workspace);
resolver::resolve_data_sources(&mut config)?;
Ok(config)
}
/// GH-210 (FJ-129): how many already-converged resources `--force` will
/// re-apply.
///
/// Decides when that count is defined at all: only on a real forced run.
/// Without `--force` nothing is being forced, and a `--dry-run` re-applies
/// nothing, so both report zero rather than paying for the measurement.
/// Exists so that condition sits beside its own name instead of inline in the
/// command body. The *timing* constraint — this must be measured before the
/// apply rewrites the lock — belongs to the call site and is documented there.
fn measure_forced_noops(cfg: &executor::ApplyConfig, dry_run: bool) -> u32 {
if cfg.force && !dry_run {
executor::forced_noop_count(cfg)
} else {
0
}
}
/// Persist one apply report per result.
///
/// Decides that a report that cannot be written is a *warning*, never a failed
/// apply: the resources already converged, so losing the audit record must not
/// turn a green run red. Exists to keep that policy in one named place instead
/// of an inline loop in the command body.
fn save_apply_reports(state_dir: &Path, results: &[types::ApplyResult]) {
for result in results {
if let Err(e) = state::save_apply_report(state_dir, result) {
eprintln!("warning: cannot save apply report: {e}");
}
}
}
/// FJ-563: Export the run's spans to an OTLP endpoint after a successful apply.
///
/// Decides the three outcomes of an export: spans sent (announced only under
/// `--verbose`), export failed (a warning — telemetry must never fail the
/// apply), and nothing to send (silent). Exists so that non-blocking policy is
/// stated once, out of the command body.
fn export_otlp_traces(
state_dir: &Path,
telemetry_endpoint: Option<&str>,
config_name: &str,
verbose: bool,
) {
let Some(endpoint) = telemetry_endpoint else {
return;
};
match crate::tripwire::otlp_export::export_from_state_dir(state_dir, endpoint, config_name) {
Ok(n) if n > 0 => {
if verbose {
eprintln!("OTLP: exported {n} spans to {endpoint}");
}
}
Err(e) => eprintln!("warning: OTLP export failed: {e}"),
_ => {}
}
}
/// FJ-1380: Check convergence budget — warn/fail if apply exceeded time budget.
fn check_convergence_budget(
config: &types::ForjarConfig,
dur_apply: std::time::Duration,
) -> Result<(), String> {
let elapsed = dur_apply.as_secs();
if let Err(e) =
super::apply_gates::check_convergence_budget_pure(config.policy.convergence_budget, elapsed)
{
eprintln!(
"ERROR: convergence budget exceeded — budget {}s, actual {elapsed}s",
config.policy.convergence_budget.unwrap_or(0)
);
return Err(e);
}
Ok(())
}