Take the registry tags at construction time

1 files changed, 66 insertions, 65 deletions

diff --git a/src/updater.rs b/src/updater.rs
index 1aba08f..a828e57 100644
--- a/src/updater.rs
+++ b/src/updater.rs
@@ -205,7 +205,7 @@ pub fn update_images(now: &DateTime<Utc>, db: &dyn Db, reg: &dyn Registries, fil
 mod tests {
     use super::*;
     use crate::db::StubDb;
-    use crate::registry::StubRegistry;
+    use crate::registry::{StubRegistry, StubTag};
     use chrono::TimeZone;
 
     #[test]
@@ -213,15 +213,16 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let past_expiry = now - chrono::Duration::days(1);
         let mut img = Image { id: 0, registry: "registry.hub.docker.com".into(), image: "nginx".into(), expires_at: past_expiry };
         db.insert_image(&mut img);
         db.insert_tag(img.id, "1.20", &past_expiry);
         db.insert_tag(img.id, "1.21", &past_expiry);
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -241,7 +242,7 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
+        let reg = StubRegistry::new(vec![]);
 
         let future_expiry = now + chrono::Duration::minutes(30);
         let mut img = Image { id: 0, registry: "registry.hub.docker.com".into(), image: "nginx".into(), expires_at: future_expiry };
@@ -264,9 +265,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -284,10 +285,10 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -305,11 +306,11 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.25", "sha256:0000000000000000000000000000000000000000000000000000000000000003");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.25".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000003".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -327,9 +328,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "latest", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "latest".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -349,7 +350,7 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
+        let reg = StubRegistry::new(vec![]);
 
         let future_expiry = now + chrono::Duration::minutes(30);
         let mut img = Image { id: 0, registry: "registry.hub.docker.com".into(), image: "nginx".into(), expires_at: future_expiry };
@@ -375,9 +376,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000004");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000004".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -397,9 +398,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -417,9 +418,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -439,10 +440,10 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -463,7 +464,7 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
+        let reg = StubRegistry::new(vec![]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -484,9 +485,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -504,12 +505,12 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
-        reg.add_tag("registry.hub.docker.com", "redis", "6.0", "sha256:0000000000000000000000000000000000000000000000000000000000000003");
-        reg.add_tag("registry.hub.docker.com", "redis", "6.2", "sha256:0000000000000000000000000000000000000000000000000000000000000004");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.0".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000003".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.2".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000004".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -528,12 +529,12 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
-        reg.add_tag("registry.hub.docker.com", "redis", "6.0", "sha256:0000000000000000000000000000000000000000000000000000000000000003");
-        reg.add_tag("registry.hub.docker.com", "redis", "6.2", "sha256:0000000000000000000000000000000000000000000000000000000000000004");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.0".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000003".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.2".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000004".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -552,10 +553,10 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![
             FileInput {
@@ -582,7 +583,9 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000005".into() },
+        ]);
 
         let past_expiry = now - chrono::Duration::days(1);
         let mut img = Image { id: 0, registry: "registry.hub.docker.com".into(), image: "nginx".into(), expires_at: past_expiry };
@@ -590,8 +593,6 @@ mod tests {
         db.insert_tag(img.id, "1.21", &past_expiry);
         db.update_tag_digest(img.id, "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000003", &past_expiry);
 
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000005");
-
         let files = vec![FileInput {
             path: "/test".into(),
             content: "image: nginx:1.21@sha256:0000000000000000000000000000000000000000000000000000000000000001".into(),
@@ -609,10 +610,10 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "redis", "6.0", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "redis", "6.2", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.0".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "redis".into(), tag: "6.2".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![FileInput {
             path: "/test".into(),
@@ -633,10 +634,10 @@ mod tests {
         crate::metrics::init();
         let now = Utc.with_ymd_and_hms(2000, 1, 1, 0, 0, 0).unwrap();
         let db = StubDb::default();
-        let reg = StubRegistry::default();
-
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.21", "sha256:0000000000000000000000000000000000000000000000000000000000000001");
-        reg.add_tag("registry.hub.docker.com", "nginx", "1.22", "sha256:0000000000000000000000000000000000000000000000000000000000000002");
+        let reg = StubRegistry::new(vec![
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.21".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000001".into() },
+            StubTag { registry: "registry.hub.docker.com".into(), image: "nginx".into(), tag: "1.22".into(), digest: "sha256:0000000000000000000000000000000000000000000000000000000000000002".into() },
+        ]);
 
         let files = vec![
             FileInput { path: "/a".into(), content: "image: nginx:1.21".into(), images: vec![7..17] },