PR review changes + fix test

2024-06-01 18:39:57 +12:00 · 2022-11-10 12:04:49 +00:00 · 2022-11-10 12:04:49 +00:00 · 192cf2e20d
parent b6a410cc17
commit 192cf2e20d
8 changed files with 53 additions and 74 deletions
--- a/.env
+++ b/.env
@ -70,8 +70,9 @@ _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
-OPR_EXECUTOR_INACTIVE_TRESHOLD=600
-OPR_EXECUTOR_NETWORK=openruntimes-runtimes
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=openruntimes-runtimes
+_APP_FUNCTIONS_CONNECTION_STORAGE=file://localhost
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=
@ -85,6 +86,5 @@ _APP_USAGE_DATABASE_INTERVAL=15
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
-OPR_EXECUTOR_DOCKER_HUB_USERNAME=
-OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
+_APP_DOCKER_HUB_USERNAME=
+_APP_DOCKER_HUB_PASSWORD=
--- a/6
+++ b/6
@ -262,11 +262,7 @@ ENV _APP_SERVER=swoole \
    _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
    _APP_MAINTENANCE_INTERVAL=86400 \
    _APP_LOGGING_PROVIDER= \
-    OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost \
-    OPR_EXECUTOR_INACTIVE_TRESHOLD=600 \
-    OPR_EXECUTOR_NETWORK=openruntimes-runtimes \
-    OPR_EXECUTOR_DOCKER_HUB_USERNAME= \
-    OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
+    _APP_LOGGING_CONFIG=

 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -701,7 +701,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_CONTAINERS',
-                'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'OPR_EXECUTOR_INACTIVE_TRESHOLD\'.',
+                'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'_APP_FUNCTIONS_INACTIVE_THRESHOLD\'.',
                'introduction' => '0.7.0',
                'default' => '10',
                'required' => false,
@ -782,7 +782,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_INACTIVE_TRESHOLD\' instead!',
+                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds.',
                'introduction' => '0.13.0',
                'default' => '60',
                'required' => false,
