Resolve merge conflicts

2026-05-26 13:51:13 +00:00 · 2025-11-17 13:15:27 +05:30
parent 9cc152d173 deb5039352
commit a5f44aebc3
11 changed files with 213 additions and 45 deletions
@@ -14,6 +14,7 @@ use Appwrite\Utopia\Database\Validator\Queries\Installations;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Vcs\Comment;
+use Swoole\Coroutine\WaitGroup;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
@@ -963,6 +964,46 @@ App::post('/v1/vcs/github/installations/:installationId/detections')
                throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
            }
        }
+
+        $wg = new WaitGroup();
+        $envs = [];
+        foreach ($files as $file) {
+            if (!(\str_starts_with($file, '.env'))) {
+                continue;
+            }
+
+            $wg->add();
+            go(function () use ($github, $owner, $repositoryName, $providerRootDirectory, $file, $wg, &$envs) {
+                try {
+                    $contentResponse = $github->getRepositoryContent($owner, $repositoryName, \rtrim($providerRootDirectory, '/') . '/' . $file);
+                    $envFile = $contentResponse['content'] ?? '';
+
+                    $envLines = \explode("\n", $envFile);
+                    foreach ($envLines as $line) {
+                        $parts = \explode('=', $line, 2);
+                        $envName = \trim($parts[0] ?? '');
+                        $envValue = \trim($parts[1] ?? '');
+                        if (!empty($envName)) {
+                            $envs[$envName] = $envValue;
+                        }
+                    }
+                } finally {
+                    $wg->done();
+                }
+            });
+        }
+        $wg->wait();
+
+        $variables = [];
+        foreach ($envs as $key => $value) {
+            $variables[] = [
+                'name' => $key,
+                'value' => $value,
+            ];
+        }
+
+        $output->setAttribute('variables', $variables);
+
        $response->dynamic($output, $type === 'framework' ? Response::MODEL_DETECTION_FRAMEWORK : Response::MODEL_DETECTION_RUNTIME);
    });

@@ -1137,6 +1178,44 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
                        $repo['runtime'] = $runtimeWithVersion ?? '';
                    }
                }
+
+                $wg = new WaitGroup();
+                $envs = [];
+                foreach ($files as $file) {
+                    if (!(\str_starts_with($file, '.env'))) {
+                        continue;
+                    }
+
+                    $wg->add();
+                    go(function () use ($github, $repo, $file, $wg, &$envs) {
+                        try {
+                            $contentResponse = $github->getRepositoryContent($repo['organization'], $repo['name'], $file);
+                            $envFile = $contentResponse['content'] ?? '';
+
+                            $envLines = \explode("\n", $envFile);
+                            foreach ($envLines as $line) {
+                                $parts = \explode('=', $line, 2);
+                                $envName = \trim($parts[0] ?? '');
+                                $envValue = \trim($parts[1] ?? '');
+                                if (!empty($envName)) {
+                                    $envs[$envName] = $envValue;
+                                }
+                            }
+                        } finally {
+                            $wg->done();
+                        }
+                    });
+                }
+                $wg->wait();
+
+                $repo['variables'] = [];
+                foreach ($envs as $key => $value) {
+                    $repo['variables'][] = [
+                        'name' => $key,
+                        'value' => $value,
+                    ];
+                }
+
                return $repo;
            };
        }, $repos));
@@ -961,16 +961,16 @@
        },
        {
            "name": "mongodb/mongodb",
-            "version": "2.1.1",
+            "version": "2.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/mongodb/mongo-php-library.git",
-                "reference": "f399d24905dd42f97dfe0af9706129743ef247ac"
+                "reference": "0a2472ba9cbb932f7e43a8770aedb2fc30612a67"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/f399d24905dd42f97dfe0af9706129743ef247ac",
-                "reference": "f399d24905dd42f97dfe0af9706129743ef247ac",
+                "url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/0a2472ba9cbb932f7e43a8770aedb2fc30612a67",
+                "reference": "0a2472ba9cbb932f7e43a8770aedb2fc30612a67",
                "shasum": ""
            },
            "require": {
@@ -986,7 +986,7 @@
            "require-dev": {
                "doctrine/coding-standard": "^12.0",
                "phpunit/phpunit": "^10.5.35",
-                "rector/rector": "^1.2",
+                "rector/rector": "^2.1.4",
                "squizlabs/php_codesniffer": "^3.7",
                "vimeo/psalm": "6.5.*"
            },
@@ -1032,9 +1032,9 @@
            ],
            "support": {
                "issues": "https://github.com/mongodb/mongo-php-library/issues",
-                "source": "https://github.com/mongodb/mongo-php-library/tree/2.1.1"
+                "source": "https://github.com/mongodb/mongo-php-library/tree/2.1.2"
            },
