Merge pull request BraneFramework#305 from BraneFramework/download

fix(ctl): Add nightly support for downloading services

Author: DanielVoogsgerd

Cargo.lock

@@ -24,6 +24,7 @@ human-panic = "2.0.0"
 humantime = "2.1.0"
 jsonwebtoken = "9.1.0"
 shlex = "1.3.0"
+semver = "1.0.0"
 tempfile = "3.10.1"
 
 # Workspace dependencies

brane-ctl/Cargo.toml

@@ -192,8 +192,8 @@ pub(crate) enum DownloadSubcommand {
         )]
         arch:    Arch,
         /// The version of the services to download.
-        #[clap(short, long, default_value=env!("CARGO_PKG_VERSION"), global=true, help="The version of the images to download from GitHub. You can specify 'latest' to download the latest version (but that might be incompatible with this CTL version)")]
-        version: Version,
+        #[clap(short, long, default_value=env!("CARGO_PKG_VERSION"), global=true, help="The version of the images to download from GitHub.")]
+        version: semver::Version,
         /// Whether to overwrite existing images or not.
         #[clap(
             short = 'F',

brane-ctl/src/cli.rs

@@ -25,7 +25,6 @@ use enum_debug::EnumDebug as _;
 use log::{debug, info, warn};
 use specifications::arch::Arch;
 use specifications::container::Image;
-use specifications::version::Version;
 use tempfile::TempDir;
 
 pub use crate::errors::DownloadError as Error;
@@ -169,7 +168,7 @@ pub async fn services(
     fix_dirs: bool,
     path: impl AsRef<Path>,
     arch: Arch,
-    version: Version,
+    version: semver::Version,
     force: bool,
     kind: DownloadServicesSubcommand,
 ) -> Result<(), Error> {
@@ -232,21 +231,21 @@ pub async fn services(
     match &kind {
         DownloadServicesSubcommand::Central => {
             // Resolve the address to use
-            let address: String = if version.is_latest() {
-                format!("https://github.com/braneframework/brane/releases/latest/download/instance-{}.tar.gz", arch.brane())
+            let address: String = if version.pre.as_str() == "nightly" {
+                format!("https://github.com/braneframework/brane/releases/download/nightly/central-instance-{}.tar.gz", arch.brane())
             } else {
-                format!("https://github.com/braneframework/brane/releases/download/v{}/instance-{}.tar.gz", version, arch.brane())
+                format!("https://github.com/braneframework/brane/releases/download/v{}/central-instance-{}.tar.gz", version, arch.brane())
             };
             debug!("Will download from: {}", address);
 
             // Hand it over the shared code
-            download_brane_services(address, path, format!("instance-{}", arch.brane()), force).await?;
+            download_brane_services(address, path, format!("central-instance-{}", arch.brane()), force).await?;
         },
 
         DownloadServicesSubcommand::Worker => {
             // Resolve the address to use
-            let address: String = if version.is_latest() {
-                format!("https://github.com/braneframework/brane/releases/latest/download/worker-instance-{}.tar.gz", arch.brane())
+            let address: String = if version.pre.as_str() == "nightly" {
+                format!("https://github.com/braneframework/brane/releases/download/nightly/worker-instance-{}.tar.gz", arch.brane())
             } else {
                 format!("https://github.com/braneframework/brane/releases/download/v{}/worker-instance-{}.tar.gz", version, arch.brane())
             };

brane-ctl/src/download.rs

@@ -16,6 +16,7 @@ clap_mangen = "0.2.26"
 directories = "6.0.0"
 flate2 = { version = "1.0.13" }
 paste = "1.0.0"
+semver = { version = "1.0.0" }
 tar = "0.4.21"
 toml = "0.8.8"
 
@@ -33,7 +34,6 @@ specifications = { workspace = true }
 # Optional
 humantime = { version = "2.1.0", optional = true }
 jsonwebtoken = { version = "9.1.0", optional = true }
-semver = { version = "1.0.0", optional = true }
 
 brane-cc = { workspace = true, optional = true }
 brane-cfg = { workspace = true, optional = true }
@@ -56,7 +56,7 @@ cli = [
     "dep:humantime",
     "dep:jsonwebtoken",
 ]
-ci = ["dep:semver"]
+ci = []
 
 [lints]
 workspace = true