Fixes from Regression Tests

[aaf/authz.git] / auth / auth-cmd / src / main / java / org / onap / aaf / auth / cmd / user / Cred.java

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
index 1dfcc17..9ef4c00 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
@@ -3,13 +3,15 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,8 +44,7 @@ public class Cred extends Cmd {
     public static final String ATTEMPT_FAILED_SPECIFICS_WITHELD = "Attempt Failed.  Specifics witheld.";
     private static final String CRED_PATH = "/authn/cred";
     private static final String[] options = {"add","del","reset","extend"/*,"clean"*/};
-       private ErrMessage em;
-//     private RosettaDF<Error> errDF;
+    private ErrMessage em;
     public Cred(User parent) throws APIException {
         super(parent,"cred",
                 new Param(optionsToString(options),true),
@@ -55,21 +56,23 @@ public class Cred extends Cmd {
     }
 
     @Override
-    public int _exec(int _idx, final String ... args) throws CadiException, APIException, LocatorException { 
-        int idx = _idx;
+    public int _exec(int idxVar, final String ... args) throws CadiException, APIException, LocatorException {
+        int idx = idxVar;
         String key = args[idx++];
         final int option = whichOption(options,key);
 
         final CredRequest cr = new CredRequest();
         cr.setId(args[idx++]);
         if (option!=1 && option!=3) {
-            if (idx>=args.length) throw new CadiException("Password Required");
+            if (idx>=args.length) {
+                throw new CadiException("Password Required");
+            }
             cr.setPassword(args[idx++]);
         }
         if (args.length>idx) {
             cr.setEntry(args[idx]);
         }
-        
+
         // Set Start/End commands
         setStartEnd(cr);
         Integer ret = same(new Retryable<Integer>() {
@@ -80,8 +83,8 @@ public class Cred extends Cmd {
                 switch(option) {
                     case 0:
                         fp = client.create(
-                            CRED_PATH, 
-                            getDF(CredRequest.class), 
+                            CRED_PATH,
+                            getDF(CredRequest.class),
                             cr
                             );
                         verb = "Added Credential [";
@@ -122,19 +125,30 @@ public class Cred extends Cmd {
                     pw().println(']');
                 } else if (fp.code()==202) {
                         pw().println("Credential Action Accepted, but requires Approvals before actualizing");
-                } else if (fp.code()==300) {
-                       Error err = em.getError(fp);
-                       String text = err.getText();
-                       List<String> vars = err.getVariables();
-                       
-                       // IMPORTANT! We do this backward, because it is looking for string
-                       // %1 or %13.  If we replace %1 first, that messes up %13
-                       for(int i=vars.size()-1;i>0;--i) {
-                               text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + vars.get(i));
-                       }
+                } else if (fp.code()==300 || fp.code()==406) {
+                    Error err = em.getError(fp);
+                    String text = err.getText();
+                    List<String> vars = err.getVariables();
+
+                    // IMPORTANT! We do this backward, because it is looking for string
+                    // %1 or %13.  If we replace %1 first, that messes up %13
+                    String var;
+                    for(int i=vars.size()-1;i>0;--i) {
+                       var = vars.get(i);
+                       if(aafcli.isTest()) {
+                               int type = var.indexOf("U/P");
+                               if(type>0) {
+                                       var = var.substring(0,type+4) + "  XXXX/XX/XX XX:XX UTC  XXXXXXXXXXXXXXXXXX";
+                               }
+                       }
+                        text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + var);
+                    }
 
-                       text = text.replace("%1",vars.get(0));
-                       pw().println(text);
+                    text = text.replace("%1",vars.get(0));
+                    if(aafcli.isTest()) {
+                       
+                    }
+                    pw().println(text);
                 } else if (fp.code()==406 && option==1) {
                         pw().println("You cannot delete this Credential");
                 } else if (fp.code()==409 && option==0) {
@@ -145,13 +159,15 @@ public class Cred extends Cmd {
                 return fp.code();
             }
         });
-        if (ret==null)ret = -1;
+        if (ret==null) {
+            ret = -1;
+        }
         return ret;
     }
-    
+
     @Override
-    public void detailedHelp(int _indent, StringBuilder sb) {
-            int indent = _indent;
+    public void detailedHelp(int indentVar, StringBuilder sb) {
+            int indent = indentVar;
         detailLine(sb,indent,"Add, Delete or Reset Credential");
         indent+=2;
         detailLine(sb,indent,"id       - the ID to create/delete/reset within AAF");
@@ -164,7 +180,7 @@ public class Cred extends Cmd {
         sb.append('\n');
         detailLine(sb,indent,"NOTE: AAF does support multiple creds with the same ID. Check with your org if you");
         detailLine(sb,indent+2,"have this implemented. (For example, this is implemented for MechIDs at AT&T)");
-        sb.append('\n');            
+        sb.append('\n');
         detailLine(sb,indent,"*NOTE: com.att.csp is a reserved Domain for Global Sign On");
 
         detailLine(sb,indent,"Delegates can be listed by the User or by the Delegate");