Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace consulrs #271

Merged
merged 6 commits into from
May 12, 2024
Merged

Replace consulrs #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4bdf99
wip
jondot May 12, 2024
4e2a905
stabilize tests for colima
jondot May 12, 2024
facf2a3
Merge branch 'master' into replace-consulrs
jondot May 12, 2024
30c1e84
replace consul impl
jondot May 12, 2024
afb603e
replace consul impl
jondot May 12, 2024
6c30bdd
replace consul impl
jondot May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
Loading