remove targets_role_version and valid_until from TufRepo view, add time_created

Author: david-crespo

nexus/db-model/src/tuf_repo.rs

@@ -154,10 +154,9 @@ impl From<TufRepo> for views::TufRepo {
     fn from(repo: TufRepo) -> views::TufRepo {
         views::TufRepo {
             hash: repo.sha256.into(),
-            targets_role_version: repo.targets_role_version as u64,
-            valid_until: repo.valid_until,
             system_version: repo.system_version.into(),
             file_name: repo.file_name,
+            time_created: repo.time_created,
         }
     }
 }

nexus/tests/integration_tests/updates.rs

@@ -339,10 +339,6 @@ async fn test_repo_upload() -> Result<()> {
         initial_repo.system_version, reupload_description.system_version,
         "system version matches"
     );
-    assert_eq!(
-        initial_repo.valid_until, reupload_description.valid_until,
-        "valid_until matches"
-    );
 
     // We didn't insert a new repo, so the generation number should still be 2.
     assert_eq!(
@@ -363,10 +359,6 @@ async fn test_repo_upload() -> Result<()> {
         initial_repo.system_version, repo.system_version,
         "system version matches"
     );
-    assert_eq!(
-        initial_repo.valid_until, repo.valid_until,
-        "valid_until matches"
-    );
 
     // Upload a new repository with the same system version but a different
     // version for one of the components. This will produce a different hash,

nexus/types/src/external_api/views.rs

@@ -1601,12 +1601,6 @@ pub struct TufRepo {
     /// convenience.
     pub hash: ArtifactHash,
 
-    /// The version of the targets role
-    pub targets_role_version: u64,
-
-    /// The time until which the repo is valid
-    pub valid_until: DateTime<Utc>,
-
     /// The system version in artifacts.json
     pub system_version: Version,
 
@@ -1616,6 +1610,9 @@ pub struct TufRepo {
     /// with wicket, we read the file contents from stdin so we don't know the
     /// correct file name).
     pub file_name: String,
+
+    /// Time the repository was uploaded
+    pub time_created: DateTime<Utc>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, JsonSchema)]

openapi/nexus.json

@@ -25881,14 +25881,8 @@
             "type": "string",
             "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
           },
-          "targets_role_version": {
-            "description": "The version of the targets role",
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
-          "valid_until": {
-            "description": "The time until which the repo is valid",
+          "time_created": {
+            "description": "Time the repository was uploaded",
             "type": "string",
             "format": "date-time"
           }
@@ -25897,8 +25891,7 @@
           "file_name",
           "hash",
           "system_version",
-          "targets_role_version",
-          "valid_until"
+          "time_created"
         ]
       },
       "TufRepoResultsPage": {