Merge pull request #146 from open-runtimes/upgrade-opr-v5

Upgrade to OPR v5

Author: Meldiron

.env

@@ -11,6 +11,6 @@ OPR_EXECUTOR_LOGGING_PROVIDER=
 OPR_EXECUTOR_LOGGING_CONFIG=
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
 OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
-OPR_EXECUTOR_RUNTIME_VERSIONS=v4,v4rc
+OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v5
 OPR_EXECUTOR_RETRY_ATTEMPTS=5
 OPR_EXECUTOR_RETRY_DELAY_MS=500

README.md

@@ -90,7 +90,7 @@ OPR_EXECUTOR_LOGGING_PROVIDER=
 OPR_EXECUTOR_LOGGING_CONFIG=
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
 OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
-OPR_EXECUTOR_RUNTIME_VERSIONS=v4
+OPR_EXECUTOR_RUNTIME_VERSIONS=v5
 OPR_EXECUTOR_RETRY_ATTEMPTS=5
 OPR_EXECUTOR_RETRY_DELAY_MS=500
 ```
@@ -161,7 +161,7 @@ docker compose down
 | `remove` | `boolean` | Remove a runtime after execution |  | false |
 | `cpus` | `float` | Maximum CPU cores runtime can utilize |  | 1 |
 | `memory` | `integer` | Container RAM memory in MBs |  | 512 |
-| `version` | `string` | Runtime Open Runtime version (allowed values: 'v2', 'v4') |  | 'v4' |
+| `version` | `string` | Runtime Open Runtime version (allowed values: 'v2', 'v5') |  | 'v5' |
 
 #### /v1/runtimes/{runtimeId}
 | Param | Type | Description | Required | Default |
@@ -183,7 +183,7 @@ docker compose down
 | `variables` | `json` | Environment variables passed into runtime |  | [ ] |
 | `cpus` | `floats` | Maximum CPU cores runtime can utilize |  | 1 |
 | `memory` | `integer` | Container RAM memory in MBs |  | 512 |
-| `version` | `string` | Runtime Open Runtime version (allowed values: 'v2', 'v4') |  | 'v4' |
+| `version` | `string` | Runtime Open Runtime version (allowed values: 'v2', 'v5') |  | 'v5' |
 | `runtimeEntrypoint` | `string` | Commands to run when creating a container. Maximum of 100 commands are allowed, each 1024 characters long. |  | ' ' |
 
 ## Environment variables
@@ -201,7 +201,7 @@ docker compose down
 | OPR_EXECUTOR_LOGGING_CONFIG       | External logging provider DSN used by the executor, ex: `sentry://PROJECT_ID:SENTRY_API_KEY@SENTRY_HOST/`                                  |
 | OPR_EXECUTOR_DOCKER_HUB_USERNAME | Username for Docker Hub authentication (if applicable)                                                                                        |
 | OPR_EXECUTOR_DOCKER_HUB_PASSWORD | Password for Docker Hub authentication (if applicable)                                                                                        |
-| OPR_EXECUTOR_RUNTIME_VERSIONS    | Version tag for runtime environments, ex: `v4`                                                                                                |
+| OPR_EXECUTOR_RUNTIME_VERSIONS    | Version tag for runtime environments, ex: `v5`                                                                                                |
 | OPR_EXECUTOR_RETRY_ATTEMPTS      | Number of retry attempts for failed executions, ex: `5`                                                                                       |
 | OPR_EXECUTOR_RETRY_DELAY_MS      | Delay (in milliseconds) between retry attempts, ex: `500`                                                                                    |
 | OPR_EXECUTOR_IMAGE_PULL      | Pull open runtimes images before executor starts. Takes `disabled` and `enabled` |

app/http.php

@@ -574,7 +574,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
     ->param('remove', false, new Boolean(), 'Remove a runtime after execution.', true)
     ->param('cpus', 1, new FloatValidator(true), 'Container CPU.', true)
     ->param('memory', 512, new Integer(), 'Container RAM memory.', true)
-    ->param('version', 'v4', new WhiteList(['v2', 'v4']), 'Runtime Open Runtime version.', true)
+    ->param('version', 'v5', new WhiteList(['v2', 'v5']), 'Runtime Open Runtime version.', true)
     ->param('restartPolicy', DockerAPI::RESTART_NO, new WhiteList([DockerAPI::RESTART_NO, DockerAPI::RESTART_ALWAYS, DockerAPI::RESTART_ON_FAILURE, DockerAPI::RESTART_UNLESS_STOPPED], true), 'Define restart policy for the runtime once an exit code is returned. Default value is "no". Possible values are "no", "always", "on-failure", "unless-stopped".', true)
     ->inject('networks')
     ->inject('orchestration')
