Skip cleanup of redundant ROAs - release 0.8.2

Author: Tim Bruijnzeels

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 # Note: some of these values are also used when building Debian packages below.
 name    = "krill"
-version = "0.8.2-pre"
+version = "0.8.2"
 edition = "2018"
 authors = [ "The NLnet Labs RPKI team <[email protected]>" ]
 description = "Resource Public Key Infrastructure (RPKI) daemon"

Cargo.toml

@@ -3,6 +3,18 @@
 Please see [here](https://github.com/NLnetLabs/krill/projects?query=is%3Aopen+sort%3Aname-asc)
 for planned releases.
 
+## 0.8.2 'Can't touch this'
+
+As it turned out the previous release (0.8.1) still insisted on cleaning up 'redundant ROAs'
+when migrating to that version. This clean-up would not cause any issues with regards to the
+validity of your announcements. However, we realised in 0.8.1 that users should be the once
+to decide whether they want to have extra ROAs or not. Therefore this clean-up should have
+been removed then.
+
+This release removes this clean-up and introduces no other changes. We recommend that users
+who did not upgrade already upgrade to this release. However, if you already successfully 
+upgraded to 0.8.1, then upgrading to this release is not needed.
+
 ## 0.8.1 'The Gentle Art' 
 
 The ROA guidance introduced in release 0.8.0 was more strict than it should be. This release

Changelog.md

@@ -58,11 +58,12 @@ pub enum KeyStoreVersion {
     V0_8,
     V0_8_1_RC1,
     V0_8_1,
+    V0_8_2,
 }
 
 impl KeyStoreVersion {
     pub fn current() -> Self {
-        KeyStoreVersion::V0_8_1_RC1
+        KeyStoreVersion::V0_8_2
     }
 }
 

src/commons/eventsourcing/store.rs

@@ -15,11 +15,9 @@ use crate::daemon::ca::CertAuth;
 use crate::daemon::krillserver::KrillServer;
 use crate::pubd::Repository;
 use crate::upgrades::fix_info_last_event_0_8_0::FixInfoFiles;
-use crate::upgrades::roa_cleanup_0_8_0::RoaCleanupError;
 
 pub mod fix_info_last_event_0_8_0;
 pub mod pre_0_6_0;
-pub mod roa_cleanup_0_8_0;
 
 //------------ UpgradeError --------------------------------------------------
 
@@ -40,9 +38,6 @@ pub enum UpgradeError {
     #[display(fmt = "Cannot load: {}", _0)]
     CannotLoadAggregate(Handle),
 
-    #[display(fmt = "Cannot clean up redundant roas: {}", _0)]
-    RoaCleanup(RoaCleanupError),
-
     #[display(fmt = "{}", _0)]
     Custom(String),
 }
@@ -81,12 +76,6 @@ impl From<io::Error> for UpgradeError {
     }
 }
 
-impl From<RoaCleanupError> for UpgradeError {
-    fn from(e: RoaCleanupError) -> Self {
-        UpgradeError::RoaCleanup(e)
-    }
-}
-
 //------------ UpgradeStore --------------------------------------------------
 
 /// Implement this for automatic upgrades to key stores
@@ -112,13 +101,8 @@ pub fn pre_start_upgrade(work_dir: &PathBuf) -> Result<(), UpgradeError> {
 }
 
 /// Should be called right after the KrillServer is initiated.
-pub async fn post_start_upgrade(work_dir: &PathBuf, server: &KrillServer) -> Result<(), UpgradeError> {
-    let ca_store: AggregateStore<CertAuth> = AggregateStore::new(work_dir, "cas")?;
-    if ca_store.get_version()? < KeyStoreVersion::V0_8_0_RC1 {
-        info!("Will clean up redundant ROAs for all CAs and update version of storage dirs");
-        roa_cleanup_0_8_0::roa_cleanup(server).await?;
-    }
-
+pub async fn post_start_upgrade(_work_dir: &PathBuf, _server: &KrillServer) -> Result<(), UpgradeError> {
+    // Put future post start upgrade actions here
     Ok(())
 }