aboutsummaryrefslogtreecommitdiff
path: root/src/garage
diff options
context:
space:
mode:
Diffstat (limited to 'src/garage')
-rw-r--r--src/garage/admin.rs2
-rw-r--r--src/garage/cli/structs.rs6
-rw-r--r--src/garage/tests/common/garage.rs3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index c669b5e6..58d645ac 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -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,
diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs
index 825c1813..531501bf 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -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,
}
diff --git a/src/garage/tests/common/garage.rs b/src/garage/tests/common/garage.rs
index a539abb7..dbebe5b1 100644
--- a/src/garage/tests/common/garage.rs
+++ b/src/garage/tests/common/garage.rs
@@ -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();