Updated generate endpoints + run_es_docker

Author: ezimuel

util/GenerateEndpoints.php

@@ -40,11 +40,9 @@
     Client::VERSION
 );
 
-printf ("Backup Endpoints and Namespaces in /src\n");
+printf ("Backup Endpoints and Namespaces in:\n%s\n", $backupFileName);
 backup($backupFileName);
 
-cleanFolders();
-
 $start = microtime(true);
 printf ("Generating endpoints for Elasticsearch\n");
 
@@ -61,9 +59,16 @@
     ]
 );
 $files = explode("\n", $result);
-$outputDir = __DIR__ . "/../src/Elasticsearch/";
+
+$outputDir = __DIR__ . "/output";
+if (!file_exists($outputDir)) {
+    mkdir($outputDir);
+}
 
 $endpointDir = "$outputDir/Endpoints/";
+if (!file_exists($endpointDir)) {
+    mkdir($endpointDir);
+}
 
 $countEndpoint = 0;
 $namespaces = [];
@@ -88,8 +93,7 @@
     );
     if (!isValidPhpSyntax($outputFile)) {
         printf("Error: syntax error in %s\n", $outputFile);
-        $success = false;
-        break;
+        exit(1);
     }
 
     printf("done\n");
@@ -98,15 +102,12 @@
     $countEndpoint++;
 }
 
-if (!$success) {
-    printf ("Roll back to the previous Endpoints and Namespace (ver. %s)\n", Client::VERSION);
-    cleanFolders();
-    restore($backupFileName);
-    exit(1);
-}
-
 // Generate namespaces
 $namespaceDir = "$outputDir/Namespaces/";
+if (!file_exists($namespaceDir)) {
+    mkdir($namespaceDir);
+}
+
 $countNamespace = 0;
 $clientFile = "$outputDir/Client.php";
 
@@ -122,8 +123,7 @@
         );
         if (!isValidPhpSyntax($clientFile)) {
             printf("Error: syntax error in %s\n", $clientFile);
-            $success = false;
-            break;
+            exit(1);
         }
         $countNamespace++;
         continue;
@@ -139,29 +139,32 @@
     );
     if (!isValidPhpSyntax($namespaceFile)) {
         printf("Error: syntax error in %s\n", $namespaceFile);
-        $success = false;
-        break;
+        exit(1);
     }
     $countNamespace++;
 }
 
+$destDir = __DIR__ . "/../src/Elasticsearch";
+
+printf("Copying the generated files to %s\n", $destDir);
+cleanFolders();
+moveSubFolder($outputDir . "/Endpoints", $destDir . "/Endpoints");
+moveSubFolder($outputDir . "/Namespaces", $destDir . "/Namespaces");
+rename($outputDir . "/Client.php", $destDir . "/Client.php");
+
 $end = microtime(true);
-if ($success) {
-    printf("\nGenerated %d endpoints and %d namespaces in %.3f seconds\n.", $countEndpoint, $countNamespace, $end - $start);
-} else {
-    printf ("Roll back to the previous Endpoints and Namespace (ver. %s)\n", Client::VERSION);
-    cleanFolders();
-    restore($backupFileName);
-}  
+printf("\nGenerated %d endpoints and %d namespaces in %.3f seconds\n", $countEndpoint, $countNamespace, $end - $start);
+
+removeDirectory($outputDir);
 
 /**
- * FUNCTIONS
+ * ---------------------------------- FUNCTIONS ----------------------------------
  */
 
 /**
  * Remove a directory recursively
  */
- function removeDirectory($directory, array $omit = [])
+function removeDirectory($directory, array $omit = [])
 {
     foreach(glob("{$directory}/*") as $file)
     {
@@ -196,6 +199,16 @@ function cleanFolders()
     @unlink(__DIR__ . '/../src/Elasticsearch/Client.php');
 }
 
+/**
+ * Move subfolder
+ */
+function moveSubFolder(string $origin, string $destination)
+{
+    foreach (glob("{$origin}/*") as $file) {
+        rename($file, $destination . "/" . basename($file));
+    }
+}
+
 /**
  * Backup Endpoints, Namespaces and Client in src/Elasticsearch
  */

util/run_es_docker.sh

@@ -60,6 +60,7 @@ else
       --env "xpack.security.transport.ssl.certificate=certs/testnode.crt" \
       --env 'indices.lifecycle.history_index_enabled=false' \
       --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt" \
+      --env "xpack.ml.max_model_memory_limit=2gb" \
       --volume "$repo$testnodecrt:/usr/share/elasticsearch/config/certs/testnode.crt" \
       --volume "$repo$testnodekey:/usr/share/elasticsearch/config/certs/testnode.key" \
       --volume "$repo$cacrt:/usr/share/elasticsearch/config/certs/ca.crt" \