bumped versions, temp fixed auto-destroy-at field issue

06chaynes · Nov 2, 2023 · e2061e6 · e2061e6
1 parent dff83ba
commit e2061e6
Show file tree

Hide file tree

Showing 14 changed files with 203 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,11 +5,11 @@ members = [
     "examples/tfc-report-tui",
     "examples/tfc-run-workspace",
     "examples/tfc-variable-set",
-    "examples/tfc-which-workspace"
-,
+    "examples/tfc-which-workspace",
     "tfc-toolset",
     "tfc-toolset-extras",
-    "tfct"]
+    "tfct"
+]
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]

diff --git a/examples/tfc-clean-workspace/Cargo.toml b/examples/tfc-clean-workspace/Cargo.toml
@@ -22,18 +22,18 @@ path = "src/lib.rs"
 anyhow = "1.0.75"
 async-scoped = { version = "0.7.1", features = ["use-async-std"] }
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 config = "0.13.3"
 env_logger = "0.10.0"
 git2 = { version = "0.18.1", features = ["vendored-libgit2", "vendored-openssl"] }
 git2_credentials = "0.13.0"
 hcl-rs = "0.16.6"
 log = "0.4.20"
 miette = { version = "5.10.0", features = ["fancy"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 url = "2.4.1"
 walkdir = "2.4.0"
 
@@ -43,8 +43,8 @@ version = "0.1.0"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-toolset-extras]
 path = "../../tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"
diff --git a/examples/tfc-report-tui/Cargo.toml b/examples/tfc-report-tui/Cargo.toml
@@ -17,10 +17,10 @@ path = "src/main.rs"
 [dependencies]
 crossterm = { version = "0.27.0", features = [ "serde" ] }
 miette = { version = "5.10.0", features = ["fancy"] }
-ratatui = { version = "0.23.0", default-features = false, features = ['crossterm', 'serde'] }
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
-thiserror = "1.0.49"
+ratatui = { version = "0.24.0", default-features = false, features = ['crossterm', 'serde'] }
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
+thiserror = "1.0.50"
 unicode-width = "0.1.11"
 
 [dependencies.tfc-clean-workspace]
@@ -37,7 +37,7 @@ version = "0.1.0"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-which-workspace]
 path = "../tfc-which-workspace"

diff --git a/examples/tfc-report-tui/src/main.rs b/examples/tfc-report-tui/src/main.rs
@@ -227,7 +227,7 @@ fn run_app<B: Backend>(
     }
 }
 
-fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
+fn ui(f: &mut Frame, app: &mut App) {
     let menu_titles = ["Home", "Info", "Workspaces", "Quit"];
     let size = f.size();
     let chunks = Layout::default()

diff --git a/examples/tfc-report/Cargo.toml b/examples/tfc-report/Cargo.toml
@@ -15,12 +15,12 @@ name = "tfc_report"
 path = "src/lib.rs"
 
 [dependencies]
-log = "0.4.14"
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+log = "0.4.20"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 
diff --git a/examples/tfc-run-workspace/Cargo.toml b/examples/tfc-run-workspace/Cargo.toml
@@ -21,15 +21,15 @@ path = "src/lib.rs"
 [dependencies]
 anyhow = "1.0.75"
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 config = "0.13.3"
 env_logger = "0.10.0"
 log = "0.4.20"
 miette = { version = "5.10.0", features = ["fancy"] }
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 url = "2.4.1"
 
 [dependencies.tfc-report]
@@ -38,8 +38,8 @@ version = "0.1.0"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-toolset-extras]
 path = "../../tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"
diff --git a/examples/tfc-variable-set/Cargo.toml b/examples/tfc-variable-set/Cargo.toml
@@ -21,15 +21,15 @@ path = "src/lib.rs"
 [dependencies]
 anyhow = "1.0.75"
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 config = "0.13.3"
 env_logger = "0.10.0"
 log = "0.4.20"
 miette = { version = "5.10.0", features = ["fancy"] }
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 url = "2.4.1"
 
 [dependencies.tfc-report]
@@ -38,8 +38,8 @@ version = "0.1.0"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-toolset-extras]
 path = "../../tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"
