Merge pull request 'Changed all instances of 'key new' to 'key create' to make it the same as the bucket commands.' (#459) from jpds/garage:key-create-standardize into next

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/459
This commit is contained in:
Alex
2023-01-04 10:35:49 +00:00
8 changed files with 14 additions and 15 deletions
+1 -1
View File
@@ -577,7 +577,7 @@ impl AdminRpcHandler {
match cmd {
KeyOperation::List => self.handle_list_keys().await,
KeyOperation::Info(query) => self.handle_key_info(query).await,
KeyOperation::New(query) => self.handle_create_key(query).await,
KeyOperation::Create(query) => self.handle_create_key(query).await,
KeyOperation::Rename(query) => self.handle_rename_key(query).await,
KeyOperation::Delete(query) => self.handle_delete_key(query).await,
KeyOperation::Allow(query) => self.handle_allow_key(query).await,
+3 -3
View File
@@ -331,8 +331,8 @@ pub enum KeyOperation {
Info(KeyOpt),
/// Create new key
#[structopt(name = "new", version = garage_version())]
New(KeyNewOpt),
#[structopt(name = "create", version = garage_version())]
Create(KeyNewOpt),
/// Rename key
#[structopt(name = "rename", version = garage_version())]
@@ -364,7 +364,7 @@ pub struct KeyOpt {
#[derive(Serialize, Deserialize, StructOpt, Debug)]
pub struct KeyNewOpt {
/// Name of the key
#[structopt(long = "name", default_value = "Unnamed key")]
#[structopt(default_value = "Unnamed key")]
pub name: String,
}
+1 -2
View File
@@ -172,8 +172,7 @@ api_bind_addr = "127.0.0.1:{admin_port}"
let output = self
.command()
.args(["key", "new"])
.args(["--name", name])
.args(["key", "create", name])
.expect_success_output("Could not create key");
let stdout = String::from_utf8(output.stdout).unwrap();