mirrors/garage
1
0
Fork 0
mirror of https://git.deuxfleurs.fr/Deuxfleurs/garage.git synced 2024-11-25 01:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

more fixes

Browse source
This commit is contained in:
Alex Auvolat 2023-01-26 17:14:17 +01:00
parent 1dff62564f
commit 3113f6b5f2
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/garage/cli/init.rs
View file

@ -14,11 +14,11 @@ pub fn node_id_command(config_file: PathBuf, quiet: bool) -> Result<(), Error> {
garage_rpc::system::read_node_id(&config.metadata_dir).err_context(READ_KEY_ERROR)?; garage_rpc::system::read_node_id(&config.metadata_dir).err_context(READ_KEY_ERROR)?;
let idstr = if let Some(addr) = config.rpc_public_addr { let idstr = if let Some(addr) = config.rpc_public_addr {
let idstr = format!("{}@{}", hex::encode(&node_id), addr); let idstr = format!("{}@{}", hex::encode(node_id), addr);
println!("{}", idstr); println!("{}", idstr);
idstr idstr
} else { } else {
let idstr = hex::encode(&node_id); let idstr = hex::encode(node_id);
println!("{}", idstr); println!("{}", idstr);
if !quiet { if !quiet {

2
src/garage/cli/util.rs
View file

@ -229,7 +229,7 @@ pub fn find_matching_node(
) -> Result<Uuid, Error> { ) -> Result<Uuid, Error> {
let mut candidates = vec![]; let mut candidates = vec![];
for c in cand { for c in cand {
if hex::encode(&c).starts_with(&pattern) && !candidates.contains(&c) { if hex::encode(c).starts_with(pattern) && !candidates.contains(&c) {
candidates.push(c); candidates.push(c);
} }
} }

7
src/garage/tests/k2v/poll.rs
View file

@ -1,3 +1,4 @@
use base64::prelude::*;
use hyper::{Method, StatusCode}; use hyper::{Method, StatusCode};
use std::time::Duration; use std::time::Duration;
@ -160,7 +161,7 @@ async fn test_poll_range() {
json!( json!(
{ {
"items": [ "items": [
{"sk": "test1", "ct": ct, "v": [base64::encode(b"Initial value")]}, {"sk": "test1", "ct": ct, "v": [BASE64_STANDARD.encode(b"Initial value")]},
], ],
"seenMarker": seen_marker, "seenMarker": seen_marker,
} }
@ -212,7 +213,7 @@ async fn test_poll_range() {
assert_json_eq!(&json_res["items"][0]["sk"], json!("test1")); assert_json_eq!(&json_res["items"][0]["sk"], json!("test1"));
assert_json_eq!( assert_json_eq!(
&json_res["items"][0]["v"], &json_res["items"][0]["v"],
json!([base64::encode(b"New value")]) json!([BASE64_STANDARD.encode(b"New value")])
); );
// Now we will add a value on a different key // Now we will add a value on a different key
@ -259,6 +260,6 @@ async fn test_poll_range() {
assert_json_eq!(&json_res["items"][0]["sk"], json!("test2")); assert_json_eq!(&json_res["items"][0]["sk"], json!("test2"));
assert_json_eq!( assert_json_eq!(
&json_res["items"][0]["v"], &json_res["items"][0]["v"],
json!([base64::encode(b"Other value")]) json!([BASE64_STANDARD.encode(b"Other value")])
); );
} }

6
src/garage/tests/s3/website.rs
View file

@ -57,7 +57,7 @@ async fn test_website() {
Request::builder() Request::builder()
.method("GET") .method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
.header("domain", format!("{}", BCKT_NAME)) .header("domain", BCKT_NAME.to_string())
.body(Body::empty()) .body(Body::empty())
.unwrap() .unwrap()
}; };
@ -92,7 +92,7 @@ async fn test_website() {
Request::builder() Request::builder()
.method("GET") .method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
.header("domain", format!("{}", BCKT_NAME)) .header("domain", BCKT_NAME.to_string())
.body(Body::empty()) .body(Body::empty())
.unwrap() .unwrap()
}; };
@ -121,7 +121,7 @@ async fn test_website() {
Request::builder() Request::builder()
.method("GET") .method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port)) .uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
.header("domain", format!("{}", BCKT_NAME)) .header("domain", BCKT_NAME.to_string())
.body(Body::empty()) .body(Body::empty())
.unwrap() .unwrap()
}; };