Rename datastore methods: update_tuf_* → tuf_*

plotnick · plotnick · commit 55b8e0ef5976 · 2025-05-10T11:00:11.000-06:00
diff --git a/nexus/db-queries/src/db/datastore/deployment.rs b/nexus/db-queries/src/db/datastore/deployment.rs
@@ -2243,7 +2243,7 @@ mod tests {
             const SYSTEM_HASH: ArtifactHash = ArtifactHash([3; 32]);
 
             datastore
-                .update_tuf_repo_insert(
+                .tuf_repo_insert(
                     opctx,
                     &TufRepoDescription {
                         repo: TufRepoMeta {
diff --git a/nexus/db-queries/src/db/datastore/target_release.rs b/nexus/db-queries/src/db/datastore/target_release.rs
@@ -210,7 +210,7 @@ mod test {
                 .parse()
                 .expect("SHA256('')");
         let repo = datastore
-            .update_tuf_repo_insert(
+            .tuf_repo_insert(
                 opctx,
                 &TufRepoDescription {
                     repo: TufRepoMeta {
diff --git a/nexus/db-queries/src/db/datastore/update.rs b/nexus/db-queries/src/db/datastore/update.rs
@@ -76,7 +76,7 @@ impl DataStore {
     /// `TufRepoDescription` if one was already found. (This is not an upsert,
     /// because if we know about an existing repo but with different contents,
     /// we reject that.)
-    pub async fn update_tuf_repo_insert(
+    pub async fn tuf_repo_insert(
         &self,
         opctx: &OpContext,
         description: &external::TufRepoDescription,
@@ -108,7 +108,7 @@ impl DataStore {
     }
 
     /// Returns a TUF repo description.
-    pub async fn update_tuf_repo_get_by_id(
+    pub async fn tuf_repo_get_by_id(
         &self,
         opctx: &OpContext,
         repo_id: TypedUuid<TufRepoKind>,
@@ -141,7 +141,7 @@ impl DataStore {
     }
 
     /// Returns the TUF repo description corresponding to this system version.
-    pub async fn update_tuf_repo_get_by_version(
+    pub async fn tuf_repo_get_by_version(
         &self,
         opctx: &OpContext,
         system_version: SemverVersion,
@@ -174,7 +174,7 @@ impl DataStore {
     }
 
     /// Returns the list of all TUF repo artifacts known to the system.
-    pub async fn update_tuf_artifact_list(
+    pub async fn tuf_list_repos(
         &self,
         opctx: &OpContext,
         generation: Generation,
@@ -194,7 +194,7 @@ impl DataStore {
     }
 
     /// Returns the current TUF repo generation number.
-    pub async fn update_tuf_generation_get(
+    pub async fn tuf_get_generation(
         &self,
         opctx: &OpContext,
     ) -> LookupResult<Generation> {
diff --git a/nexus/reconfigurator/preparation/src/lib.rs b/nexus/reconfigurator/preparation/src/lib.rs
@@ -156,7 +156,7 @@ impl PlanningInputFromDb<'_> {
             None => None,
             Some(repo_id) => Some(
                 datastore
-                    .update_tuf_repo_get_by_id(opctx, repo_id.into())
+                    .tuf_repo_get_by_id(opctx, repo_id.into())
                     .await
                     .internal_context("fetching target release repo")?
                     .into_external(),
@@ -175,7 +175,7 @@ impl PlanningInputFromDb<'_> {
             None => None,
             Some(repo_id) => Some(
                 datastore
-                    .update_tuf_repo_get_by_id(opctx, repo_id.into())
+                    .tuf_repo_get_by_id(opctx, repo_id.into())
                     .await
                     .internal_context("fetching target release repo")?
                     .into_external(),
diff --git a/nexus/src/app/background/tasks/tuf_artifact_replication.rs b/nexus/src/app/background/tasks/tuf_artifact_replication.rs
@@ -590,18 +590,13 @@ impl ArtifactReplication {
         &self,
         opctx: &OpContext,
     ) -> Result<(ArtifactConfig, Inventory)> {
-        let generation =
-            self.datastore.update_tuf_generation_get(opctx).await?;
+        let generation = self.datastore.tuf_get_generation(opctx).await?;
         let mut inventory = Inventory::default();
         let mut paginator = Paginator::new(SQL_BATCH_SIZE);
         while let Some(p) = paginator.next() {
             let batch = self
                 .datastore
-                .update_tuf_artifact_list(
-                    opctx,
-                    generation,
-                    &p.current_pagparams(),
-                )
+                .tuf_list_repos(opctx, generation, &p.current_pagparams())
                 .await?;
             paginator = p.found_batch(&batch, &|a| a.id.into_untyped_uuid());
             for artifact in batch {
diff --git a/nexus/src/app/update.rs b/nexus/src/app/update.rs
@@ -43,7 +43,7 @@ impl super::Nexus {
         // Now store the artifacts in the database.
         let response = self
             .db_datastore
-            .update_tuf_repo_insert(opctx, artifacts_with_plan.description())
+            .tuf_repo_insert(opctx, artifacts_with_plan.description())
             .await
             .map_err(HttpError::from)?;
 
@@ -88,7 +88,7 @@ impl super::Nexus {
 
         let tuf_repo_description = self
             .db_datastore
-            .update_tuf_repo_get_by_version(opctx, system_version.into())
+            .tuf_repo_get_by_version(opctx, system_version.into())
             .await
             .map_err(HttpError::from)?;
 
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
@@ -6575,7 +6575,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
             // Fetch the TUF repo metadata and update the target release.
             let tuf_repo_id = nexus
                 .datastore()
-                .update_tuf_repo_get_by_version(&opctx, system_version.into())
+                .tuf_repo_get_by_version(&opctx, system_version.into())
                 .await?
                 .repo
                 .id;
diff --git a/nexus/tests/integration_tests/updates.rs b/nexus/tests/integration_tests/updates.rs
@@ -114,7 +114,7 @@ async fn test_repo_upload() -> Result<()> {
     let opctx =
         OpContext::for_tests(cptestctx.logctx.log.new(o!()), datastore.clone());
     assert_eq!(
-        datastore.update_tuf_generation_get(&opctx).await.unwrap(),
+        datastore.tuf_get_generation(&opctx).await.unwrap(),
         1u32.into()
     );
 
@@ -162,7 +162,7 @@ async fn test_repo_upload() -> Result<()> {
     }));
     // The generation number should now be 2.
     assert_eq!(
-        datastore.update_tuf_generation_get(&opctx).await.unwrap(),
+        datastore.tuf_get_generation(&opctx).await.unwrap(),
         2u32.into()
     );
 
@@ -215,7 +215,7 @@ async fn test_repo_upload() -> Result<()> {
 
     // We didn't insert a new repo, so the generation number should still be 2.
     assert_eq!(
-        datastore.update_tuf_generation_get(&opctx).await.unwrap(),
+        datastore.tuf_get_generation(&opctx).await.unwrap(),
         2u32.into()
     );
 
@@ -361,7 +361,7 @@ async fn test_repo_upload() -> Result<()> {
     }
     // No artifacts changed, so the generation number should still be 2...
     assert_eq!(
-        datastore.update_tuf_generation_get(&opctx).await.unwrap(),
+        datastore.tuf_get_generation(&opctx).await.unwrap(),
         2u32.into()
     );
     // ... and the task should have nothing to do and should immediately
