Fix upgraded for 0.9.6 (and use better testdata)

NLnetLabs · Nov 29, 2023 · da81cb2 · da81cb2
1 parent 5ea3718
commit da81cb2
Show file tree

Hide file tree

Showing 87 changed files with 1,233 additions and 850 deletions.
diff --git a/src/upgrades/pre_0_10_0/cas_migration.rs b/src/upgrades/pre_0_10_0/cas_migration.rs
@@ -142,7 +142,7 @@ impl UpgradeAggregateStorePre0_14 for CasMigration {
                         match old_event {
                             Pre0_10CertAuthEvent::AspaObjectsUpdated { updates, .. } => {
                                 let ca = old_command.handle().clone();
-                                let removed = updates.removed;
+                                let removed = updates.removed.into_iter().map(rpki::resources::Asn::from).collect();
                                 let added_or_updated = updates
                                     .updated
                                     .into_iter()
@@ -187,12 +187,33 @@ impl UpgradeAggregateStorePre0_14 for CasMigration {
                     UnconvertedEffect::Success { events } => {
                         let mut full_events: Vec<CertAuthEvent> = vec![]; // We just had numbers, we need to include the full events
                         for old_event in events {
-                            full_events.push(old_event.try_into()?);
+                            match old_event {
+                                Pre0_10CertAuthEvent::AspaConfigAdded { .. }
+                                | Pre0_10CertAuthEvent::AspaConfigRemoved { .. }
+                                | Pre0_10CertAuthEvent::AspaConfigUpdated { .. }
+                                | Pre0_10CertAuthEvent::AspaObjectsUpdated { .. } => {
+                                    // we only expect AspaObjectsUpdated to be possible outside of
+                                    // Aspa related commands, e.g. because of a key rollover, but
+                                    // to be sure.. we do not migrate any of the ASPA events in
+                                    // this migration.
+                                }
+                                _ => {
+                                    full_events.push(old_event.try_into()?);
+                                }
+                            }
                         }
                         new_command_builder.finish_with_events(full_events)
                     }
                 };
 
+                // if the new command would be a no-op because no events are actually migrated,
+                // then return CommandMigrationEffect::Nothing
+                if let Some(events) = new_command.events() {
+                    if events.is_empty() {
+                        return Ok(CommandMigrationEffect::Nothing);
+                    }
+                }
+
                 Ok(CommandMigrationEffect::StoredCommand(new_command))
             }
         }

diff --git a/src/upgrades/pre_0_10_0/mod.rs b/src/upgrades/pre_0_10_0/mod.rs
@@ -3,7 +3,6 @@ use rpki::ca::publication::Base64;
 use rpki::repository::x509::Time;
 
 use crate::commons::api::AspaDefinition;
-use crate::commons::api::CustomerAsn;
 
 pub use self::cas_migration::*;
 
@@ -52,5 +51,16 @@ pub struct Pre0_10_0AspaObjectsUpdates {
     pub updated: Vec<Pre0_10_0AspaInfo>,
 
     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub removed: Vec<CustomerAsn>,
+    pub removed: Vec<Pre0_10_0CustomerAsn>,
+}
+
+//------------ Pre_0_10_0CustomerAsn -------------------------------------------
+
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct Pre0_10_0CustomerAsn(Pre0_14_0ProviderAs); // re-use ProviderAs for string parsing
+
+impl From<Pre0_10_0CustomerAsn> for rpki::resources::Asn {
+    fn from(pre: Pre0_10_0CustomerAsn) -> Self {
+        pre.0.provider
+    }
 }
diff --git a/src/upgrades/pre_0_14_0/mod.rs b/src/upgrades/pre_0_14_0/mod.rs
@@ -476,37 +476,3 @@ pub struct Pre0_14_0AspaProvidersUpdate {
     added: Vec<Pre0_14_0ProviderAs>,
     removed: Vec<Pre0_14_0ProviderAs>,
 }
-
-// //------------ AspaObjectsUpdates ------------------------------------------
-
-// #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
-// pub struct Pre0_14_0AspaObjectsUpdates {
-//     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-//     updated: Vec<Pre0_14_0AspaInfo>,
-
-//     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-//     removed: Vec<CustomerAsn>,
-// }
-
-// //------------ Pre0_14_0AspaInfo -------------------------------------------
-
-// #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-// pub struct Pre0_14_0AspaInfo {
-//     // The customer ASN and all Provider ASNs
-//     definition: Pre0_14_0AspaDefinition,
-
-//     // The validity time for this ASPA.
-//     validity: Validity,
-
-//     // The serial number (needed for revocation)
-//     serial: Serial,
-
-//     // The URI where this object is expected to be published
-//     uri: uri::Rsync,
-
-//     // The actual ASPA object in base64 format.
-//     base64: Base64,
-
-//     // The ASPA object's hash
-//     hash: Hash,
-// }
diff --git a/test-resources/migrations/v0_9_6/ca_objects/krill-upgrade-test.json b/test-resources/migrations/v0_9_6/ca_objects/krill-upgrade-test.json
diff --git a/test-resources/migrations/v0_9_6/ca_objects/testbed-client.json b/test-resources/migrations/v0_9_6/ca_objects/testbed-client.json
diff --git a/...nd--1697703587--1--cmd-ca-parent-add.json → ...nd--1701255482--1--cmd-ca-parent-add.json b/...nd--1697703587--1--cmd-ca-parent-add.json → ...nd--1701255482--1--cmd-ca-parent-add.json
@@ -1,7 +1,7 @@
 {
   "actor": "admin-token",
-  "time": "2023-10-19T08:19:47.707453175Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T10:58:02.903827344Z",
+  "handle": "krill-upgrade-test",
   "version": 1,
   "sequence": 1,
   "details": {

diff --git a/...d--1697703603--2--cmd-ca-repo-update.json → ...d--1701255527--2--cmd-ca-repo-update.json b/...d--1697703603--2--cmd-ca-repo-update.json → ...d--1701255527--2--cmd-ca-repo-update.json
@@ -1,12 +1,12 @@
 {
   "actor": "admin-token",
-  "time": "2023-10-19T08:20:03.545594564Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T10:58:47.337300726Z",
+  "handle": "krill-upgrade-test",
   "version": 2,
   "sequence": 2,
   "details": {
     "type": "repo_update",
-    "service_uri": "https://testbed.krill.cloud/rfc8181/testbed-client/"
+    "service_uri": "https://testbed.krill.cloud/rfc8181/krill-upgrade-test/"
   },
   "effect": {
     "result": "success",

diff --git a/...03604--3--cmd-ca-parent-entitlements.json → ...55528--3--cmd-ca-parent-entitlements.json b/...03604--3--cmd-ca-parent-entitlements.json → ...55528--3--cmd-ca-parent-entitlements.json
@@ -1,7 +1,7 @@
 {
   "actor": "krill",
-  "time": "2023-10-19T08:20:04.680568334Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T10:58:48.549103631Z",
+  "handle": "krill-upgrade-test",
   "version": 3,
   "sequence": 3,
   "details": {
@@ -11,9 +11,9 @@
       {
         "resource_class_name": "0",
         "resources": {
-          "asn": "AS204325, AS211321",
-          "v4": "185.49.140.0/22",
-          "v6": "2a04:b900::/29"
+          "asn": "AS65000-AS65005",
+          "v4": "192.168.0.0/16",
+          "v6": "2001:db8::/32"
         }
       }
     ]

diff --git a/...d--1697703606--4--cmd-ca-rcn-receive.json → ...d--1701255530--4--cmd-ca-rcn-receive.json b/...d--1697703606--4--cmd-ca-rcn-receive.json → ...d--1701255530--4--cmd-ca-rcn-receive.json
@@ -1,16 +1,16 @@
 {
   "actor": "krill",
-  "time": "2023-10-19T08:20:06.717504859Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T10:58:50.764147557Z",
+  "handle": "krill-upgrade-test",
   "version": 5,
   "sequence": 4,
   "details": {
     "type": "update_rcvd_cert",
     "resource_class_name": "0",
     "resources": {
-      "asn": "AS204325, AS211321",
-      "v4": "185.49.140.0/22",
-      "v6": "2a04:b900::/29"
+      "asn": "AS65000-AS65005",
+      "v4": "192.168.0.0/16",
+      "v6": "2001:db8::/32"
     }
   },
   "effect": {

diff --git a/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255614--5--cmd-ca-roas-updated.json b/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255614--5--cmd-ca-roas-updated.json
@@ -0,0 +1,26 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:00:14.915606890Z",
+  "handle": "krill-upgrade-test",
+  "version": 6,
+  "sequence": 5,
+  "details": {
+    "type": "roa_definition_updates",
+    "updates": {
+      "added": [
+        {
+          "asn": 64496,
+          "prefix": "192.168.0.0/16"
+        }
+      ],
+      "removed": []
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      6,
+      7
+    ]
+  }
+}
diff --git a/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255632--6--cmd-ca-roas-updated.json b/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255632--6--cmd-ca-roas-updated.json
@@ -0,0 +1,26 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:00:32.734882878Z",
+  "handle": "krill-upgrade-test",
+  "version": 8,
+  "sequence": 6,
+  "details": {
+    "type": "roa_definition_updates",
+    "updates": {
+      "added": [
+        {
+          "asn": 64496,
+          "prefix": "2001:db8::/64"
+        }
+      ],
+      "removed": []
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      8,
+      9
+    ]
+  }
+}
diff --git a/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255653--7--cmd-ca-roas-updated.json b/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255653--7--cmd-ca-roas-updated.json
@@ -0,0 +1,26 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:00:53.349370524Z",
+  "handle": "krill-upgrade-test",
+  "version": 10,
+  "sequence": 7,
+  "details": {
+    "type": "roa_definition_updates",
+    "updates": {
+      "added": [],
+      "removed": [
+        {
+          "asn": 64496,
+          "prefix": "192.168.0.0/16"
+        }
+      ]
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      10,
+      11
+    ]
+  }
+}
diff --git a/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255661--8--cmd-ca-roas-updated.json b/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255661--8--cmd-ca-roas-updated.json
@@ -0,0 +1,26 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:01:01.322993044Z",
+  "handle": "krill-upgrade-test",
+  "version": 12,
+  "sequence": 8,
+  "details": {
+    "type": "roa_definition_updates",
+    "updates": {
+      "added": [
+        {
+          "asn": 64496,
+          "prefix": "192.168.0.0/24"
+        }
+      ],
+      "removed": []
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      12,
+      13
+    ]
+  }
+}
diff --git a/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255679--9--cmd-ca-roas-updated.json b/...migrations/v0_9_6/cas/krill-upgrade-test/command--1701255679--9--cmd-ca-roas-updated.json
@@ -0,0 +1,26 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:01:19.358422295Z",
+  "handle": "krill-upgrade-test",
+  "version": 14,
+  "sequence": 9,
+  "details": {
+    "type": "roa_definition_updates",
+    "updates": {
+      "added": [
+        {
+          "asn": 0,
+          "prefix": "192.168.0.0/22"
+        }
+      ],
+      "removed": []
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      14,
+      15
+    ]
+  }
+}
diff --git a/...--1697704281--7--cmd-ca-aspas-update.json → ...-1701256155--10--cmd-ca-aspas-update.json b/...--1697704281--7--cmd-ca-aspas-update.json → ...-1701256155--10--cmd-ca-aspas-update.json
@@ -1,18 +1,19 @@
 {
   "actor": "admin-token",
-  "time": "2023-10-19T08:31:21.961752867Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T11:09:15.443905088Z",
+  "handle": "krill-upgrade-test",
   "version": 16,
-  "sequence": 7,
+  "sequence": 10,
   "details": {
     "type": "aspas_update",
     "updates": {
       "add_or_replace": [
         {
-          "customer": "AS204325",
+          "customer": "AS65000",
           "providers": [
-            "AS65000",
-            "AS65001"
+            "AS65001(v4)",
+            "AS65002(v6)",
+            "AS65003"
           ]
         }
       ],

diff --git a/...528--9--cmd-ca-aspas-update-existing.json → ...73--11--cmd-ca-aspas-update-existing.json b/...528--9--cmd-ca-aspas-update-existing.json → ...73--11--cmd-ca-aspas-update-existing.json
@@ -1,19 +1,16 @@
 {
   "actor": "admin-token",
-  "time": "2023-10-19T08:35:28.666963249Z",
-  "handle": "testbed-client",
+  "time": "2023-11-29T11:09:33.556191233Z",
+  "handle": "krill-upgrade-test",
   "version": 18,
-  "sequence": 9,
+  "sequence": 11,
   "details": {
     "type": "aspas_update_existing",
-    "customer": "AS204325",
+    "customer": "AS65000",
     "update": {
-      "added": [
-        "AS65002(v4)",
-        "AS65003(v6)"
-      ],
+      "added": [],
       "removed": [
-        "AS65001"
+        "AS65003"
       ]
     }
   },

diff --git a/...igrations/v0_9_6/cas/krill-upgrade-test/command--1701256210--12--cmd-ca-aspas-update.json b/...igrations/v0_9_6/cas/krill-upgrade-test/command--1701256210--12--cmd-ca-aspas-update.json
@@ -0,0 +1,23 @@
+{
+  "actor": "admin-token",
+  "time": "2023-11-29T11:10:10.854747771Z",
+  "handle": "krill-upgrade-test",
+  "version": 20,
+  "sequence": 12,
+  "details": {
+    "type": "aspas_update",
+    "updates": {
+      "add_or_replace": [],
+      "remove": [
+        "AS65000"
+      ]
+    }
+  },
+  "effect": {
+    "result": "success",
+    "events": [
+      20,
+      21
+    ]
+  }
+}