Post Init Service Starter

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / perm / Grant.java

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Grant.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Grant.java
index ca958c2..f27a260 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Grant.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/perm/Grant.java
@@ -43,7 +43,7 @@ import aaf.v2_0.RolePermRequest;
  *
  */
 public class Grant extends Cmd {
-    private static final String[] options = {"grant","ungrant","setTo"};
+    private static final String[] options = {"grant","ungrant"};
 
     public Grant(Perm parent) {
         super(parent,null,
@@ -51,7 +51,7 @@ public class Grant extends Cmd {
             new Param("type",true),
             new Param("instance",true),
             new Param("action",true),
-            new Param("role[,role]* (!REQ S)",false)
+            new Param("role[,role]*",false)
             ); 
     }
 
@@ -74,63 +74,46 @@ public class Grant extends Cmd {
                 
                 Future<RolePermRequest> frpr = null;
         
-                if (option != 2) {
-                    String[] roles = args[idx++].split(",");
-                    String strA;
-                    String strB;
-                    for (String role : roles) {
-                        rpr.setRole(role);
-                        if (option==0) {
-                            // You can request to Grant Permission to a Role
-                            setQueryParamsOn(client);
-                            frpr = client.create(
-                                    "/authz/role/perm", 
-                                    getDF(RolePermRequest.class),
-                                    rpr
-                                    );
-                            strA = "Granted Permission [";
-                            strB = "] to Role [";
-                        } else {
-                            // You can request to UnGrant Permission to a Role
-                            setQueryParamsOn(client);
-                            frpr = client.delete(
-                                    "/authz/role/" + role + "/perm", 
-                                    getDF(RolePermRequest.class),
-                                    rpr
-                                    );
-                            strA = "UnGranted Permission [";
-                            strB = "] from Role [";
-                        }
-                        if (frpr.get(AAFcli.timeout())) {
-                            pw().println(strA + pk.getType() + '|' + pk.getInstance() + '|' + pk.getAction() 
-                                    + strB + role +']');
-                        } else {
-                            if (frpr.code()==202) {
-                                pw().print("Permission Role ");
-                                pw().print(option==0?"Granted":"Ungranted");
-                                pw().println(" Accepted, but requires Approvals before actualizing");
-                            } else {
-                                error(frpr);
-                                idx=Integer.MAX_VALUE;
-                            }            
-                        }
+                String[] roles = args[idx++].split(",");
+                String strA;
+                String strB;
+                for (String role : roles) {
+                    rpr.setRole(role);
+                    if (option==0) {
+                        // You can request to Grant Permission to a Role
+                        setQueryParamsOn(client);
+                        frpr = client.create(
+                                "/authz/role/perm", 
+                                getDF(RolePermRequest.class),
+                                rpr
+                                );
+                        strA = "Granted Permission [";
+                        strB = "] to Role [";
+                    } else {
+                        // You can request to UnGrant Permission to a Role
+                        setQueryParamsOn(client);
+                        frpr = client.delete(
+                                "/authz/role/" + role + "/perm", 
+                                getDF(RolePermRequest.class),
+                                rpr
+                                );
+                        strA = "UnGranted Permission [";
+                        strB = "] from Role [";
                     }
-                } else {
-                    String allRoles = "";
-                    if (idx < args.length) 
-                        allRoles = args[idx++];
-                        
-                    rpr.setRole(allRoles);
-                    frpr = client.update(
-                            "/authz/role/perm", 
-                            getDF(RolePermRequest.class), 
-                            rpr);
                     if (frpr.get(AAFcli.timeout())) {
-                        pw().println("Set Permission's Roles to [" + allRoles + "]");
+                        pw().println(strA + pk.getType() + '|' + pk.getInstance() + '|' + pk.getAction() 
+                                + strB + role +']');
                     } else {
-                        error(frpr);
-                    }            
-                } 
+                        if (frpr.code()==202) {
+                            pw().print("Permission Role ");
+                            pw().print(option==0?"Granted":"Ungranted");
+                            pw().println(" Accepted, but requires Approvals before actualizing");
+                        } else {
+                            error(frpr);
+                            idx=Integer.MAX_VALUE;
+                        }            
+                    }
+                }
                 return frpr==null?0:frpr.code();
             }
         });
@@ -138,16 +121,11 @@ public class Grant extends Cmd {
 
     @Override
     public void detailedHelp(int indent, StringBuilder sb) {
-        detailLine(sb,indent,"Grant a Permission to a Role or Roles  OR");
-        detailLine(sb,indent,"Ungrant a Permission from a Role or Roles  OR");
-        detailLine(sb,indent,"Set a Permission's roles to roles supplied.");
-        detailLine(sb,indent+4,"WARNING: Roles supplied with setTo will be the ONLY roles attached to this permission");
-        detailLine(sb,indent+8,"If no roles are supplied, permission's roles are reset.");
+        detailLine(sb,indent,"Grant a Permission to a Role or Roles OR");
+        detailLine(sb,indent,"Ungrant a Permission from a Role or Roles");
         detailLine(sb,indent,"see Create for definitions of type,instance and action");
         api(sb,indent,HttpMethods.POST,"authz/role/perm",RolePermRequest.class,true);
         api(sb,indent,HttpMethods.DELETE,"authz/role/<role>/perm",RolePermRequest.class,false);
-        api(sb,indent,HttpMethods.PUT,"authz/role/perm",RolePermRequest.class,false);
-
     }
 
 }