Skip to content

Commit a59c7c9

Browse files
committed
refactor: rework fleet.nix secret bookkeeping
1 parent 2c5a4bd commit a59c7c9

File tree

17 files changed

+843
-432
lines changed

17 files changed

+843
-432
lines changed

Cargo.lock

Lines changed: 43 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ better-command = { path = "./crates/better-command" }
99
bifrostlink = "0.1.0"
1010
uuid = { version = "1.7.0", features = ["v4"] }
1111
tokio = { version = "1.36.0", features = ["fs", "rt", "macros", "sync", "time", "rt-multi-thread"] }
12-
12+
fleet-shared = { path = "./crates/fleet-shared" }

cmds/fleet/Cargo.toml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,15 @@ hostname = "0.3"
1919
age-core = "0.10"
2020
peg = "0.8"
2121
age = { version = "0.10", features = ["ssh", "armor"] }
22-
base64 = "0.21"
22+
base64 = "0.22.1"
2323
chrono = { version = "0.4", features = ["serde"] }
24-
z85 = "3.0"
25-
clap = { version = ">=4.4, <4.5", features = ["derive", "env", "wrap_help", "unicode"] }
24+
# Using fixed version for rust on stable nixos branches.
25+
clap = { version = ">=4.4, <4.5", features = [
26+
"derive",
27+
"env",
28+
"wrap_help",
29+
"unicode",
30+
] }
2631
tracing = "0.1"
2732
tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
2833
tokio-util = { version = "0.7", features = ["codec"] }
@@ -40,12 +45,18 @@ abort-on-drop = "0.2"
4045
unindent = "0.2"
4146
regex = "1.10"
4247
openssh = "0.10"
43-
crossterm = "0.27"
48+
crossterm = { version = "0.27.0", features = ["use-dev-tty"] }
49+
fleet-shared.workspace = true
4450

4551
tracing-indicatif = { version = "0.3", optional = true }
4652
human-repr = { version = "1.1", optional = true }
4753
indicatif = { version = "0.17", optional = true }
4854

4955
[features]
5056
# Not quite stable
51-
indicatif = ["tracing-indicatif", "dep:indicatif", "human-repr", "better-command/indicatif"]
57+
indicatif = [
58+
"tracing-indicatif",
59+
"dep:indicatif",
60+
"human-repr",
61+
"better-command/indicatif",
62+
]

0 commit comments

Comments
 (0)