fix: ineffective region and endpoint profile entry

kxxt · Apr 5, 2023 · 11e9e7e · 11e9e7e
1 parent 6bdd3ab
commit 11e9e7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/cli/args.rs b/src/cli/args.rs
@@ -83,7 +83,7 @@ impl AuthArgs {
                         .map(get_endpoint_by_region)
                         .map(Cow::Owned)
                 })
-                .or_else(|| auth_config.and_then(|c| c.endpoint.as_ref().map(Cow::from)))
+                .or_else(|| auth_config.and_then(|c| c.endpoint_config.as_ref().map(Cow::from)))
                 .unwrap_or(Cow::Borrowed(DEFAULT_ENDPOINT)),
             token: match (self.token.as_deref(), auth_config) {
                 (Some(token), _) => Some(Cow::Borrowed(token)),

diff --git a/src/cli/config.rs b/src/cli/config.rs
@@ -65,16 +65,19 @@ impl Config {
     }
 }
 
+
 #[derive(Debug, Deserialize)]
 pub(crate) struct AuthConfig {
-    pub endpoint: Option<EndpointConfig>,
+    #[serde(flatten)]
+    pub endpoint_config: Option<EndpointConfig>,
     pub key: Option<String>,
     pub token: Option<String>,
     pub headers: Option<Vec<(String, String)>>,
     pub proxy: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
+#[serde(untagged)]
 pub(crate) enum EndpointConfig {
     Endpoint { endpoint: String },
     Region { region: String },

diff --git a/src/main.rs b/src/main.rs
@@ -102,7 +102,7 @@ fn main() -> color_eyre::eyre::Result<()> {
                     auth.region.as_deref().or_else(||
                         config.as_ref().and_then(
                             |c| c.auth.as_ref().and_then(
-                                |a| a.endpoint.as_ref().and_then(
+                                |a| a.endpoint_config.as_ref().and_then(
                                     |e| if let EndpointConfig::Region { ref region } =  e {
                                         Some(region.as_str())
                                     } else {