Read the aptly API URL from $APTLY_API_URL

This makes it easy to set the token and URL in one place. Signed-off-by: Ryan Gonzalez <[email protected]>
collabora · Jun 20, 2023 · bf695cf · bf695cf
1 parent 272fb3b
commit bf695cf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/aptly-rest/examples/aptlyrestcli.rs b/aptly-rest/examples/aptlyrestcli.rs
@@ -158,7 +158,12 @@ enum Action {
 
 #[derive(clap::Parser, Debug)]
 struct Opts {
-    #[clap(short = 'u', long, default_value = "http://localhost:8080")]
+    #[clap(
+        short = 'u',
+        long,
+        env = "APTLY_API_URL",
+        default_value = "http://localhost:8080"
+    )]
     api_url: Url,
     /// Authentication token for the API
     #[clap(long, env = "APTLY_API_TOKEN")]

diff --git a/aptlyctl/src/main.rs b/aptlyctl/src/main.rs
@@ -48,7 +48,12 @@ struct Opts {
     #[clap(subcommand)]
     command: Command,
     /// Url for the aptly rest API endpoint
-    #[clap(short = 'u', long, default_value = "http://localhost:8080")]
+    #[clap(
+        short = 'u',
+        long,
+        env = "APTLY_API_URL",
+        default_value = "http://localhost:8080"
+    )]
     api_url: url::Url,
     /// Authentication token for the API
     #[clap(long, env = "APTLY_API_TOKEN")]

diff --git a/obs2aptly/src/main.rs b/obs2aptly/src/main.rs
@@ -11,7 +11,12 @@ use tracing_subscriber::prelude::*;
 #[derive(Parser, Debug)]
 struct Opts {
     /// Url for the aptly rest api endpoint
-    #[clap(short, long, default_value = "http://localhost:8080")]
+    #[clap(
+        short = 'u',
+        long,
+        env = "APTLY_API_URL",
+        default_value = "http://localhost:8080"
+    )]
     api_url: url::Url,
     /// Authentication token for the API
     #[clap(long, env = "APTLY_API_TOKEN")]