Merge pull request #200 from open-runtimes/refactor-extract-runtimes

Author: ChiragAgg5k

.env

@@ -1,7 +1,7 @@
 OPR_EXECUTOR_ENV=development
 OPR_EXECUTOR_IMAGE_PULL=enabled
 OPR_EXECUTOR_RUNTIMES=php-8.1,dart-2.18,deno-1.24,node-18.0,python-3.10,ruby-3.1,cpp-17,dotnet-6.0
-OPR_EXECUTOR_CONNECTION_STORAGE=
+OPR_EXECUTOR_CONNECTION_STORAGE=local://localhost
 OPR_EXECUTOR_INACTIVE_THRESHOLD=60
 OPR_EXECUTOR_MAINTENANCE_INTERVAL=60
 OPR_EXECUTOR_NETWORK=executor_runtimes

.github/workflows/tests.yml

@@ -2,8 +2,29 @@ name: "Tests"
 
 on: [pull_request]
 jobs:
-  tests:
-    name: Tests
+  unit-tests:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Run Unit Tests
+      run: |
+        docker run --rm \
+          -v $PWD:/app \
+          -w /app \
+          phpswoole/swoole:5.1.2-php8.3-alpine \
+          sh -c "
+            apk update && \
+            apk add zip unzip && \
+            composer install --profile --ignore-platform-reqs && \
+            composer test -- --testsuite=unit
+          "
+
+  executor-tests:
+    name: Executor Tests
     runs-on: ubuntu-latest
 
     steps:
@@ -27,7 +48,7 @@ jobs:
         docker ps
         docker network ls
 
-    - name: Run Tests
+    - name: Run Executor Tests
       run: |
         docker run --rm \
           -v $PWD:/app \
@@ -40,5 +61,5 @@ jobs:
             apk update && \
             apk add docker-cli zip unzip && \
             composer install --profile --ignore-platform-reqs && \
-            composer test
+            composer test -- --testsuite=e2e
           "

app/http.php

@@ -8,6 +8,7 @@
 require_once __DIR__ . '/controllers.php';
 
 use OpenRuntimes\Executor\Runner\Docker;
+use OpenRuntimes\Executor\Runner\Repository\Runtimes;
 use Swoole\Runtime;
 use Utopia\Console;
 use Utopia\Http\Http;
@@ -25,19 +26,22 @@
 Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL);
 
 Http::setMode((string)System::getEnv('OPR_EXECUTOR_ENV', Http::MODE_TYPE_PRODUCTION));
+
 Http::onRequest()
     ->inject('response')
     ->action(function (Response $response) {
         $response->addHeader('Server', 'Executor');
     });
 
+
 run(function () {
     $orchestration = new Orchestration(new DockerAPI(
         System::getEnv('OPR_EXECUTOR_DOCKER_HUB_USERNAME', ''),
         System::getEnv('OPR_EXECUTOR_DOCKER_HUB_PASSWORD', '')
     ));
     $networks = explode(',', System::getEnv('OPR_EXECUTOR_NETWORK') ?: 'openruntimes-runtimes');
-    $runner = new Docker($orchestration, $networks);
+    $runner = new Docker($orchestration, new Runtimes(), $networks);
+
     Http::setResource('runner', fn () => $runner);
 
     $payloadSize = 22 * (1024 * 1024);

composer.json

@@ -23,7 +23,7 @@
     "appwrite/php-runtimes": "0.19.*",
     "utopia-php/config": "^0.2.2",
     "utopia-php/console": "0.0.*",
-    "utopia-php/dsn": "0.1.*",
+    "utopia-php/dsn": "0.2.*",
     "utopia-php/fetch": "0.4.*",
     "utopia-php/framework": "0.34.*",
     "utopia-php/logger": "0.6.*",

composer.lock

@@ -1,16 +1,20 @@
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true"
-        >
+<phpunit
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="true"
+>
     <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="e2e">
+            <file>./tests/ExecutorTest.php</file>
+        </testsuite>
+        <testsuite name="unit">
+            <directory>./tests/unit</directory>
         </testsuite>
     </testsuites>
 </phpunit>