From 62994f8b5715bdd66a4a1ee0214349c34f738aa1 Mon Sep 17 00:00:00 2001
From: Tim Bruijnzeels <tim@nlnetlabs.nl>
Date: Fri, 3 Nov 2023 10:22:45 +0100
Subject: [PATCH] Skip surplus directories in migration #1147

---
 src/upgrades/mod.rs                                 |  6 ++++++
 .../v0_10_3/cas/testbed-client/surplus/delta-0.json | 13 +++++++++++++
 .../v0_11_0/cas/testbed-client/surplus/delta-0.json | 13 +++++++++++++
 .../v0_12_1_pubserver/pubd/0/surplus/delta-0.json   | 13 +++++++++++++
 .../v0_12_3/cas/testbed-client/surplus/delta-0.json | 13 +++++++++++++
 .../v0_13_1/cas/testbed-client/surplus/delta-0.json | 13 +++++++++++++
 .../v0_13_1_pubserver/pubd/0/surplus/delta-0.json   | 13 +++++++++++++
 .../v0_9_5_pubserver/pubd/0/surplus/delta-0.json    |  9 +++++++++
 .../v0_9_6/cas/testbed-client/surplus/delta-0.json  |  9 +++++++++
 9 files changed, 102 insertions(+)
 create mode 100644 test-resources/migrations/v0_10_3/cas/testbed-client/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_11_0/cas/testbed-client/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_12_1_pubserver/pubd/0/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_12_3/cas/testbed-client/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_13_1/cas/testbed-client/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_13_1_pubserver/pubd/0/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_9_5_pubserver/pubd/0/surplus/delta-0.json
 create mode 100644 test-resources/migrations/v0_9_6/cas/testbed-client/surplus/delta-0.json

