reuploading TUF repo marks it unpruned (#9212)

Fixes #9138.

Author: iliana

nexus/db-queries/src/db/datastore/update.rs

@@ -546,7 +546,7 @@ async fn insert_impl(
             .await
             .optional()?;
 
-        if let Some(existing_repo) = existing_repo {
+        if let Some(mut existing_repo) = existing_repo {
             // It doesn't matter whether the UUID of the repo matches or not,
             // since it's uniquely generated. But do check the hash.
             if existing_repo.sha256 != desc.repo.sha256 {
@@ -557,6 +557,19 @@ async fn insert_impl(
                 }));
             }
 
+            // This repo matches a previous record, so reset `time_created` to
+            // now and ensure `time_pruned` is set to NULL.
+            existing_repo.time_created = chrono::Utc::now();
+            existing_repo.time_pruned = None;
+            diesel::update(dsl::tuf_repo)
+                .filter(dsl::id.eq(existing_repo.id))
+                .set((
+                    dsl::time_created.eq(existing_repo.time_created),
+                    dsl::time_pruned.eq(existing_repo.time_pruned),
+                ))
+                .execute_async(&conn)
+                .await?;
+
             // Just return the existing repo along with all of its artifacts.
             let artifacts =
                 artifacts_for_repo(existing_repo.id.into(), &conn).await?;

nexus/tests/integration_tests/updates.rs

@@ -831,6 +831,34 @@ async fn test_repo_prune(cptestctx: &ControlPlaneTestContext) {
     assert!(repos.iter().any(|r| r.id() == repo2id));
     assert!(repos.iter().any(|r| r.id() == repo3id));
     assert!(repos.iter().any(|r| r.id() == repo4id));
+
+    // Re-insert repo 1.
+    let repo1id_again = insert_test_tuf_repo(&opctx, datastore, 1).await;
+    // The ID should be the same.
+    assert_eq!(repo1id, repo1id_again);
+    // All four repos should be visible again.
+    let repos = datastore
+        .tuf_list_repos_unpruned_batched(&opctx)
+        .await
+        .expect("listing repos");
+    assert_eq!(repos.len(), 4);
+    assert!(repos.iter().any(|r| r.id() == repo1id));
+    assert!(repos.iter().any(|r| r.id() == repo2id));
+    assert!(repos.iter().any(|r| r.id() == repo3id));
+    assert!(repos.iter().any(|r| r.id() == repo4id));
+
+    // Activate the task again and wait for it to complete.  The second repo
+    // should now be pruned, since it is the least-recently uploaded.
+    activate_background_task(client, "tuf_repo_pruner").await;
+    let repos = datastore
+        .tuf_list_repos_unpruned_batched(&opctx)
+        .await
+        .expect("listing repos");
+    assert_eq!(repos.len(), 3);
+    assert!(repos.iter().any(|r| r.id() == repo1id));
+    assert!(!repos.iter().any(|r| r.id() == repo2id));
+    assert!(repos.iter().any(|r| r.id() == repo3id));
+    assert!(repos.iter().any(|r| r.id() == repo4id));
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]