From e1f83d54fefb491265f39e812b5bc66e162c8b4f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 29 May 2024 08:04:33 -0500
Subject: [PATCH] Moar config stuff

---
 src/cli/config.rs | 27 +++++++++++++++++----------
 src/client.rs     |  5 +----
 src/config.rs     |  2 ++
 src/gitlab.rs     |  3 ++-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/cli/config.rs b/src/cli/config.rs
index 76789e6..de08b61 100644
--- a/src/cli/config.rs
+++ b/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,
+    /// Show the current configuration in TOML format
+    Show(ShowArgs),
 
     /// Interactively setup a Taskr configuration
     Setup,
 }
 
-impl Command {
-    pub async fn exec(&self, tasks: SharedTasks) -> Result<()> {
-        match self {
-            Command::Show => self.show(tasks).await,
-            Command::Setup => Self::setup(tasks).await,
-        }
-    }
-
+#[derive(Args)]
+pub struct ShowArgs {
+    #[arg(short, long, default_value = None)]
+    pub include_secrets: bool,
+}
+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};
diff --git a/src/client.rs b/src/client.rs
index 9cf8358..a359e86 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -17,15 +17,12 @@ pub trait ResourceRequest {
 
 impl ResourceRequest for RequestBuilder {
     async fn res<T: de::DeserializeOwned>(self) -> Result<T> {
-        // TODO: make this a field on this struct or something?
-        /*
         use tracing::debug;
         let body = self.send().await?.text().await?;
         debug!(body);
         serde_json::from_str(&body).map_err(|e| e.into())
-        */
 
-        self.send().await?.json().await.map_err(|e| e.into())
+        // self.send().await?.json().await.map_err(|e| e.into())
     }
 }
 
diff --git a/src/config.rs b/src/config.rs
index 2d9a761..1582018 100644
--- a/src/config.rs
+++ b/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)?)?;
diff --git a/src/gitlab.rs b/src/gitlab.rs
index 4cbc395..baaad14 100644
--- a/src/gitlab.rs
+++ b/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
     }