[spr] initial version

Created using spr 1.3.6-beta.1
oxidecomputer · Oct 14, 2024 · f4acad0 · f4acad0
1 parent a9ac2df
commit f4acad0
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 157 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs
@@ -1392,15 +1392,15 @@ fn cmd_load_example(
     sim.internal_dns.insert(
         blueprint.internal_dns_version,
         DnsConfigParams {
-            generation: blueprint.internal_dns_version.into(),
+            generation: blueprint.internal_dns_version,
             time_created: Utc::now(),
             zones: vec![internal_dns],
         },
     );
     sim.external_dns.insert(
         blueprint.external_dns_version,
         DnsConfigParams {
-            generation: blueprint.external_dns_version.into(),
+            generation: blueprint.external_dns_version,
             time_created: Utc::now(),
             zones: vec![external_dns],
         },

diff --git a/dns-server/Cargo.toml b/dns-server/Cargo.toml
@@ -21,6 +21,7 @@ hickory-resolver.workspace = true
 hickory-server.workspace = true
 http.workspace = true
 internal-dns-types.workspace = true
+omicron-common.workspace = true
 pretty-hex.workspace = true
 schemars.workspace = true
 serde.workspace = true

diff --git a/dns-server/src/bin/dnsadm.rs b/dns-server/src/bin/dnsadm.rs
@@ -220,7 +220,7 @@ async fn main() -> Result<()> {
                 .collect();
 
             let new_config = DnsConfigParams {
-                generation: old_config.generation + 1,
+                generation: old_config.generation.next(),
                 time_created: chrono::Utc::now(),
                 zones,
             };
@@ -275,7 +275,7 @@ fn add_record(
     our_kv.1.push(record);
 
     Ok(DnsConfigParams {
-        generation: generation + 1,
+        generation: generation.next(),
         time_created: chrono::Utc::now(),
         zones: other_zones
             .into_iter()