@ -791,7 +791,7 @@ return [
            ],
            [
                'name' => 'DOCKERHUB_PULL_USERNAME',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_USERNAME\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_DOCKER_HUB_USERNAME\' instead!',
                'introduction' => '0.10.0',
                'default' => '',
                'required' => false,
@ -800,7 +800,7 @@ return [
            ],
            [
                'name' => 'DOCKERHUB_PULL_PASSWORD',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_PASSWORD\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_DOCKER_HUB_PASSWORD\' instead!',
                'introduction' => '0.10.0',
                'default' => '',
                'required' => false,
@ -818,7 +818,7 @@ return [
            ],
            [
                'name' => 'OPEN_RUNTIMES_NETWORK',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_NETWORK\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_FUNCTIONS_RUNTIMES_NETWORK\' instead!',
                'introduction' => '0.13.0',
                'default' => 'appwrite_runtimes',
                'required' => false,
@ -826,25 +826,16 @@ return [
                'filter' => ''
            ],
            [
-                'name' => 'OPR_EXECUTOR_INACTIVE_TRESHOLD',
-                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
-                'introduction' => '1.2.0',
-                'default' => '60',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => 'OPR_EXECUTOR_NETWORK',
+                'name' => '_APP_FUNCTIONS_RUNTIMES_NETWORK',
                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
                'introduction' => '1.2.0',
-                'default' => 'appwrite_runtimes',
+                'default' => 'openruntimes-runtimes',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
            [
-                'name' => 'OPR_EXECUTOR_DOCKER_HUB_USERNAME',
+                'name' => '_APP_DOCKER_HUB_USERNAME',
                'description' => 'The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                'introduction' => '1.2.0',
                'default' => '',
@ -853,7 +844,7 @@ return [
                'filter' => ''
            ],
            [
-                'name' => 'OPR_EXECUTOR_DOCKER_HUB_PASSWORD',
+                'name' => '_APP_DOCKER_HUB_PASSWORD',
                'description' => 'The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                'introduction' => '1.2.0',
                'default' => '',
@ -862,7 +853,7 @@ return [
                'filter' => ''
            ],
            [
-                'name' => 'OPR_EXECUTOR_CONNECTION_STORAGE',
+                'name' => '_APP_FUNCTIONS_CONNECTION_STORAGE',
                'description' => 'DSN record of storage driver where Open Runtimes Executor stores output of Appwrite Function Deployment builds.',
                'introduction' => '1.2.0',
                'default' => '',
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@ -134,10 +134,8 @@ services:
      - _APP_FUNCTIONS_SIZE_LIMIT
      - _APP_FUNCTIONS_TIMEOUT
      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CONTAINERS
      - _APP_FUNCTIONS_CPUS
      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_MEMORY_SWAP
      - _APP_FUNCTIONS_RUNTIMES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
@ -413,8 +411,6 @@ services:
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
-      - DOCKERHUB_PULL_USERNAME
-      - DOCKERHUB_PULL_PASSWORD

  appwrite-worker-mails:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@ -589,11 +585,11 @@ services:
      - openruntimes-functions:/storage/functions:rw
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_CONNECTION_STORAGE
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD
-      - OPR_EXECUTOR_NETWORK
-      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
-      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_FUNCTIONS_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
--- a/composer.lock
+++ b/composer.lock
@ -4836,16 +4836,16 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
@ -4860,7 +4860,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -4898,7 +4898,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
            },
            "funding": [
                {
@ -4914,20 +4914,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                "shasum": ""
            },
            "require": {
@ -4942,7 +4942,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -4981,7 +4981,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
            },
            "funding": [
                {
@ -4997,7 +4997,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "textalk/websocket",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -160,6 +160,8 @@ services:
      - _APP_FUNCTIONS_SIZE_LIMIT
      - _APP_FUNCTIONS_TIMEOUT
      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
@ -700,11 +702,11 @@ services:
      - openruntimes-functions:/storage/functions:rw
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_CONNECTION_STORAGE
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD
-      - OPR_EXECUTOR_NETWORK
-      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
-      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_FUNCTIONS_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@ -18,13 +18,11 @@ class Executor
    public const METHOD_CONNECT = 'CONNECT';
    public const METHOD_TRACE = 'TRACE';

-    private $endpoint;
+    private bool $selfSigned = false;

-    private $selfSigned = false;
+    private string $endpoint;

-    protected $headers = [
-        'content-type' => '',
-    ];
+    protected array $headers;

    protected int $cpus;

@ -39,6 +37,10 @@ class Executor
        $this->endpoint = $endpoint;
        $this->cpus = \intval(App::getEnv('_APP_FUNCTIONS_CPUS', '1'));
        $this->memory = intval(App::getEnv('_APP_FUNCTIONS_MEMORY', '512'));
+        $this->headers = [
+            'content-type' => 'application/json',
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
+        ];
    }

    /**
@ -71,11 +73,7 @@ class Executor
    ) {
        $runtimeId = "$projectId-$deploymentId";
        $route = "/runtimes";
-        $headers = [
-            'content-type' => 'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
-            'x-opr-runtime-id' => $runtimeId
-        ];
+        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
        $params = [
            'runtimeId' => $runtimeId,
            'source' => $source,
@ -128,11 +126,7 @@ class Executor
    ) {
        $runtimeId = "$projectId-$deploymentId";
        $route = '/runtimes/' . $runtimeId . '/execution';
-        $headers = [
-            'content-type' =>  'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
-            'x-opr-runtime-id' => $runtimeId
-        ];
+        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
        $params = [
            'runtimeId' => $runtimeId,
            'variables' => $variables,
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@ -631,7 +631,7 @@ class FunctionsCustomServerTest extends Scope
        $this->assertStringContainsString('8.0', $execution['body']['response']);
        $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
        $this->assertEquals('', $execution['body']['stderr']);
-        $this->assertLessThan(0.500, $execution['body']['duration']);
+        $this->assertLessThan(1.500, $execution['body']['duration']);

        /**
         * Test for FAILURE
@ -750,7 +750,7 @@ class FunctionsCustomServerTest extends Scope
        $this->assertStringContainsString('PHP', $execution['body']['response']);
        $this->assertStringContainsString('8.0', $execution['body']['response']);
        $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
-        $this->assertLessThan(0.500, $execution['body']['duration']);
+        $this->assertLessThan(1.500, $execution['body']['duration']);

        return $data;
    }