Merge remote-tracking branch 'origin/main'

src/cli/config.rs

@@ -7,25 +7,32 @@ use crate::cli::prelude::*;
 
 #[derive(Subcommand)]
 pub enum Command {
-    /// Write the current config (without secrets) in TOML format
+    /// Show the current configuration in TOML format
-    Show,
+    Show(ShowArgs),
 
     /// Interactively setup a Taskr configuration
     Setup,
 }
 
-impl Command {
+#[derive(Args)]
-    pub async fn exec(&self, tasks: SharedTasks) -> Result<()> {
+pub struct ShowArgs {
-        match self {
+    #[arg(short, long, default_value = None)]
-            Command::Show => self.show(tasks).await,
+    pub include_secrets: bool,
-            Command::Setup => Self::setup(tasks).await,
 }
-    }
+impl ShowArgs {
-
     pub async fn show(&self, tasks: SharedTasks) -> Result<()> {
         println!("{}", toml::to_string_pretty(tasks.config()?)?);
         Ok(())
     }
+}
+
+impl Command {
+    pub async fn exec(&self, tasks: SharedTasks) -> Result<()> {
+        match self {
+            Command::Show(args) => args.show(tasks).await,
+            Command::Setup => Self::setup(tasks).await,
+        }
+    }
 
     pub async fn setup(stasks: SharedTasks) -> Result<()> {
         use cliclack::{intro, outro};

src/client.rs

@@ -3,35 +3,21 @@ use reqwest::{Client as RClient, Method, Url};
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware, RequestBuilder};
 use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
 use reqwest_tracing::TracingMiddleware;
-use serde::de;
+use serde::{de, Serialize};
 
 #[derive(Debug)]
 pub struct Client {
     client: ClientWithMiddleware,
     base_url: Url,
-
-    /// If true AND compiled in debug mode, debug traces will be output for requests and responses
-    debug: bool,
 }
 
 pub trait ResourceRequest {
-    async fn is_debug(&self) -> bool;
     async fn res<T: de::DeserializeOwned>(self) -> Result<T>;
 }
 
 impl ResourceRequest for RequestBuilder {
     async fn res<T: de::DeserializeOwned>(self) -> Result<T> {
-        use tracing::debug;
+        self.send().await?.json().await.map_err(|e| e.into())
-        let body = self.send().await?.text().await?;
-
-        if self.is_debug() {
-            #[cfg(debug_assertions)]
-            debug!(body);
-        }
-
-        serde_json::from_str(&body).map_err(|e| e.into())
-
-        // self.send().await?.json().await.map_err(|e| e.into())
     }
 }
 
@@ -74,7 +60,7 @@ impl Client {
         self.request::<T>(Method::GET, rel_url_path).await
     }
 
-    pub async fn post<T: de::DeserializeOwned, S: se::SerializeOwnded>(
+    pub async fn post<T: de::DeserializeOwned, S: Serialize>(
         &self,
         rel_url_path: &str,
         body: &S,

src/config.rs

@@ -34,6 +34,8 @@ pub struct Config {
     pub secrets: Secrets,
 }
 
+pub struct RevealedConfig {}
+
 impl Config {
     pub fn load(config_file_path: &Path) -> Result<Self> {
         let mut conf = Self::build(Self::builder(config_file_path)?)?;

src/gitlab.rs

@@ -3,8 +3,8 @@ use reqwest::{
     header::{HeaderMap, HeaderValue},
     Client as RClient,
 };
-
 use serde::Deserialize;
+use tracing::instrument;
 
 #[derive(Debug)]
 pub struct GitLab {
@@ -38,6 +38,7 @@ impl GitLab {
         Ok(Self { client })
     }
 
+    #[instrument]
     pub async fn me(&self) -> Result<User> {
         self.client.get("/user").await
     }