diff --git a/src/upgrades/mod.rs b/src/upgrades/mod.rs
index acd27f5de..e15f3e164 100644
--- a/src/upgrades/mod.rs
+++ b/src/upgrades/mod.rs
@@ -358,6 +358,12 @@ pub trait UpgradeAggregateStorePre0_14 {
 
         // Migrate the event sourced data for each scope and create new snapshots
         for scope in self.deployed_store().scopes()? {
+            // We only need top-level scopes, not sub-scopes such as 'surplus' archive dirs
+            if scope.len() != 1 {
+                trace!("Skipping migration for sub-scope: {}", scope);
+                continue;
+            }
+
             // Getting the Handle should never fail, but if it does then we should bail out asap.
             let handle = MyHandle::from_str(&scope.to_string())
                 .map_err(|_| UpgradeError::Custom(format!("Found invalid handle '{}'", scope)))?;
diff --git a/test-resources/migrations/v0_10_3/cas/testbed-client/surplus/delta-0.json b/test-resources/migrations/v0_10_3/cas/testbed-client/surplus/delta-0.json
new file mode 100644
index 000000000..c5b8b34b8
--- /dev/null
+++ b/test-resources/migrations/v0_10_3/cas/testbed-client/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "testbed-client",
+  "version": 0,
+  "details": {
+    "id": {
+      "cert": {
+        "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPRviOjJtpjDicev6VqRPAFcf0jRhhZgecjKheNkab2rjL7LQUB34QfiC9ICQ30wRx77K1p+pszFrfKESoyMY+Z323G7+RY3pBwHEQyvaTaPAqCGCCsnunffCsMgRjQkS1c2Oft9U3MwDu88aweEptBmFpfdO5e1HRYlQPwSUZkS2ZgXoggOZ3+ePFYczot+Je3GuLpaytiV7lD4n15veMrUPSm8OUBwfOrh7xgRHAFI5AVQQLw99oMOkS+EqyLfXy/dS3Y35n2lUvjYyAwY3mrwl+epRq34ugP/71Nn0BJ/ug3Apzt1w113iFv42tUQXnLfWajPTKry+s3rdWCVRwIDAQAB",
+        "base64": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg5OEEwNUQ2Mzc3MENFQ0FCRjRCNDk5QURBODgyRjgyNTYwNTdGREY3MB4XDTIzMTAxOTA4MDYyNloXDTM4MTAxOTA4MTEyNlowMzExMC8GA1UEAxMoOThBMDVENjM3NzBDRUNBQkY0QjQ5OUFEQTg4MkY4MjU2MDU3RkRGNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALD0b4joybaYw4nHr+lakTwBXH9I0YYWYHnIyoXjZGm9q4y+y0FAd+EH4gvSAkN9MEce+ytafqbMxa3yhEqMjGPmd9txu/kWN6QcBxEMr2k2jwKghggrJ7p33wrDIEY0JEtXNjn7fVNzMA7vPGsHhKbQZhaX3TuXtR0WJUD8ElGZEtmYF6IIDmd/njxWHM6LfiXtxri6WsrYle5Q+J9eb3jK1D0pvDlAcHzq4e8YERwBSOQFUEC8PfaDDpEvhKsi318v3Ut2N+Z9pVL42MgMGN5q8JfnqUat+LoD/+9TZ9ASf7oNwKc7dcNdd4hb+NrVEF5y31moz0yq8vrN63VglUcCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwHwYDVR0jBBgwFoAUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwDQYJKoZIhvcNAQELBQADggEBAKAcxeZbckWD4MVKjHDrgGyiDyDqRfDotPt86D2tacf/kxv9zvPg0/fLKcRfobJqHB1OuCDQWYxXuARFOkwNr+R/AdhmoFbL7DeqT54VL4UJFFic5HwHzo3FXFrUgjKlh7vnQMiHqDjTcjS7V2tdzb/6uIOMR75A41VGUQ3PGhEbhPf3AQ7pUgi/T9cs0EO2Eo6g1IkD1izhgV3QKz4S1fozWYNqm+YzxqGU/b4s2IVCCE3pmIDTSu8qKvRYVepDJtaavBVtf1A4VTKo0YFPPw8dLeE0dabmK1y+ftlktgraPsQ3B8WbOf7BD+DRpkzj7TEsSSxhPuBIc8AUS1qsiKA=",
+        "hash": "8db69f3830f42e89fbe8615fabd3501ddaa15d74df831a74d773c11716943e3a"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_11_0/cas/testbed-client/surplus/delta-0.json b/test-resources/migrations/v0_11_0/cas/testbed-client/surplus/delta-0.json
new file mode 100644
index 000000000..c5b8b34b8
--- /dev/null
+++ b/test-resources/migrations/v0_11_0/cas/testbed-client/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "testbed-client",
+  "version": 0,
+  "details": {
+    "id": {
+      "cert": {
+        "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPRviOjJtpjDicev6VqRPAFcf0jRhhZgecjKheNkab2rjL7LQUB34QfiC9ICQ30wRx77K1p+pszFrfKESoyMY+Z323G7+RY3pBwHEQyvaTaPAqCGCCsnunffCsMgRjQkS1c2Oft9U3MwDu88aweEptBmFpfdO5e1HRYlQPwSUZkS2ZgXoggOZ3+ePFYczot+Je3GuLpaytiV7lD4n15veMrUPSm8OUBwfOrh7xgRHAFI5AVQQLw99oMOkS+EqyLfXy/dS3Y35n2lUvjYyAwY3mrwl+epRq34ugP/71Nn0BJ/ug3Apzt1w113iFv42tUQXnLfWajPTKry+s3rdWCVRwIDAQAB",
+        "base64": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg5OEEwNUQ2Mzc3MENFQ0FCRjRCNDk5QURBODgyRjgyNTYwNTdGREY3MB4XDTIzMTAxOTA4MDYyNloXDTM4MTAxOTA4MTEyNlowMzExMC8GA1UEAxMoOThBMDVENjM3NzBDRUNBQkY0QjQ5OUFEQTg4MkY4MjU2MDU3RkRGNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALD0b4joybaYw4nHr+lakTwBXH9I0YYWYHnIyoXjZGm9q4y+y0FAd+EH4gvSAkN9MEce+ytafqbMxa3yhEqMjGPmd9txu/kWN6QcBxEMr2k2jwKghggrJ7p33wrDIEY0JEtXNjn7fVNzMA7vPGsHhKbQZhaX3TuXtR0WJUD8ElGZEtmYF6IIDmd/njxWHM6LfiXtxri6WsrYle5Q+J9eb3jK1D0pvDlAcHzq4e8YERwBSOQFUEC8PfaDDpEvhKsi318v3Ut2N+Z9pVL42MgMGN5q8JfnqUat+LoD/+9TZ9ASf7oNwKc7dcNdd4hb+NrVEF5y31moz0yq8vrN63VglUcCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwHwYDVR0jBBgwFoAUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwDQYJKoZIhvcNAQELBQADggEBAKAcxeZbckWD4MVKjHDrgGyiDyDqRfDotPt86D2tacf/kxv9zvPg0/fLKcRfobJqHB1OuCDQWYxXuARFOkwNr+R/AdhmoFbL7DeqT54VL4UJFFic5HwHzo3FXFrUgjKlh7vnQMiHqDjTcjS7V2tdzb/6uIOMR75A41VGUQ3PGhEbhPf3AQ7pUgi/T9cs0EO2Eo6g1IkD1izhgV3QKz4S1fozWYNqm+YzxqGU/b4s2IVCCE3pmIDTSu8qKvRYVepDJtaavBVtf1A4VTKo0YFPPw8dLeE0dabmK1y+ftlktgraPsQ3B8WbOf7BD+DRpkzj7TEsSSxhPuBIc8AUS1qsiKA=",
+        "hash": "8db69f3830f42e89fbe8615fabd3501ddaa15d74df831a74d773c11716943e3a"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_12_1_pubserver/pubd/0/surplus/delta-0.json b/test-resources/migrations/v0_12_1_pubserver/pubd/0/surplus/delta-0.json
new file mode 100644
index 000000000..9e5e3c554
--- /dev/null
+++ b/test-resources/migrations/v0_12_1_pubserver/pubd/0/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "0",
+  "version": 0,
+  "details": {
+    "id_cert": {
+      "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy3jbLo+08KFwmqikIJBmSX9qYarI/CEXVBshKWfJ6EpWOc9+nghM7XzfVsDgHu+C0pipoUzFusShwHDgEe/tvSHOYhV9+tnS8Vh3mQ4MpD/mUr0LCcFhG8EI8G7YrAhZYLWygcd2I+kz905WhfGYqTjppJyW8Vo8CfYIatdTdLHTjKmVZww4H709fgQuauC20rElgdcw1XPz1c0ANYL++CK9lOJzmHjo88xkifRwoguQp3BTHTkFw3NWDHYYDO/CynKHJiJP0RcGyBho0OXQQ1Zm7s0tuHEuPdZdE3F38AhaamwMOoGIirufoM6qJ5se7/eRqmCtvty/UvUzLCFEdQIDAQAB",
+      "base64": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg2QThBOUFEMTA5MjdGOUUzRTMyRDg3MjczQTg1NUIzRDBDMzRDNjFGMB4XDTIyMDIyNTEyMjU1NloXDTM3MDIyNTEyMzA1NlowMzExMC8GA1UEAxMoNkE4QTlBRDEwOTI3RjlFM0UzMkQ4NzI3M0E4NTVCM0QwQzM0QzYxRjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMt42y6PtPChcJqopCCQZkl/amGqyPwhF1QbISlnyehKVjnPfp4ITO1831bA4B7vgtKYqaFMxbrEocBw4BHv7b0hzmIVffrZ0vFYd5kODKQ/5lK9CwnBYRvBCPBu2KwIWWC1soHHdiPpM/dOVoXxmKk46aSclvFaPAn2CGrXU3Sx04yplWcMOB+9PX4ELmrgttKxJYHXMNVz89XNADWC/vgivZTic5h46PPMZIn0cKILkKdwUx05BcNzVgx2GAzvwspyhyYiT9EXBsgYaNDl0ENWZu7NLbhxLj3WXRNxd/AIWmpsDDqBiIq7n6DOqiebHu/3kapgrb7cv1L1MywhRHUCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUaoqa0Qkn+ePjLYcnOoVbPQw0xh8wHwYDVR0jBBgwFoAUaoqa0Qkn+ePjLYcnOoVbPQw0xh8wDQYJKoZIhvcNAQELBQADggEBAIH8R3/14PK1qy1D7HOqN5FbYEO2brwSPKb0UdqNC1o8zLLJ5qGNCWoAvck+pkAJsxOPxgvzvYlwlUzuCToiXFUnDBYPXzI6u8kziJFchRIOFmaQxL+1LKhV66hgXi7r85+3nB0UMrfARzgUjXcZ9WIIQOwtSYq7yTcMHf8na7GJRelvH4B1lNht5AW6fQeRPBHleZZ3DQQc18mX2cPdm/uoegnTlTpM9dRhFTcZeezwkZvEkYG/i9rSMxVmFd1E4gN2e0CPsxdJxZ9oMNubyNToW146Y7v+M5OTibfrIqQKvsBC3BuTZRbXB9093HVmJTff33/zFYexfM3X740MhOo=",
+      "hash": "595d4b3832527e8e65198b36b9e837e630060ee9fd73220ec3fcf9a5bc423068"
+    },
+    "rrdp_base_uri": "https://testbed.krill.cloud/rrdp/",
+    "rsync_jail": "rsync://testbed.krill.cloud/repo/"
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_12_3/cas/testbed-client/surplus/delta-0.json b/test-resources/migrations/v0_12_3/cas/testbed-client/surplus/delta-0.json
new file mode 100644
index 000000000..c5b8b34b8
--- /dev/null
+++ b/test-resources/migrations/v0_12_3/cas/testbed-client/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "testbed-client",
+  "version": 0,
+  "details": {
+    "id": {
+      "cert": {
+        "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPRviOjJtpjDicev6VqRPAFcf0jRhhZgecjKheNkab2rjL7LQUB34QfiC9ICQ30wRx77K1p+pszFrfKESoyMY+Z323G7+RY3pBwHEQyvaTaPAqCGCCsnunffCsMgRjQkS1c2Oft9U3MwDu88aweEptBmFpfdO5e1HRYlQPwSUZkS2ZgXoggOZ3+ePFYczot+Je3GuLpaytiV7lD4n15veMrUPSm8OUBwfOrh7xgRHAFI5AVQQLw99oMOkS+EqyLfXy/dS3Y35n2lUvjYyAwY3mrwl+epRq34ugP/71Nn0BJ/ug3Apzt1w113iFv42tUQXnLfWajPTKry+s3rdWCVRwIDAQAB",
+        "base64": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg5OEEwNUQ2Mzc3MENFQ0FCRjRCNDk5QURBODgyRjgyNTYwNTdGREY3MB4XDTIzMTAxOTA4MDYyNloXDTM4MTAxOTA4MTEyNlowMzExMC8GA1UEAxMoOThBMDVENjM3NzBDRUNBQkY0QjQ5OUFEQTg4MkY4MjU2MDU3RkRGNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALD0b4joybaYw4nHr+lakTwBXH9I0YYWYHnIyoXjZGm9q4y+y0FAd+EH4gvSAkN9MEce+ytafqbMxa3yhEqMjGPmd9txu/kWN6QcBxEMr2k2jwKghggrJ7p33wrDIEY0JEtXNjn7fVNzMA7vPGsHhKbQZhaX3TuXtR0WJUD8ElGZEtmYF6IIDmd/njxWHM6LfiXtxri6WsrYle5Q+J9eb3jK1D0pvDlAcHzq4e8YERwBSOQFUEC8PfaDDpEvhKsi318v3Ut2N+Z9pVL42MgMGN5q8JfnqUat+LoD/+9TZ9ASf7oNwKc7dcNdd4hb+NrVEF5y31moz0yq8vrN63VglUcCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwHwYDVR0jBBgwFoAUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwDQYJKoZIhvcNAQELBQADggEBAKAcxeZbckWD4MVKjHDrgGyiDyDqRfDotPt86D2tacf/kxv9zvPg0/fLKcRfobJqHB1OuCDQWYxXuARFOkwNr+R/AdhmoFbL7DeqT54VL4UJFFic5HwHzo3FXFrUgjKlh7vnQMiHqDjTcjS7V2tdzb/6uIOMR75A41VGUQ3PGhEbhPf3AQ7pUgi/T9cs0EO2Eo6g1IkD1izhgV3QKz4S1fozWYNqm+YzxqGU/b4s2IVCCE3pmIDTSu8qKvRYVepDJtaavBVtf1A4VTKo0YFPPw8dLeE0dabmK1y+ftlktgraPsQ3B8WbOf7BD+DRpkzj7TEsSSxhPuBIc8AUS1qsiKA=",
+        "hash": "8db69f3830f42e89fbe8615fabd3501ddaa15d74df831a74d773c11716943e3a"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_13_1/cas/testbed-client/surplus/delta-0.json b/test-resources/migrations/v0_13_1/cas/testbed-client/surplus/delta-0.json
new file mode 100644
index 000000000..c5b8b34b8
--- /dev/null
+++ b/test-resources/migrations/v0_13_1/cas/testbed-client/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "testbed-client",
+  "version": 0,
+  "details": {
+    "id": {
+      "cert": {
+        "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPRviOjJtpjDicev6VqRPAFcf0jRhhZgecjKheNkab2rjL7LQUB34QfiC9ICQ30wRx77K1p+pszFrfKESoyMY+Z323G7+RY3pBwHEQyvaTaPAqCGCCsnunffCsMgRjQkS1c2Oft9U3MwDu88aweEptBmFpfdO5e1HRYlQPwSUZkS2ZgXoggOZ3+ePFYczot+Je3GuLpaytiV7lD4n15veMrUPSm8OUBwfOrh7xgRHAFI5AVQQLw99oMOkS+EqyLfXy/dS3Y35n2lUvjYyAwY3mrwl+epRq34ugP/71Nn0BJ/ug3Apzt1w113iFv42tUQXnLfWajPTKry+s3rdWCVRwIDAQAB",
+        "base64": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg5OEEwNUQ2Mzc3MENFQ0FCRjRCNDk5QURBODgyRjgyNTYwNTdGREY3MB4XDTIzMTAxOTA4MDYyNloXDTM4MTAxOTA4MTEyNlowMzExMC8GA1UEAxMoOThBMDVENjM3NzBDRUNBQkY0QjQ5OUFEQTg4MkY4MjU2MDU3RkRGNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALD0b4joybaYw4nHr+lakTwBXH9I0YYWYHnIyoXjZGm9q4y+y0FAd+EH4gvSAkN9MEce+ytafqbMxa3yhEqMjGPmd9txu/kWN6QcBxEMr2k2jwKghggrJ7p33wrDIEY0JEtXNjn7fVNzMA7vPGsHhKbQZhaX3TuXtR0WJUD8ElGZEtmYF6IIDmd/njxWHM6LfiXtxri6WsrYle5Q+J9eb3jK1D0pvDlAcHzq4e8YERwBSOQFUEC8PfaDDpEvhKsi318v3Ut2N+Z9pVL42MgMGN5q8JfnqUat+LoD/+9TZ9ASf7oNwKc7dcNdd4hb+NrVEF5y31moz0yq8vrN63VglUcCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwHwYDVR0jBBgwFoAUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwDQYJKoZIhvcNAQELBQADggEBAKAcxeZbckWD4MVKjHDrgGyiDyDqRfDotPt86D2tacf/kxv9zvPg0/fLKcRfobJqHB1OuCDQWYxXuARFOkwNr+R/AdhmoFbL7DeqT54VL4UJFFic5HwHzo3FXFrUgjKlh7vnQMiHqDjTcjS7V2tdzb/6uIOMR75A41VGUQ3PGhEbhPf3AQ7pUgi/T9cs0EO2Eo6g1IkD1izhgV3QKz4S1fozWYNqm+YzxqGU/b4s2IVCCE3pmIDTSu8qKvRYVepDJtaavBVtf1A4VTKo0YFPPw8dLeE0dabmK1y+ftlktgraPsQ3B8WbOf7BD+DRpkzj7TEsSSxhPuBIc8AUS1qsiKA=",
+        "hash": "8db69f3830f42e89fbe8615fabd3501ddaa15d74df831a74d773c11716943e3a"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_13_1_pubserver/pubd/0/surplus/delta-0.json b/test-resources/migrations/v0_13_1_pubserver/pubd/0/surplus/delta-0.json
new file mode 100644
index 000000000..c302086af
--- /dev/null
+++ b/test-resources/migrations/v0_13_1_pubserver/pubd/0/surplus/delta-0.json
@@ -0,0 +1,13 @@
+{
+  "id": "0",
+  "version": 0,
+  "details": {
+    "id_cert": {
+      "public_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuQSceaQ4xwAmzHUoT4GVdXTqBhqtNbEFE4bDTlH0GmjSkPLrXcsDGEcDej/pdF9hIGPOYkrs1FaemUD21NhDXT+RNDSbgreyRtGYgHRy74Y56uzL+zf5JdJxtlNGayF7rwIPzQ633mjEBS8SC3wXJTTbMz7W4ZrzL4snH8JHNcMEggIJfnTI1jfEARJgAvvbtsccrtGR+rArSsuYksNyNos3cjRsY0ooRdVAqbzcM7R9bi+Kgm1IkUSEZYgPLW/2sjnguCqcVB4coQTE89R+o+w2btMmqUb2NEdrYN0BeMmOfEpHwn1T51gPJc0/NZWMmznR9xXc413FYafCc37kWQIDAQAB",
+      "base64": "MIIDEzCCAfugAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEygwNENEOTQyQ0RBRDQyMTk5NDU5NDhFN0I4NTkxMjExQkU3NDRBMTA0MB4XDTIzMDIwNzEzNTIyM1oXDTM4MDIwNzEzNTcyM1owMzExMC8GA1UEAxMoMDRDRDk0MkNEQUQ0MjE5OTQ1OTQ4RTdCODU5MTIxMUJFNzQ0QTEwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkEnHmkOMcAJsx1KE+BlXV06gYarTWxBROGw05R9Bpo0pDy613LAxhHA3o/6XRfYSBjzmJK7NRWnplA9tTYQ10/kTQ0m4K3skbRmIB0cu+GOersy/s3+SXScbZTRmshe68CD80Ot95oxAUvEgt8FyU02zM+1uGa8y+LJx/CRzXDBIICCX50yNY3xAESYAL727bHHK7RkfqwK0rLmJLDcjaLN3I0bGNKKEXVQKm83DO0fW4vioJtSJFEhGWIDy1v9rI54LgqnFQeHKEExPPUfqPsNm7TJqlG9jRHa2DdAXjJjnxKR8J9U+dYDyXNPzWVjJs50fcV3ONdxWGnwnN+5FkCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUBM2ULNrUIZlFlI57hZEhG+dEoQQwDQYJKoZIhvcNAQELBQADggEBALViT82r0eAjdxVJanVDd0AAbZjteF/R7JPK/iHucvsbXjrXAd1PrRskBjYpODHQHRN5aUAFUHb/i9UqiGWmQe6/cJA5ZUO7Ukax/7z5UH2TSkOPx2JL2CQnSJeivg5NnDQ39HU4ToDY1G6AllupXpaFZbD4tvT36DC6+h9ZPm6LuLb4EuyE6hO8ZoK7ghjFTNB5GIzd5Q2w90MKCIticRv0AT2DPLa08aF4lGSRF0RVMCsZOGTaEWDrETDEJ2ha1zjgOnTyRBCZAbx5O5zhrl89WSjzegjtTTNt02Jcr7eBOWG35wlPxilVBeT8difUMxbq2DWBN7ZljahBW+aOlK8=",
+      "hash": "eaafa5da9649391ec44e7d5fb660547e31a4141d39c925dd36b339e2aaf8915b"
+    },
+    "rrdp_base_uri": "https://krill-ui-dev-testbed.krill.cloud/rrdp/",
+    "rsync_jail": "rsync://krill-ui-dev-testbed.krill.cloud/repo/"
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_9_5_pubserver/pubd/0/surplus/delta-0.json b/test-resources/migrations/v0_9_5_pubserver/pubd/0/surplus/delta-0.json
new file mode 100644
index 000000000..a3824566d
--- /dev/null
+++ b/test-resources/migrations/v0_9_5_pubserver/pubd/0/surplus/delta-0.json
@@ -0,0 +1,9 @@
+{
+  "id": "0",
+  "version": 0,
+  "details": {
+    "id_cert": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg2QThBOUFEMTA5MjdGOUUzRTMyRDg3MjczQTg1NUIzRDBDMzRDNjFGMB4XDTIyMDIyNTEyMjU1NloXDTM3MDIyNTEyMzA1NlowMzExMC8GA1UEAxMoNkE4QTlBRDEwOTI3RjlFM0UzMkQ4NzI3M0E4NTVCM0QwQzM0QzYxRjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMt42y6PtPChcJqopCCQZkl/amGqyPwhF1QbISlnyehKVjnPfp4ITO1831bA4B7vgtKYqaFMxbrEocBw4BHv7b0hzmIVffrZ0vFYd5kODKQ/5lK9CwnBYRvBCPBu2KwIWWC1soHHdiPpM/dOVoXxmKk46aSclvFaPAn2CGrXU3Sx04yplWcMOB+9PX4ELmrgttKxJYHXMNVz89XNADWC/vgivZTic5h46PPMZIn0cKILkKdwUx05BcNzVgx2GAzvwspyhyYiT9EXBsgYaNDl0ENWZu7NLbhxLj3WXRNxd/AIWmpsDDqBiIq7n6DOqiebHu/3kapgrb7cv1L1MywhRHUCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUaoqa0Qkn+ePjLYcnOoVbPQw0xh8wHwYDVR0jBBgwFoAUaoqa0Qkn+ePjLYcnOoVbPQw0xh8wDQYJKoZIhvcNAQELBQADggEBAIH8R3/14PK1qy1D7HOqN5FbYEO2brwSPKb0UdqNC1o8zLLJ5qGNCWoAvck+pkAJsxOPxgvzvYlwlUzuCToiXFUnDBYPXzI6u8kziJFchRIOFmaQxL+1LKhV66hgXi7r85+3nB0UMrfARzgUjXcZ9WIIQOwtSYq7yTcMHf8na7GJRelvH4B1lNht5AW6fQeRPBHleZZ3DQQc18mX2cPdm/uoegnTlTpM9dRhFTcZeezwkZvEkYG/i9rSMxVmFd1E4gN2e0CPsxdJxZ9oMNubyNToW146Y7v+M5OTibfrIqQKvsBC3BuTZRbXB9093HVmJTff33/zFYexfM3X740MhOo=",
+    "rrdp_base_uri": "https://testbed.krill.cloud/rrdp/",
+    "rsync_jail": "rsync://testbed.krill.cloud/repo/"
+  }
+}
\ No newline at end of file
diff --git a/test-resources/migrations/v0_9_6/cas/testbed-client/surplus/delta-0.json b/test-resources/migrations/v0_9_6/cas/testbed-client/surplus/delta-0.json
new file mode 100644
index 000000000..7b1bb73ff
--- /dev/null
+++ b/test-resources/migrations/v0_9_6/cas/testbed-client/surplus/delta-0.json
@@ -0,0 +1,9 @@
+{
+  "id": "testbed-client",
+  "version": 0,
+  "details": {
+    "id": {
+      "cert": "MIIDNDCCAhygAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyg5OEEwNUQ2Mzc3MENFQ0FCRjRCNDk5QURBODgyRjgyNTYwNTdGREY3MB4XDTIzMTAxOTA4MDYyNloXDTM4MTAxOTA4MTEyNlowMzExMC8GA1UEAxMoOThBMDVENjM3NzBDRUNBQkY0QjQ5OUFEQTg4MkY4MjU2MDU3RkRGNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALD0b4joybaYw4nHr+lakTwBXH9I0YYWYHnIyoXjZGm9q4y+y0FAd+EH4gvSAkN9MEce+ytafqbMxa3yhEqMjGPmd9txu/kWN6QcBxEMr2k2jwKghggrJ7p33wrDIEY0JEtXNjn7fVNzMA7vPGsHhKbQZhaX3TuXtR0WJUD8ElGZEtmYF6IIDmd/njxWHM6LfiXtxri6WsrYle5Q+J9eb3jK1D0pvDlAcHzq4e8YERwBSOQFUEC8PfaDDpEvhKsi318v3Ut2N+Z9pVL42MgMGN5q8JfnqUat+LoD/+9TZ9ASf7oNwKc7dcNdd4hb+NrVEF5y31moz0yq8vrN63VglUcCAwEAAaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwHwYDVR0jBBgwFoAUmKBdY3cM7Kv0tJmtqIL4JWBX/fcwDQYJKoZIhvcNAQELBQADggEBAKAcxeZbckWD4MVKjHDrgGyiDyDqRfDotPt86D2tacf/kxv9zvPg0/fLKcRfobJqHB1OuCDQWYxXuARFOkwNr+R/AdhmoFbL7DeqT54VL4UJFFic5HwHzo3FXFrUgjKlh7vnQMiHqDjTcjS7V2tdzb/6uIOMR75A41VGUQ3PGhEbhPf3AQ7pUgi/T9cs0EO2Eo6g1IkD1izhgV3QKz4S1fozWYNqm+YzxqGU/b4s2IVCCE3pmIDTSu8qKvRYVepDJtaavBVtf1A4VTKo0YFPPw8dLeE0dabmK1y+ftlktgraPsQ3B8WbOf7BD+DRpkzj7TEsSSxhPuBIc8AUS1qsiKA="
+    }
+  }
+}
\ No newline at end of file