Add --timeout (-to) as an option to securityadmin.sh (#5787)

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Darshit Chanpura <[email protected]>
Co-authored-by: Darshit Chanpura <[email protected]>

Author: cwperks

CHANGELOG.md

@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Resource Sharing] Keep track of resource_type on resource sharing document ([#5772](https://github.com/opensearch-project/security/pull/5772))
 - Add support for X509 v3 extensions (SAN) for authentication  ([#5701](https://github.com/opensearch-project/security/pull/5701))
 - [Resource Sharing] Requires default_owner for resource/migrate API ([#5789](https://github.com/opensearch-project/security/pull/5789))
+- Add --timeout (-to) as an option to securityadmin.sh ([#5787](https://github.com/opensearch-project/security/pull/5787))
 
 ### Bug Fixes
 - Create a WildcardMatcher.NONE when creating a WildcardMatcher with an empty string ([#5694](https://github.com/opensearch-project/security/pull/5694))

src/main/java/org/opensearch/security/tools/SecurityAdmin.java

@@ -226,6 +226,7 @@ public static int execute(final String[] args) throws Exception {
         options.addOption(
             Option.builder("p").longOpt("port").hasArg().argName("port").desc("OpenSearch transport port (default: 9200)").build()
         );
+        options.addOption(Option.builder("to").longOpt("timeout").hasArg().argName("timeout").desc("timeout (default: 30s)").build());
         options.addOption(
             Option.builder("cn")
                 .longOpt("clustername")
@@ -336,6 +337,7 @@ public static int execute(final String[] args) throws Exception {
 
         String hostname = "localhost";
         int port = 9200;
+        int timeout = 30;
         String kspass = System.getenv(OPENDISTRO_SECURITY_KS_PASS);
         String tspass = System.getenv(OPENDISTRO_SECURITY_TS_PASS);
         String cd = ".";
@@ -387,6 +389,7 @@ public static int execute(final String[] args) throws Exception {
 
             hostname = line.getOptionValue("h", hostname);
             port = Integer.parseInt(line.getOptionValue("p", String.valueOf(port)));
+            timeout = Integer.parseInt(line.getOptionValue("to", String.valueOf(timeout)));
 
             promptForPassword = line.hasOption("prompt");
 
@@ -869,7 +872,7 @@ public static int execute(final String[] args) throws Exception {
                     return (-1);
                 }
 
-                boolean success = uploadFile(restHighLevelClient, file, index, type, resolveEnvVars);
+                boolean success = uploadFile(restHighLevelClient, file, index, type, resolveEnvVars, timeout);
 
                 if (!success) {
                     System.out.println("ERR: cannot upload configuration, see errors above");
@@ -884,7 +887,7 @@ public static int execute(final String[] args) throws Exception {
                 return (success ? 0 : -1);
             }
 
-            return upload(restHighLevelClient, index, cd, expectedNodeCount, resolveEnvVars);
+            return upload(restHighLevelClient, index, cd, expectedNodeCount, resolveEnvVars, timeout);
         }
     }
 
@@ -959,9 +962,10 @@ private static boolean uploadFile(
         final String filepath,
         final String index,
         final String _id,
-        boolean resolveEnvVars
+        boolean resolveEnvVars,
+        int timeout
     ) {
-        return uploadFile(restHighLevelClient, filepath, index, _id, resolveEnvVars, false);
+        return uploadFile(restHighLevelClient, filepath, index, _id, resolveEnvVars, false, timeout);
     }
 
     private static boolean uploadFile(
@@ -970,7 +974,8 @@ private static boolean uploadFile(
         final String index,
         final String _id,
         boolean resolveEnvVars,
-        final boolean populateEmptyIfMissing
+        final boolean populateEmptyIfMissing,
+        int timeout
     ) {
 
         String id = _id;
@@ -988,6 +993,7 @@ private static boolean uploadFile(
             final String content = CharStreams.toString(reader);
             final String res = restHighLevelClient.index(
                 new IndexRequest(index).id(id)
+                    .timeout(timeout + "s")
                     .setRefreshPolicy(RefreshPolicy.IMMEDIATE)
                     .source(_id, readXContent(resolveEnvVars ? replaceEnvVars(content, Settings.EMPTY) : content, XContentType.YAML)),
                 RequestOptions.DEFAULT
@@ -1354,23 +1360,23 @@ private static int backup(RestHighLevelClient tc, String index, File backupDir)
         return success ? 0 : -1;
     }
 
-    private static int upload(RestHighLevelClient tc, String index, String cd, int expectedNodeCount, boolean resolveEnvVars)
+    private static int upload(RestHighLevelClient tc, String index, String cd, int expectedNodeCount, boolean resolveEnvVars, int timeout)
         throws IOException {
-        boolean success = uploadFile(tc, cd + "config.yml", index, "config", resolveEnvVars);
-        success = uploadFile(tc, cd + "roles.yml", index, "roles", resolveEnvVars) && success;
-        success = uploadFile(tc, cd + "roles_mapping.yml", index, "rolesmapping", resolveEnvVars) && success;
+        boolean success = uploadFile(tc, cd + "config.yml", index, "config", resolveEnvVars, timeout);
+        success = uploadFile(tc, cd + "roles.yml", index, "roles", resolveEnvVars, timeout) && success;
+        success = uploadFile(tc, cd + "roles_mapping.yml", index, "rolesmapping", resolveEnvVars, timeout) && success;
 
-        success = uploadFile(tc, cd + "internal_users.yml", index, "internalusers", resolveEnvVars) && success;
-        success = uploadFile(tc, cd + "action_groups.yml", index, "actiongroups", resolveEnvVars) && success;
+        success = uploadFile(tc, cd + "internal_users.yml", index, "internalusers", resolveEnvVars, timeout) && success;
+        success = uploadFile(tc, cd + "action_groups.yml", index, "actiongroups", resolveEnvVars, timeout) && success;
 
-        success = uploadFile(tc, cd + "tenants.yml", index, "tenants", resolveEnvVars) && success;
+        success = uploadFile(tc, cd + "tenants.yml", index, "tenants", resolveEnvVars, timeout) && success;
 
-        success = uploadFile(tc, cd + "nodes_dn.yml", index, "nodesdn", resolveEnvVars, true) && success;
+        success = uploadFile(tc, cd + "nodes_dn.yml", index, "nodesdn", resolveEnvVars, true, timeout) && success;
         if (new File(cd + "audit.yml").exists()) {
-            success = uploadFile(tc, cd + "audit.yml", index, "audit", resolveEnvVars) && success;
+            success = uploadFile(tc, cd + "audit.yml", index, "audit", resolveEnvVars, timeout) && success;
         }
         if (new File(cd + "allowlist.yml").exists()) {
-            success = uploadFile(tc, cd + "allowlist.yml", index, "allowlist", resolveEnvVars) && success;
+            success = uploadFile(tc, cd + "allowlist.yml", index, "allowlist", resolveEnvVars, timeout) && success;
         }
 
         if (!success) {