@@ -655,7 +655,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
                     'INTERNAL_RUNTIME_ENTRYPOINT' => $entrypoint,
                     'INERNAL_EXECUTOR_HOSTNAME' => System::getHostname()
                 ],
-                'v4' => [
+                'v5' => [
                     'OPEN_RUNTIMES_SECRET' => $secret,
                     'OPEN_RUNTIMES_ENTRYPOINT' => $entrypoint,
                     'OPEN_RUNTIMES_HOSTNAME' => System::getHostname(),
@@ -701,7 +701,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
                 \dirname($tmpBuild) . ':' . $codeMountPath . ':rw',
             ];
 
-            if ($version === 'v4') {
+            if ($version === 'v5') {
                 $volumes[] = \dirname($tmpLogs . '/logs') . ':/mnt/logs:rw';
                 $volumes[] = \dirname($tmpLogging . '/logging') . ':/tmp/logging:rw';
             }
@@ -956,7 +956,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
     ->param('variables', [], new AnyOf([new Text(65535), new Assoc()], AnyOf::TYPE_MIXED), 'Environment variables passed into runtime.', true)
     ->param('cpus', 1, new FloatValidator(true), 'Container CPU.', true)
     ->param('memory', 512, new Integer(true), 'Container RAM memory.', true)
-    ->param('version', 'v4', new WhiteList(['v2', 'v4']), 'Runtime Open Runtime version.', true)
+    ->param('version', 'v5', new WhiteList(['v2', 'v5']), 'Runtime Open Runtime version.', true)
     ->param('runtimeEntrypoint', '', new Text(1024, 0), 'Commands to run when creating a container. Maximum of 100 commands are allowed, each 1024 characters long.', true)
     ->param('logging', true, new Boolean(true), 'Whether executions will be logged.', true)
     ->param('restartPolicy', DockerAPI::RESTART_NO, new WhiteList([DockerAPI::RESTART_NO, DockerAPI::RESTART_ALWAYS, DockerAPI::RESTART_ON_FAILURE, DockerAPI::RESTART_UNLESS_STOPPED], true), 'Define restart policy once exit code is returned by command. Default value is "no". Possible values are "no", "always", "on-failure", "unless-stopped".', true)
@@ -1231,7 +1231,7 @@ function (string $runtimeId, ?string $payload, string $path, string $method, mix
                 ];
             };
 
-            $executeV4 = function () use ($path, $method, $headers, $payload, $secret, $hostname, $timeout, $runtimeName, $logging): array {
+            $executeV5 = function () use ($path, $method, $headers, $payload, $secret, $hostname, $timeout, $runtimeName, $logging): array {
                 $statusCode = 0;
                 $errNo = -1;
                 $executorResponse = '';
@@ -1411,7 +1411,7 @@ function (string $runtimeId, ?string $payload, string $path, string $method, mix
             }
 
             // Execute function
-            $executionRequest = $version === 'v4' ? $executeV4 : $executeV2;
+            $executionRequest = $version === 'v5' ? $executeV5 : $executeV2;
 
             $retryDelayMs = \intval(Http::getEnv('OPR_EXECUTOR_RETRY_DELAY_MS', '500'));
             $retryAttempts = \intval(Http::getEnv('OPR_EXECUTOR_RETRY_ATTEMPTS', '5'));
@@ -1635,7 +1635,7 @@ function (string $runtimeId, ?string $payload, string $path, string $method, mix
         // Useful to prevent auto-pulling from remote when testing local images
         Console::info("Skipping image pulling");
     } else {
-        $runtimeVersions = \explode(',', Http::getEnv('OPR_EXECUTOR_RUNTIME_VERSIONS', 'v4') ?? 'v4');
+        $runtimeVersions = \explode(',', Http::getEnv('OPR_EXECUTOR_RUNTIME_VERSIONS', 'v5') ?? 'v5');
         foreach ($runtimeVersions as $runtimeVersion) {
             Console::success("Pulling $runtimeVersion images...");
             $runtimes = new Runtimes($runtimeVersion); // TODO: @Meldiron Make part of open runtimes