You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by xy...@apache.org on 2020/02/22 23:28:00 UTC
[hadoop-ozone] branch master updated: HDDS-3057. Improve Ozone
Shell ACL operations' help text readability.
This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 48d1875 HDDS-3057. Improve Ozone Shell ACL operations' help text readability.
48d1875 is described below
commit 48d187542836f2adae64b0e68a22092abc589262
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Sat Feb 22 15:27:52 2020 -0800
HDDS-3057. Improve Ozone Shell ACL operations' help text readability.
---
.../web/ozShell/bucket/AddAclBucketHandler.java | 33 +++++++++++-----------
.../web/ozShell/bucket/GetAclBucketHandler.java | 4 +--
.../web/ozShell/bucket/RemoveAclBucketHandler.java | 33 +++++++++++-----------
.../web/ozShell/bucket/SetAclBucketHandler.java | 31 ++++++++++----------
.../ozone/web/ozShell/keys/AddAclKeyHandler.java | 33 +++++++++++-----------
.../ozone/web/ozShell/keys/GetAclKeyHandler.java | 4 +--
.../web/ozShell/keys/RemoveAclKeyHandler.java | 33 +++++++++++-----------
.../ozone/web/ozShell/keys/SetAclKeyHandler.java | 31 ++++++++++----------
.../web/ozShell/volume/AddAclVolumeHandler.java | 33 +++++++++++-----------
.../web/ozShell/volume/GetAclVolumeHandler.java | 4 +--
.../web/ozShell/volume/RemoveAclVolumeHandler.java | 33 +++++++++++-----------
.../web/ozShell/volume/SetAclVolumeHandler.java | 33 +++++++++++-----------
12 files changed, 157 insertions(+), 148 deletions(-)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java
index aa410af..476c7c1 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Add acl handler for bucket.
*/
@Command(name = "addacl",
- description = "Add a new Acl.")
+ description = "Add a new ACL.")
public class AddAclBucketHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class AddAclBucketHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "new acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The new ACL to be added.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class AddAclBucketHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "New acl to be added not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify a new ACL to be added.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureBucketAddress();
try (OzoneClient client =
@@ -93,8 +94,8 @@ public class AddAclBucketHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl added successfully.")
- : ("Acl already exists.");
+ ? ("ACL added successfully.")
+ : ("ACL already exists.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java
index 887a0f1..a3fc2fb 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java
@@ -37,7 +37,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Get acl handler for bucket.
*/
@Command(name = "getacl",
- description = "List all acls.")
+ description = "List all ACLs.")
public class GetAclBucketHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -45,7 +45,7 @@ public class GetAclBucketHandler extends Handler {
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java
index 1ec88f3..6359a77 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Executes Info bucket.
*/
@Command(name = "removeacl",
- description = "Remove an acl.")
+ description = "Remove an existing ACL.")
public class RemoveAclBucketHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class RemoveAclBucketHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "Remove acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The ACL to be removed.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class RemoveAclBucketHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "ACL to be removed not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify an ACL to be removed.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureBucketAddress();
try (OzoneClient client =
@@ -93,8 +94,8 @@ public class RemoveAclBucketHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl removed successfully.")
- : ("Acl doesn't exist.");
+ ? ("ACL removed successfully.")
+ : ("ACL doesn't exist.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java
index 68cb2be..eae1661 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Set acl handler for bucket.
*/
@Command(name = "setacl",
- description = "Set acls.")
+ description = "Set one or more ACLs, replacing the existing ones.")
public class SetAclBucketHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class SetAclBucketHandler extends Handler {
@CommandLine.Option(names = {"--acls", "-al"},
required = true,
- description = "Comma seperated acls." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw,user:user2:a,group:hadoop:a")
+ description = "A comma separated list of ACLs to be set.\n" +
+ "Ex: user:user1:rw,user:user2:a,group:hadoop:a\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acls;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class SetAclBucketHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acls, "Acls to be set not specified.");
+ Objects.requireNonNull(acls,
+ "You need to specify one or more ACLs to be set.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureBucketAddress();
try (OzoneClient client =
@@ -90,7 +91,7 @@ public class SetAclBucketHandler extends Handler {
.build();
client.getObjectStore().setAcl(obj, OzoneAcl.parseAcls(acls));
- System.out.println("Acl set successfully.");
+ System.out.println("ACL(s) set successfully.");
}
return null;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java
index b83cd7d..40c2b47 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Add acl handler for key.
*/
@Command(name = "addacl",
- description = "Add a new Acl.")
+ description = "Add a new ACL.")
public class AddAclKeyHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class AddAclKeyHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "Add acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The new ACL to be added.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class AddAclKeyHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "New acl to be added not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify a new ACL to be added.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureKeyAddress();
try (OzoneClient client =
@@ -96,8 +97,8 @@ public class AddAclKeyHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl added successfully.")
- : ("Acl already exists.");
+ ? ("ACL added successfully.")
+ : ("ACL already exists.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java
index 763a28b..bef6773 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java
@@ -37,7 +37,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Get acl handler for Key.
*/
@Command(name = "getacl",
- description = "List all acls.")
+ description = "List all ACLs.")
public class GetAclKeyHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -45,7 +45,7 @@ public class GetAclKeyHandler extends Handler {
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java
index afb1888..ec419cb 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Remove acl handler for key.
*/
@Command(name = "removeacl",
- description = "Remove an acl.")
+ description = "Remove an existing ACL.")
public class RemoveAclKeyHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class RemoveAclKeyHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "Remove acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The ACL to be removed.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class RemoveAclKeyHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "ACL to be removed not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify an ACL to be removed.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureKeyAddress();
try (OzoneClient client =
@@ -96,8 +97,8 @@ public class RemoveAclKeyHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl removed successfully.")
- : ("Acl doesn't exist.");
+ ? ("ACL removed successfully.")
+ : ("ACL doesn't exist.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java
index 5c22161..80d77d1 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Set acl handler for Key.
*/
@Command(name = "setacl",
- description = "Set acls.")
+ description = "Set one or more ACLs, replacing the existing ones.")
public class SetAclKeyHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class SetAclKeyHandler extends Handler {
@CommandLine.Option(names = {"--acls", "-al"},
required = true,
- description = "Comma separated acls." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw,user:user2:a,group:hadoop:a")
+ description = "A comma separated list of ACLs to be set.\n" +
+ "Ex: user:user1:rw,user:user2:a,group:hadoop:a\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acls;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class SetAclKeyHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acls, "New acls to be added not specified.");
+ Objects.requireNonNull(acls,
+ "You need to specify one or more ACLs to be set.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureKeyAddress();
try (OzoneClient client =
@@ -92,7 +93,7 @@ public class SetAclKeyHandler extends Handler {
.build();
client.getObjectStore().setAcl(obj, OzoneAcl.parseAcls(acls));
- System.out.println("Acl set successfully.");
+ System.out.println("ACL(s) set successfully.");
}
return null;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java
index b14c58b..dcf3527 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Add acl handler for volume.
*/
@Command(name = "addacl",
- description = "Add a new Acl.")
+ description = "Add a new ACL.")
public class AddAclVolumeHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class AddAclVolumeHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "Add acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The new ACL to be added.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class AddAclVolumeHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "New acl to be added not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify a new ACL to be added.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureVolumeAddress();
try (OzoneClient client =
@@ -90,8 +91,8 @@ public class AddAclVolumeHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl added successfully.")
- : ("Acl already exists.");
+ ? ("ACL added successfully.")
+ : ("ACL already exists.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java
index e575114..3e1ca57 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java
@@ -37,7 +37,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Get acl handler for volume.
*/
@Command(name = "getacl",
- description = "List all acls.")
+ description = "List all ACLs.")
public class GetAclVolumeHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -45,7 +45,7 @@ public class GetAclVolumeHandler extends Handler {
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java
index 2d412d6..741d5ff 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Remove acl handler for volume.
*/
@Command(name = "removeacl",
- description = "Remove an acl.")
+ description = "Remove an existing ACL.")
public class RemoveAclVolumeHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class RemoveAclVolumeHandler extends Handler {
@CommandLine.Option(names = {"--acl", "-a"},
required = true,
- description = "Remove acl." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw or group:hadoop:rw")
+ description = "The ACL to be removed.\n" +
+ "Ex: user:user1:rw or group:hadoop:rw\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acl;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class RemoveAclVolumeHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acl, "ACL to be removed not specified.");
+ Objects.requireNonNull(acl,
+ "You need to specify an ACL to be removed.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureVolumeAddress();
try (OzoneClient client =
@@ -90,8 +91,8 @@ public class RemoveAclVolumeHandler extends Handler {
OzoneAcl.parseAcl(acl));
String message = result
- ? ("Acl removed successfully.")
- : ("Acl doesn't exist.");
+ ? ("ACL removed successfully.")
+ : ("ACL doesn't exist.");
System.out.println(message);
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java
index 24141a3..a72198a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
* Set acl handler for volume.
*/
@Command(name = "setacl",
- description = "Set acls.")
+ description = "Set one or more ACLs, replacing the existing ones.")
public class SetAclVolumeHandler extends Handler {
@Parameters(arity = "1..1", description = Shell.OZONE_BUCKET_URI_DESCRIPTION)
@@ -44,22 +44,22 @@ public class SetAclVolumeHandler extends Handler {
@CommandLine.Option(names = {"--acls", "-al"},
required = true,
- description = "Comma separated acls." +
- "r = READ," +
- "w = WRITE," +
- "c = CREATE," +
- "d = DELETE," +
- "l = LIST," +
- "a = ALL," +
- "n = NONE," +
- "x = READ_AC," +
- "y = WRITE_AC" +
- "Ex user:user1:rw,user:user2:a,group:hadoop:a")
+ description = "A comma separated list of ACLs to be set.\n" +
+ "Ex: user:user1:rw,user:user2:a,group:hadoop:a\n" +
+ "r = READ, " +
+ "w = WRITE, " +
+ "c = CREATE, " +
+ "d = DELETE, " +
+ "l = LIST, " +
+ "a = ALL, " +
+ "n = NONE, " +
+ "x = READ_ACL, " +
+ "y = WRITE_ACL.")
private String acls;
@CommandLine.Option(names = {"--store", "-s"},
required = false,
- description = "store type. i.e OZONE or S3")
+ description = "Store type. i.e OZONE or S3")
private String storeType;
/**
@@ -67,7 +67,8 @@ public class SetAclVolumeHandler extends Handler {
*/
@Override
public Void call() throws Exception {
- Objects.requireNonNull(acls, "New acls to be added not specified.");
+ Objects.requireNonNull(acls,
+ "You need to specify one or more ACLs to be set.");
OzoneAddress address = new OzoneAddress(uri);
address.ensureVolumeAddress();
try (OzoneClient client =
@@ -93,8 +94,8 @@ public class SetAclVolumeHandler extends Handler {
OzoneAcl.parseAcls(acls));
String message = result
- ? ("Acl set successfully.")
- : ("Acl already set.");
+ ? ("ACL(s) set successfully.")
+ : ("ACL(s) already set.");
System.out.println(message);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org