diff --git a/examples/tfc-which-workspace/Cargo.toml b/examples/tfc-which-workspace/Cargo.toml
@@ -25,10 +25,10 @@ config = "0.13.3"
 env_logger = "0.10.0"
 log = "0.4.20"
 miette = { version = "5.10.0", features = ["fancy"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 url = "2.4.1"
 
 [dependencies.tfc-report]
@@ -37,8 +37,8 @@ version = "0.1.0"
 
 [dependencies.tfc-toolset]
 path = "../../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-toolset-extras]
 path = "../../tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"
diff --git a/tfc-toolset-extras/Cargo.toml b/tfc-toolset-extras/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"
 description = "Extra stuff for tfc-toolset you may or may not want to use"
 authors = ["Christian Haynes <[email protected]>"]
 repository = "https://github.com/06chaynes/tfc-toolset.git"
+homepage = "https://tfc-toolset.rs"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 edition = "2021"
@@ -14,17 +15,17 @@ anyhow = "1.0.75"
 async-scoped = { version = "0.7.1", features = ["use-async-std"] }
 config = "0.13.3"
 dirs = "5.0.1"
-http-cache-surf = "0.11.4"
+http-cache-surf = "0.12.0"
 log = "0.4.20"
 regex = "1.10.2"
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["h1-client-rustls"] }
 surf-governor = "0.2.0"
 surf-retry = "0.3.2"
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 url = "2.4.1"
 
 [dependencies.tfc-toolset]
 path = "../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
diff --git a/tfc-toolset-extras/src/lib.rs b/tfc-toolset-extras/src/lib.rs
@@ -40,6 +40,8 @@ pub fn build_cache_options() -> HttpCacheOptions {
             ignore_cargo_cult: false,
         }),
         cache_key: None,
+        cache_mode_fn: None,
+        cache_bust: None,
     }
 }
 

diff --git a/tfc-toolset/Cargo.toml b/tfc-toolset/Cargo.toml
@@ -1,11 +1,16 @@
 [package]
 name = "tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 description = "A toolset to help manage a toolset that helps manage your deployments"
 authors = ["Christian Haynes <[email protected]>"]
 repository = "https://github.com/06chaynes/tfc-toolset.git"
+homepage = "https://tfc-toolset.rs"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
+keywords = ["terraform", "cloud", "api", "toolset"]
+categories = [
+    "api-bindings"
+]
 edition = "2021"
 rust-version = "1.67.1"
 
@@ -16,9 +21,9 @@ async-std = { version = "1.12.0", default-features = false }
 config = "0.13.3"
 dashmap = { version = "5.5.3", features = ["serde"] }
 log = "0.4.20"
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 time = { version = "0.3.30", features = ["serde", "parsing", "formatting", "serde-well-known"] }
 url = "2.4.1"
diff --git a/tfc-toolset/src/workspace.rs b/tfc-toolset/src/workspace.rs
@@ -158,7 +158,10 @@ pub struct Attributes {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_apply: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(with = "time::serde::rfc3339::option")]
+    // This seems to make the field required in the JSON
+    // Would be nice to have a way to make it optional
+    // commented it out for now
+    //#[serde(with = "time::serde::rfc3339::option")]
     pub auto_destroy_at: Option<OffsetDateTime>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,

diff --git a/tfct/Cargo.toml b/tfct/Cargo.toml
@@ -1,11 +1,16 @@
 [package]
 name = "tfct"
-version = "0.1.0-alpha3"
+version = "0.1.0-alpha4"
 description = "A tool to help manage a toolset that helps manage your deployments"
 authors = ["Christian Haynes <[email protected]>"]
 repository = "https://github.com/06chaynes/tfc-toolset.git"
+homepage = "https://tfc-toolset.rs"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
+keywords = ["terraform", "cloud", "api", "toolset"]
+categories = [
+    "command-line-utilities"
+]
 edition = "2021"
 rust-version = "1.67.1"
 
@@ -16,22 +21,22 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0.75"
 async-std = { version = "1.12.0", features = ["attributes"] }
-clap = { version = "4.4.6", features = ["derive", "wrap_help"] }
+clap = { version = "4.4.7", features = ["derive", "wrap_help"] }
 config = "0.13.3"
 env_logger = "0.10.0"
 log = "0.4.20"
 miette = { version = "5.10.0", features = ["fancy"] }
-serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.107"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
 surf = { version = "2.3.2", default-features = false, features = ["encoding", "h1-client-rustls"] }
-thiserror = "1.0.49"
+thiserror = "1.0.50"
 time = { version = "0.3.30", features = ["serde", "parsing", "formatting", "serde-well-known"] }
 url = "2.4.1"
 
 [dependencies.tfc-toolset]
 path = "../tfc-toolset"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.tfc-toolset-extras]
 path = "../tfc-toolset-extras"
-version = "0.1.0"
+version = "0.2.0"