aboutsummaryrefslogtreecommitdiff
path: root/src/garage
diff options
context:
space:
mode:
authorJonathan Davies <jpds@protonmail.com>2023-01-02 13:35:26 +0000
committerJonathan Davies <jpds@protonmail.com>2023-01-03 11:11:12 +0000
commit8be862aa193ebe3081d1a74c3c5fc493ae9c82b0 (patch)
treedbde848687e922dee1510c9042d58c21a1251694 /src/garage
parent76230f20282e73a5a5afa33af68152acaf732cf5 (diff)
downloadgarage-8be862aa193ebe3081d1a74c3c5fc493ae9c82b0.tar.gz
garage-8be862aa193ebe3081d1a74c3c5fc493ae9c82b0.zip
Changed all instances of 'key new' to 'key create' to make it consistent as bucket commands issued normally around the same time.
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 1ca3698a..af9e9ea9 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -571,7 +571,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 e2f632f3..fe2c2a26 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -320,8 +320,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())]
@@ -353,7 +353,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 44d727f9..730d5889 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();