diff options
| author | Alex <alex@adnab.me> | 2023-01-04 10:35:49 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-01-04 10:35:49 +0000 |
| commit | 80e4abb98dfbf2e88414a8b28e8c9134fa0a65e7 (patch) | |
| tree | 5e3ca67d106e5a5aa5c1749045c78060105fc8a2 /src/garage | |
| parent | 570e5e5bbb7a3eac41350db9433e28ed289b97f4 (diff) | |
| parent | 8be862aa193ebe3081d1a74c3c5fc493ae9c82b0 (diff) | |
| download | garage-80e4abb98dfbf2e88414a8b28e8c9134fa0a65e7.tar.gz garage-80e4abb98dfbf2e88414a8b28e8c9134fa0a65e7.zip | |
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
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/admin.rs | 2 | ||||
| -rw-r--r-- | src/garage/cli/structs.rs | 6 | ||||
| -rw-r--r-- | src/garage/tests/common/garage.rs | 3 |
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(); |