fix conductor

tembo-io · Sep 5, 2024 · 6dcaffb · 6dcaffb
1 parent 3ec422b
commit 6dcaffb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/conductor/Cargo.lock b/conductor/Cargo.lock
diff --git a/conductor/src/main.rs b/conductor/src/main.rs
@@ -771,7 +771,7 @@ async fn init_cloud_perms(
         ..Default::default()
     };
 
-    coredb_spec.backup = backup;
+    coredb_spec.backup = Some(backup);
     coredb_spec.serviceAccountTemplate = service_account_template;
 
     Ok(())

diff --git a/conductor/tests/integration_tests.rs b/conductor/tests/integration_tests.rs
@@ -313,12 +313,19 @@ mod test {
         let new_backup_spec = update_coredb.spec.backup.clone();
 
         // assert that the backup.schedule for old_backup_spec are equal to new_backup_spec
-        assert_eq!(old_backup_spec.schedule, new_backup_spec.schedule);
+        assert_eq!(
+            old_backup_spec.as_ref().and_then(|b| b.schedule.clone()),
+            new_backup_spec.as_ref().and_then(|b| b.schedule.clone())
+        );
 
         // assert that the destination paths for old_backup_spec are equal to new_backup_spec
         assert_eq!(
-            old_backup_spec.destinationPath,
-            new_backup_spec.destinationPath
+            old_backup_spec
+                .as_ref()
+                .and_then(|b| b.destinationPath.clone()),
+            new_backup_spec
+                .as_ref()
+                .and_then(|b| b.destinationPath.clone())
         );
 
         // Lets now test sending an Event::Restart to the queue and see if the