Skip to content

Commit

Permalink
Replace consulrs (#271)
Browse files Browse the repository at this point in the history
replace consulrs
  • Loading branch information
jondot authored May 12, 2024
1 parent 68be79c commit 6525dc8
Show file tree
Hide file tree
Showing 7 changed files with 193 additions and 245 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ notes/
tmp/
dist/
.DS_Store
*.profraw
211 changes: 111 additions & 100 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion teller-cli/tests/flow_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn build_providers() -> Test {
#[test]
#[cfg(not(windows))]
fn providers_smoke_test() {
use std::env;
use std::{env, time::Duration};

if env::var("RUNNER_OS").unwrap_or_default() == "macOS" {
return;
Expand All @@ -58,6 +58,9 @@ fn providers_smoke_test() {
let user = "linus";
let password = "torvalds123";
let vault_server: VaultServer = instance.server();
// banner is not enough for vault, we have to wait for the image to stabilize
tokio::time::sleep(Duration::from_secs(2)).await;

let localstack_server: LocalStackServer = instance.server();

fs::write(
Expand Down
6 changes: 4 additions & 2 deletions teller-providers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ aws_secretsmanager = ["aws", "dep:aws-sdk-secretsmanager"]
google_secretmanager = ["dep:google-secretmanager1", "dep:crc32c"]
hashicorp_vault = ["dep:vaultrs", "dep:rustify"]
dotenv = ["dep:dotenvy"]
hashicorp_consul = ["dep:consulrs"]
hashicorp_consul = ["dep:rs-consul"]
aws = ["dep:aws-config"]

[dependencies]
Expand All @@ -42,6 +42,8 @@ strum = { workspace = true }
thiserror = { workspace = true }
fs-err = "2.9.0"
home = "0.5.5"
hyper = "0.14"
base64 = "0.22.0"
# gcp
google-secretmanager1 = { version = "5.0.2", optional = true }
crc32c = { version = "0.6", optional = true }
Expand All @@ -57,7 +59,7 @@ dotenvy = { version = "0.15.7", optional = true }
vaultrs = { version = "0.7.2", optional = true }
rustify = { version = "0.5.3", optional = true }
# HashiCorp Consul
consulrs = { git = "https://github.com/jmgilman/consulrs", optional = true, rev = "a14fddbdf3695e2e338145134c4b42f823e03370" }
rs-consul = { version = "0.6.0", optional = true }

[dev-dependencies]
insta = { workspace = true }
Expand Down
Loading

0 comments on commit 6525dc8

Please sign in to comment.