Merge pull request #207 from open-runtimes/new-runtimes-group

Author: ChiragAgg5k

app/controllers.php

@@ -20,7 +20,7 @@
 use Utopia\Orchestration\Adapter\DockerAPI;
 
 Http::get('/v1/runtimes/:runtimeId/logs')
-    ->groups(['api'])
+    ->groups(['api', 'runtimes'])
     ->desc("Get live stream of logs of a runtime")
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->param('timeout', '600', new Text(16), 'Maximum logs timeout.', true)
@@ -119,7 +119,7 @@
     });
 
 Http::get('/v1/runtimes/:runtimeId')
-    ->groups(['api'])
+    ->groups(['api', 'runtimes'])
     ->desc("Get a runtime by its ID")
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->inject('runner')
@@ -130,7 +130,7 @@
     });
 
 Http::delete('/v1/runtimes/:runtimeId')
-    ->groups(['api'])
+    ->groups(['api', 'runtimes'])
     ->desc('Delete a runtime')
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->inject('response')
@@ -142,7 +142,7 @@
     });
 
 Http::post('/v1/runtimes/:runtimeId/executions')
-    ->groups(['api'])
+    ->groups(['api', 'runtimes'])
     ->alias('/v1/runtimes/:runtimeId/execution')
     ->desc('Create an execution')
     // Execution-related

app/http.php

@@ -8,7 +8,6 @@
 require_once __DIR__ . '/controllers.php';
 
 use OpenRuntimes\Executor\Runner\Docker;
-use OpenRuntimes\Executor\StorageFactory;
 use Swoole\Runtime;
 use Utopia\Console;
 use Utopia\Http\Http;
@@ -37,9 +36,8 @@
         System::getEnv('OPR_EXECUTOR_DOCKER_HUB_USERNAME', ''),
         System::getEnv('OPR_EXECUTOR_DOCKER_HUB_PASSWORD', '')
     ));
-    $storageFactory = new StorageFactory();
     $networks = explode(',', System::getEnv('OPR_EXECUTOR_NETWORK') ?: 'openruntimes-runtimes');
-    $runner = new Docker($orchestration, $storageFactory, $networks);
+    $runner = new Docker($orchestration, $networks);
     Http::setResource('runner', fn () => $runner);
 
     $payloadSize = 22 * (1024 * 1024);

src/Executor/Runner/Docker.php

@@ -28,24 +28,19 @@ class Docker extends Adapter
 {
     private Table $activeRuntimes;
     private Stats $stats;
-    private StorageFactory $storageFactory;
     /**
      * @var string[]
      */
     private array $networks;
 
     /**
      * @param Orchestration $orchestration
-     * @param StorageFactory $storageFactory
      * @param string[] $networks
      */
     public function __construct(
         private readonly Orchestration $orchestration,
-        StorageFactory $storageFactory,
         array $networks
     ) {
-        $this->storageFactory = $storageFactory;
-
         $this->activeRuntimes = new Table(4096);
 
         $this->activeRuntimes->column('version', Table::TYPE_STRING, 32);
@@ -461,7 +456,7 @@ public function createRuntime(
         $tmpLogging = "/{$tmpFolder}logging"; // Build logs
         $tmpLogs = "/{$tmpFolder}logs"; // Runtime logs
 
-        $sourceDevice = $this->storageFactory->getDevice("/", System::getEnv('OPR_EXECUTOR_CONNECTION_STORAGE'));
+        $sourceDevice = StorageFactory::getDevice("/", System::getEnv('OPR_EXECUTOR_CONNECTION_STORAGE'));
         $localDevice = new Local();
 
         try {
@@ -588,7 +583,7 @@ public function createRuntime(
                 $size = $localDevice->getFileSize($tmpBuild);
                 $container['size'] = $size;
 
-                $destinationDevice = $this->storageFactory->getDevice($destination, System::getEnv('OPR_EXECUTOR_CONNECTION_STORAGE'));
+                $destinationDevice = StorageFactory::getDevice($destination, System::getEnv('OPR_EXECUTOR_CONNECTION_STORAGE'));
                 $path = $destinationDevice->getPath(\uniqid() . '.' . \pathinfo($tmpBuild, PATHINFO_EXTENSION));
 
                 if (!$localDevice->transfer($tmpBuild, $path, $destinationDevice)) {

src/Executor/StorageFactory.php

@@ -23,7 +23,7 @@ class StorageFactory
      * @param ?string $connection DSN connection string. If empty or null, the local device will be used.
      * @return Device
      */
-    public function getDevice(string $root, ?string $connection = ''): Device
+    public static function getDevice(string $root, ?string $connection = ''): Device
     {
         $connection = $connection ?? '';
         $acl = 'private';