Alon Bar-Lev has posted comments on this change. Change subject: tools: extensions-tool: initial implementation aaa ......................................................................
Patch Set 1: (12 comments) https://gerrit.ovirt.org/#/c/41605/1/backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java File backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java: Line 158: private String getPassword() { Line 159: String password = null; Line 160: String passwordType = (String)actionArgs.get("password"); Line 161: Line 162: if(passwordType.startsWith("interactive")) { please split by ':' and compare to first component Line 163: System.out.print("Please enter password: "); Line 164: password = System.console().readLine(); Line 165: } else if(passwordType.startsWith("pass:")) { Line 166: password = passwordType.substring(5); Line 167: } else if(passwordType.startsWith("env:")) { Line 168: password = System.getenv(passwordType.substring(4)); Line 169: } else if(passwordType.startsWith("file:")) { Line 170: try { Line 171: try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(passwordType.substring(5)), Charset.forName("UTF-8")))) { . try ( InputStream is = new InputFileStream(x); Reader reader = new InputStreamReader(is); BufferedReader breader = new BufferedReader(reader) ) { } Line 172: password = reader.readLine(); Line 173: } Line 174: } catch (IOException ex) { Line 175: throw new RuntimeException(ex); Line 342: for (ExtMap result: results) { Line 343: if (entity.equals(Authz.QueryEntity.GROUP)) { Line 344: printGroupRecord(result); Line 345: } else { Line 346: printPrincipalRecord(result); not sure how principal record is related to query. Line 347: } Line 348: } Line 349: } Line 350: } Line 422: } Line 423: Line 424: private void printGroupRecord(ExtMap extMap) { Line 425: if (extMap != null) { Line 426: logger.info(String.format("GroupRecord: ID %s, name: %s, Display name: %s", every time you print a string, please also add single quotes '%s' Line 427: extMap.get(Authz.GroupRecord.ID, ""), Line 428: extMap.get(Authz.GroupRecord.NAME, ""), Line 429: extMap.get(Authz.GroupRecord.DISPLAY_NAME, "") Line 430: )); https://gerrit.ovirt.org/#/c/41605/1/backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java File backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java: changes in this file can be merged regardless of the aaa, please split to separate patch. Line 1: package org.ovirt.engine.exttool.core; Line 2: Line 3: import org.ovirt.engine.api.extensions.ExtMap; Line 4: import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; Line 85: exitStatus = e.getExitCode(); Line 86: } catch (Throwable t) { Line 87: String message = t.getMessage() != null ? t.getMessage() : t.getClass().getName(); Line 88: logger.error(message); Line 89: logger.debug("", t); "Exception:" Line 90: } Line 91: logger.debug("Exiting with status '{}'", exitStatus); Line 92: System.exit(exitStatus); Line 93: } Line 104: ); Line 105: } Line 106: Line 107: for(File f : files) { Line 108: logger.debug("Loading extension file {}", f.getName()); '{}' Line 109: try { Line 110: proxies.put(extensionsManager.load(f), null); Line 111: } catch (Exception ex) { Line 112: logger.error(ex.getMessage()); Line 109: try { Line 110: proxies.put(extensionsManager.load(f), null); Line 111: } catch (Exception ex) { Line 112: logger.error(ex.getMessage()); Line 113: logger.debug("", ex); "Exception:" Line 114: } Line 115: } Line 116: Line 117: for(Map.Entry<String, ExtensionProxy> entry : proxies.entrySet()) { Line 116: Line 117: for(Map.Entry<String, ExtensionProxy> entry : proxies.entrySet()) { Line 118: extensionsManager.initialize(entry.getKey()); Line 119: entry.setValue(extensionsManager.getExtensionByName(entry.getKey())); Line 120: logger.debug("Extension {} initilized", entry.getKey()); '{}' Line 121: } Line 122: } Line 123: Line 124: private static Map<String, ModuleService> loadModules(Class cls) { https://gerrit.ovirt.org/#/c/41605/1/backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java File backend/manager/extension-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java: changes in this file can be merged regardless of the aaa, please split to separate patch. Line 1: package org.ovirt.engine.exttool.core; Line 2: Line 3: import org.ovirt.engine.api.extensions.ExtKey; Line 4: import org.ovirt.engine.api.extensions.ExtMap; https://gerrit.ovirt.org/#/c/41605/1/packaging/conf/extension-tool-logging.properties File packaging/conf/extension-tool-logging.properties: changes in this file can be merged regardless of the aaa, please split to separate patch. Line 1: .level=INFO Line 2: handlers=java.util.logging.ConsoleHandler Line 3: java.util.logging.ConsoleHandler.level=ALL Line 4: java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter Line 6: # Default level for org.ovirt logger Line 7: org.ovirt.level=INFO Line 8: Line 9: # Default format of log line is: DATE TIME LEVEL [SOURCE] Message Stacktrace Line 10: java.util.logging.SimpleFormatter.format=[%4$-7s] %5$s%6$s%n please add new line -- To view, visit https://gerrit.ovirt.org/41605 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1811c5845bf02c30f1acd2938074070fb661af38 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ondra Machacek <[email protected]> Gerrit-Reviewer: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondra Machacek <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
