Persist zones

crates/api/src/lib.rs

@@ -475,6 +475,7 @@ pub struct LastPublishedZone {
 #[derive(Deserialize, Serialize, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Progress {
     Waiting,
+    Restoring,
     Loading,
     LoadedReview,
     HaltLoaded,

crates/cli/src/commands/zone.rs

@@ -640,7 +640,7 @@ impl Zone {
         // Output information per step progressed until the first still
         // in-progress/aborted step or show all steps if all have completed.
         println!("");
-        print_status(zone.progress, &zone, &policy);
+        print_status(&zone, &policy);
 
         if zone.last_published.is_some() {
             println!("");
@@ -700,8 +700,11 @@ impl Zone {
     }
 }
 
-pub fn print_status(current: Progress, zone: &ZoneStatus, policy: &PolicyInfo) {
-    let progress = match zone.progress {
+pub fn print_status(zone: &ZoneStatus, policy: &PolicyInfo) {
+    let current = zone.progress;
+
+    let progress = match current {
+        Progress::Restoring => "restoring",
         Progress::Waiting => "idle",
         Progress::Loading => "loading",
         Progress::LoadedReview => "waiting for loaded review",
@@ -714,7 +717,7 @@ pub fn print_status(current: Progress, zone: &ZoneStatus, policy: &PolicyInfo) {
 
     println!("status: {}{progress}{}", ansi::BLUE, ansi::RESET);
 
-    if current == Progress::Waiting {
+    if matches!(current, Progress::Waiting | Progress::Restoring) {
         return;
     }
 

crates/zonedata/src/restorer.rs

@@ -197,6 +197,11 @@ impl LoadedZoneRestorer {
             .find(|inst| inst.soa.is_some())
             .map(LoadedZoneReader::new)
     }
+
+    /// The diff from the preceding loaded instance to the current one.
+    pub fn take_diff(&mut self) -> Option<Box<DiffData>> {
+        self.diff.take()
+    }
 }
 
 impl LoadedZoneRestorer {
@@ -469,6 +474,11 @@ impl SignedZoneRestorer {
             .find(|inst| inst.soa.is_some())
             .map(|inst| SignedZoneReader::new(curr_loaded, inst))
     }
+
+    /// The diff from the preceding signed instance to the current one.
+    pub fn take_diff(&mut self) -> Option<Box<DiffData>> {
+        self.diff.take()
+    }
 }
 
 impl SignedZoneRestorer {

integration-tests/system-tests.yml

@@ -301,3 +301,18 @@ jobs:
           accept-xfr-from: ${{ matrix.accept-xfr-from }}
           downstream-expects-tsig: ${{ matrix.downstream-expects-tsig }}
           downstream-uses-tsig: ${{ matrix.downstream-uses-tsig }}
+
+  persist-zone:
+    name: Added zone should still exist after restart.
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: [stable]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/set-build-profile
+        with:
+          build-profile: ${{ inputs.build-profile }}
+      - uses: ./integration-tests/tests/persist-zone
+        with:
+          log-level: ${{ inputs.log-level }}