-            "time": "2025-08-13T20:50:05+00:00"
+            "time": "2025-10-06T12:12:40+00:00"
        },
        {
            "name": "mustangostang/spyc",
@@ -4212,16 +4212,16 @@
        },
        {
            "name": "utopia-php/framework",
-            "version": "0.33.28",
+            "version": "0.33.29",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/http.git",
-                "reference": "5aaa94d406577b0059ad28c78022606890dc6de0"
+                "reference": "6e63939fdb33b847f92839499cd6e8df626c278d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/http/zipball/5aaa94d406577b0059ad28c78022606890dc6de0",
-                "reference": "5aaa94d406577b0059ad28c78022606890dc6de0",
+                "url": "https://api.github.com/repos/utopia-php/http/zipball/6e63939fdb33b847f92839499cd6e8df626c278d",
+                "reference": "6e63939fdb33b847f92839499cd6e8df626c278d",
                "shasum": ""
            },
            "require": {
@@ -4253,9 +4253,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/http/issues",
-                "source": "https://github.com/utopia-php/http/tree/0.33.28"
+                "source": "https://github.com/utopia-php/http/tree/0.33.29"
            },
-            "time": "2025-09-25T10:44:24+00:00"
+            "time": "2025-11-14T06:33:29+00:00"
        },
        {
            "name": "utopia-php/image",
@@ -5383,16 +5383,16 @@
    "packages-dev": [
        {
            "name": "appwrite/sdk-generator",
-            "version": "1.5.4",
+            "version": "1.5.5",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "958947b6483a79e11c3812f23bb3056199fa4105"
+                "reference": "1f3686e41a2d10829220b74f54c80a770e9f968a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/958947b6483a79e11c3812f23bb3056199fa4105",
-                "reference": "958947b6483a79e11c3812f23bb3056199fa4105",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/1f3686e41a2d10829220b74f54c80a770e9f968a",
+                "reference": "1f3686e41a2d10829220b74f54c80a770e9f968a",
                "shasum": ""
            },
            "require": {
@@ -5428,9 +5428,9 @@
            "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
            "support": {
                "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/1.5.4"
+                "source": "https://github.com/appwrite/sdk-generator/tree/1.5.5"
            },
-            "time": "2025-11-12T12:43:42+00:00"
+            "time": "2025-11-14T05:56:33+00:00"
        },
        {
            "name": "doctrine/annotations",
@@ -8718,16 +8718,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
+                "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb",
                "shasum": ""
            },
            "require": {
@@ -8756,7 +8756,7 @@
            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
            "support": {
                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.0"
            },
            "funding": [
                {
@@ -8764,7 +8764,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2025-11-13T13:44:09+00:00"
        },
        {
            "name": "twig/twig",
@@ -8897,7 +8897,7 @@
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
@@ -8921,5 +8921,5 @@
    "platform-overrides": {
        "php": "8.3"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
@@ -26,27 +26,34 @@ Before releasing SDKs, you need to:

 To enable SDK releases via GitHub, you need to mount SSH keys and configure GitHub authentication in your Docker environment.

-#### Update docker-compose.override.yml
+#### Update Dockerfile

-Update `docker-compose.override.yml` to mount SSH keys and set environment variables for the `appwrite` service:
+Add the following configuration to your `Dockerfile`:
+
+```dockerfile
+ARG GH_TOKEN
+ENV GH_TOKEN=your_github_token_here
+RUN git config --global user.email "your-email@example.com"
+RUN apk add --update --no-cache openssh-client github-cli
+```
+
+Replace:
+- `your_github_token_here` with your GitHub personal access token (with appropriate permissions)
+- `your-email@example.com` with your Git email address
+
+#### Update docker-compose.yml
+
+Add the SSH key volume mount to the `appwrite` service in `docker-compose.yml`:

 ```yaml
 services:
  appwrite:
    volumes:
      - ~/.ssh:/root/.ssh
-    environment:
-      - GH_TOKEN=your_github_token_here
-      - GIT_EMAIL=your-email@example.com
+      # ... other volumes
 ```

-Uncomment the volumes section.
-
-Replace:
- `your_github_token_here` with your GitHub personal access token (with appropriate permissions)
- `your-email@example.com` with your Git email address
-
-This mounts your SSH keys from the host machine and sets the GitHub token and email as environment variables, allowing the container to authenticate with GitHub. The git configuration is handled automatically at runtime.
+This mounts your SSH keys from the host machine, allowing the container to authenticate with GitHub.

 ### Updating Specs

@@ -17,6 +17,7 @@ use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\UID;
 use Utopia\Swoole\Response as SwooleResponse;
 use Utopia\Validator\Boolean;
+use Utopia\Validator\Nullable;

 class Create extends Action
 {
@@ -63,7 +64,7 @@ class Create extends Action
            ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#createCollection).')
            ->param('key', '', new Key(), 'Attribute Key.')
            ->param('required', null, new Boolean(), 'Is attribute required?')
-            ->param('default', null, fn (Database $dbForProject) => new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime()), 'Default value for the attribute in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when attribute is required.', true, ['dbForProject'])
+            ->param('default', null, fn (Database $dbForProject) => new Nullable(new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime())), 'Default value for the attribute in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when attribute is required.', true, ['dbForProject'])
            ->param('array', false, new Boolean(), 'Is attribute an array?', true)
            ->inject('response')
            ->inject('dbForProject')
@@ -13,6 +13,7 @@ use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\UID;
 use Utopia\Swoole\Response as SwooleResponse;
 use Utopia\Validator\Boolean;
+use Utopia\Validator\Nullable;

 class Create extends DatetimeCreate
 {
@@ -55,7 +56,7 @@ class Create extends DatetimeCreate
            ->param('tableId', '', new UID(), 'Table ID.')
            ->param('key', '', new Key(), 'Column Key.')
            ->param('required', null, new Boolean(), 'Is column required?')
-            ->param('default', null, fn (Database $dbForProject) => new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime()), 'Default value for the column in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when column is required.', true, ['dbForProject'])
+            ->param('default', null, fn (Database $dbForProject) => new Nullable(new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime())), 'Default value for the column in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when column is required.', true, ['dbForProject'])
            ->param('array', false, new Boolean(), 'Is column an array?', true)
            ->inject('response')
            ->inject('dbForProject')
@@ -59,6 +59,7 @@ use Appwrite\Utopia\Response\Model\Database;
 use Appwrite\Utopia\Response\Model\Deployment;
 use Appwrite\Utopia\Response\Model\DetectionFramework;
 use Appwrite\Utopia\Response\Model\DetectionRuntime;
+use Appwrite\Utopia\Response\Model\DetectionVariable;
 use Appwrite\Utopia\Response\Model\DevKey;
 use Appwrite\Utopia\Response\Model\Document as ModelDocument;
 use Appwrite\Utopia\Response\Model\Error;
@@ -316,6 +317,7 @@ class Response extends SwooleResponse
    public const MODEL_BRANCH = 'branch';
    public const MODEL_BRANCH_LIST = 'branchList';
    public const MODEL_DETECTION_FRAMEWORK = 'detectionFramework';
+    public const MODEL_DETECTION_VARIABLE = 'detectionVariable';
    public const MODEL_DETECTION_RUNTIME = 'detectionRuntime';
    public const MODEL_VCS_CONTENT = 'vcsContent';
    public const MODEL_VCS_CONTENT_LIST = 'vcsContentList';
@@ -563,6 +565,7 @@ class Response extends SwooleResponse
            ->setModel(new ProviderRepositoryRuntime())
            ->setModel(new DetectionFramework())
            ->setModel(new DetectionRuntime())
+            ->setModel(new DetectionVariable())
            ->setModel(new VcsContent())
            ->setModel(new Branch())
            ->setModel(new Runtime())
@@ -0,0 +1,22 @@
+<?php
+
+namespace Appwrite\Utopia\Response\Model;
+
+use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Model;
+
+abstract class Detection extends Model
+{
+    public function __construct()
+    {
+        $this
+            ->addRule('variables', [
+                'type' => Response::MODEL_DETECTION_VARIABLE,
+                'description' => 'Environment variables found in .env files',
+                'required' => false,
+                'default' => [],
+                'example' => new \stdClass(),
+                'array' => true,
+            ]);
+    }
+}
@@ -3,12 +3,13 @@
 namespace Appwrite\Utopia\Response\Model;

 use Appwrite\Utopia\Response;
-use Appwrite\Utopia\Response\Model;

-class DetectionFramework extends Model
+class DetectionFramework extends Detection
 {
    public function __construct()
    {
+        parent::__construct();
+
        $this
            ->addRule('framework', [
                'type' => self::TYPE_STRING,
@@ -3,12 +3,13 @@
 namespace Appwrite\Utopia\Response\Model;

 use Appwrite\Utopia\Response;
-use Appwrite\Utopia\Response\Model;

-class DetectionRuntime extends Model
+class DetectionRuntime extends Detection
 {
    public function __construct()
    {
+        parent::__construct();
+
        $this
            ->addRule('runtime', [
                'type' => self::TYPE_STRING,
@@ -0,0 +1,46 @@
+<?php
+
+namespace Appwrite\Utopia\Response\Model;
+
+use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Model;
+
+class DetectionVariable extends Model
+{
+    public function __construct()
+    {
+        $this
+            ->addRule('name', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Name of environment variable',
+                'default' => '',
+                'example' => 'NODE_ENV',
+            ])
+            ->addRule('value', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Value of environment variable',
+                'default' => '',
+                'example' => 'production',
+            ]);
+    }
+
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'DetectionVariable';
+    }
+
+    /**
+     * Get Type
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return Response::MODEL_DETECTION_VARIABLE;
+    }
+}
@@ -53,6 +53,13 @@ class ProviderRepository extends Model
                'default' => APP_DATABASE_ATTRIBUTE_DATETIME,
                'example' => APP_DATABASE_ATTRIBUTE_DATETIME,
                'array' => false,
+            ])
+            ->addRule('variables', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Environment variables found in .env files',
+                'default' => [],
+                'array' => true,
+                'example' => ['PORT', 'NODE_ENV'],
            ]);
    }