route: add version_alias_maps for aliased repo versions

* We tie r1beta5 -> current on the old repos via symlinks.
* Symlinks aren't a thing in s3, so we add a new alias map
  of versions
* Example:
  If I get a request for r1beta5, look it up in the alias map
  and see what it should tie to.
  current:r1beta5,r1beta4 means the request needs to go to current.

Author: kallisti5

.gitignore

@@ -1,3 +1,4 @@
 
 /target
 **/*.rs.bk
+secrets-mount

Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.4.3
+VERSION ?= 0.4.4
 REGISTRY ?= ghcr.io/haiku
 ENGINE ?= podman
 default:
@@ -9,4 +9,5 @@ push:
 enter:
 	${ENGINE} run -it ${REGISTRY}/hpkgbouncer:$(VERSION) /bin/bash -l
 test:
-	${ENGINE} run -e ROCKET_LOG_LEVEL=debug -e ROCKET_ADDRESS=0.0.0.0 -v /home/kallisti5/secrets-mount:/run/secrets -P ${REGISTRY}/hpkgbouncer:$(VERSION)
+	${ENGINE} run -e ROCKET_LOG_LEVEL=debug -e ROCKET_ADDRESS=0.0.0.0 -e CACHE_TTL=900 -e S3_PUBLIC="https://haikuports-repository.cdn.haiku-os.org/" -e VERSION_ALIASES="current:r1beta5,r1beta4,r1beta3" -v ./secrets-mount:/run/secrets -P ${REGISTRY}/hpkgbouncer:$(VERSION)
+	#${ENGINE} run -e ROCKET_LOG_LEVEL=debug -e ROCKET_ADDRESS=0.0.0.0 -e CACHE_TTL=900 -e S3_PUBLIC="https://haikuports-repository.cdn.haiku-os.org/" -v ./secrets-mount:/run/secrets -P ${REGISTRY}/hpkgbouncer:$(VERSION)

README.md

@@ -40,6 +40,7 @@ This microservice expects repos in the following format:
   * S3_REGION - Bucket region (default "us-east-1")
   * S3_PREFIX - Prefix within bucket to repos with no leading / (default "", ex: "myrepos/")
   * PUBLIC_URL - Public URL of object storage. (default: S3_ENDPOINT + S3_BUCKET)
+  * VERSION_ALIASES - List of a target version followed by aliases. (ex: "current:ribeta5,r1beta4;whatever:thing")
 
 # Future Feature Ideas
 

src/routecache/mod.rs

@@ -21,6 +21,12 @@ use s3::creds::Credentials;
 
 use url::Url;
 
+#[derive(Clone, Debug)]
+pub struct AliasMap {
+pub target: String,
+pub versions: Vec<String>,
+}
+
 #[derive(Clone, Debug)]
 pub struct RouteConfig {
     pub s3_public: Option<String>,
@@ -31,6 +37,7 @@ pub struct RouteConfig {
     pub s3_key: Option<String>,
     pub s3_secret: Option<String>,
     pub s3_prefix: Option<String>,
+    pub version_alias_maps: Vec<AliasMap>,
 }
 
 #[derive(Clone, Debug, Eq)]
@@ -128,6 +135,7 @@ impl RouteConfig {
             s3_key: None,
             s3_secret: None,
             s3_prefix: None,
+            version_alias_maps: Vec::new(),
         }
     }
 
@@ -151,9 +159,39 @@ impl RouteConfig {
         // optional env vars
         self.s3_prefix = read_from_env("S3_PREFIX", false)?;
         self.s3_public = read_from_env("S3_PUBLIC", false)?;
+
         let cache_ttl = read_from_env("CACHE_TTL", false)?;
         self.cache_ttl = cache_ttl.unwrap_or("900".to_string()).parse::<u64>()?;
 
+        // parse any version aliases
+        let version_alias_raw = match read_from_env("VERSION_ALIASES", false)? {
+            Some(raw) => raw,
+            None => "".to_string(),
+        };
+        for field in version_alias_raw.split(';') {
+            let alias = field.to_string();
+            if alias.contains(":") {
+                let mut alias_maj_fields = alias.split(':').into_iter();
+                let target = match alias_maj_fields.next() {
+                    Some(t) => t.to_string(),
+                    None  => "".to_string(),
+                };
+                let aliases_raw = match alias_maj_fields.next() {
+                    Some(r) => r.to_string(),
+                    None    => "".to_string(),
+                };
+                let mut aliases: Vec<String> = Vec::new();
+                for minor in aliases_raw.split(',') {
+                    aliases.push(minor.to_string())
+                }
+                let map = AliasMap {
+                    target: target.to_string(),
+                    versions: aliases,
+                };
+                self.version_alias_maps.push(map);
+            }
+        }
+
         return Ok(());
     }
 
@@ -314,9 +352,17 @@ impl RouteCache {
             return self.version_latest(branch, arch);
         }
 
+        let mut actual_version = version.clone();
+        // First, we check for known aliases...
+        for alias in self.config.version_alias_maps.iter() {
+            if alias.versions.contains(&version) {
+                actual_version = alias.target.clone();
+            }
+        }
+
         // Otherwise just return requested version.
         for route in self.routes.iter() {
-            if route.branch == branch && route.arch == arch && route.version == version {
+            if route.branch == branch && route.arch == arch && route.version == actual_version {
                 return Some(route.clone());
             }
         }