From 88107ee7b3e02497f024c427796a346e92b087dd Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 20 Apr 2026 11:57:57 +0530 Subject: [PATCH 01/25] feat: implement custom triggers for VCS builds --- app/config/collections/projects.php | 44 +++++++++++ composer.lock | 15 +++- .../Http/GitHub/Authorize/External/Update.php | 5 +- .../Modules/VCS/Http/GitHub/Deployment.php | 74 +++++++++++++++++++ .../Modules/VCS/Http/GitHub/Events/Create.php | 10 ++- 5 files changed, 140 insertions(+), 8 deletions(-) diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php index 9568c59369..9ac5c562e3 100644 --- a/app/config/collections/projects.php +++ b/app/config/collections/projects.php @@ -841,6 +841,28 @@ return [ 'array' => true, 'filters' => [], ], + [ + '$id' => ID::custom('providerBranches'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], + [ + '$id' => ID::custom('providerPaths'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], ], 'indexes' => [ [ @@ -1320,6 +1342,28 @@ return [ 'array' => false, 'filters' => [], ], + [ + '$id' => ID::custom('providerBranches'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], + [ + '$id' => ID::custom('providerPaths'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], ], 'indexes' => [ [ diff --git a/composer.lock b/composer.lock index d0d69bd0c5..d3d9600e5d 100644 --- a/composer.lock +++ b/composer.lock @@ -8441,9 +8441,18 @@ "time": "2024-11-07T12:36:22+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "utopia-php/vcs", + "version": "dev-ser-401", + "alias": "3.0.99", + "alias_normalized": "3.0.99.0" + } + ], "minimum-stability": "dev", - "stability-flags": {}, + "stability-flags": { + "utopia-php/vcs": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -8464,5 +8473,5 @@ "platform-dev": { "ext-fileinfo": "*" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php index 8b320535e9..b3ff4f96fa 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php @@ -130,7 +130,10 @@ class Update extends Action $providerCommitAuthor = $commitDetails["commitAuthor"] ?? ''; $providerCommitAuthorUrl = $commitDetails["commitAuthorUrl"] ?? ''; - $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); + $prFiles = $github->getPullRequestFiles($owner, $providerRepositoryName, $providerPullRequestId); + $providerAffectedFiles = array_column($prFiles, 'filename'); + + $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); $response->noContent(); } diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 6e1db12c28..e5c138f575 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -40,6 +40,7 @@ trait Deployment string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, + array $providerAffectedFiles = [], bool $external, Database $dbForPlatform, Authorization $authorization, @@ -94,6 +95,11 @@ trait Deployment $resource = $authorization->skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId)); $resourceInternalId = $resource->getSequence(); + if (!$this->isResourceBuildable($resource, $providerBranch, $providerAffectedFiles, $logBase)) { + Span::add("{$logBase}.build.skipped", 'true'); + continue; + } + $deploymentId = ID::unique(); $repositoryId = $repository->getId(); $repositoryInternalId = $repository->getSequence(); @@ -560,4 +566,72 @@ trait Deployment { return System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME); } + + private function isResourceBuildable(Document $resource, string $providerBranch, array $providerAffectedFiles, string $logBase): bool + { + $allowedBranches = $resource->getAttribute('providerBranches', []); + if (!$this->matchesPatterns($providerBranch, $allowedBranches)) { + Span::add("{$logBase}.build.skipped.reason", 'branch'); + return false; + } + + $allowedPaths = $resource->getAttribute('providerPaths', []); + if (!empty($allowedPaths) && !empty($providerAffectedFiles)) { + $pathMatched = false; + foreach ($providerAffectedFiles as $file) { + if ($this->matchesPatterns($file, $allowedPaths)) { + $pathMatched = true; + break; + } + } + if (!$pathMatched) { + Span::add("{$logBase}.build.skipped.reason", 'path'); + return false; + } + } + + return true; + } + + private function matchesPatterns(string $subject, array $patterns): bool + { + if (empty($patterns)) { + return true; + } + + $include = array_filter($patterns, fn ($p) => !str_starts_with($p, '!')); + $exclude = array_filter($patterns, fn ($p) => str_starts_with($p, '!')); + + foreach ($include as $pattern) { + if ($this->matchGlob($subject, $pattern)) { + return true; + } + } + + foreach ($exclude as $pattern) { + if ($this->matchGlob($subject, substr($pattern, 1))) { + return false; + } + } + + return empty($include); + } + + private function matchGlob(string $subject, string $pattern): bool + { + $regex = preg_replace_callback( + '/\*\*|\*|\?|[^*?]+/', + static function (array $m): string { + return match ($m[0]) { + '**' => '.*', + '*' => '[^/]*', + '?' => '[^/]', + default => preg_quote($m[0], '/'), + }; + }, + $pattern + ); + + return (bool) preg_match('/^' . $regex . '$/', $subject); + } } diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index e3dbcfa0e9..b04a4e7c5e 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -162,9 +162,10 @@ class Create extends Action Query::limit(100), ])); - // Create new deployment only on push (not committed by us) and not when branch is deleted - if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchDeleted) { - $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); + // Create new deployment only on push (not committed by us) and not when branch is created or deleted + if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchCreated && !$providerBranchDeleted) { + $providerAffectedFiles = $parsedPayload['affectedFiles'] ?? []; + $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', $providerAffectedFiles, false, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); } } @@ -216,7 +217,8 @@ class Create extends Action Query::orderDesc('$createdAt') ])); - $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); + $providerAffectedFiles = $parsedPayload['affectedFiles'] ?? []; + $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, $external, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); } elseif ($action == "closed") { // Allowed external contributions cleanup From 076e64886ee5dcac26661f8ee5317183856307d0 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 13:03:48 +0530 Subject: [PATCH 02/25] validator pattern --- .../Modules/VCS/Http/GitHub/Deployment.php | 60 ++---------- src/Appwrite/Vcs/Validator/BuildTrigger.php | 91 +++++++++++++++++++ tests/unit/Vcs/Validator/BuildTriggerTest.php | 86 ++++++++++++++++++ 3 files changed, 183 insertions(+), 54 deletions(-) create mode 100644 src/Appwrite/Vcs/Validator/BuildTrigger.php create mode 100644 tests/unit/Vcs/Validator/BuildTriggerTest.php diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index e5c138f575..f4c522fb44 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -7,6 +7,7 @@ use Appwrite\Event\Event; use Appwrite\Extend\Exception; use Appwrite\Filter\BranchDomain as BranchDomainFilter; use Appwrite\Vcs\Comment; +use Appwrite\Vcs\Validator\BuildTrigger; use Utopia\Config\Config; use Utopia\Console; use Utopia\Database\Database; @@ -569,22 +570,15 @@ trait Deployment private function isResourceBuildable(Document $resource, string $providerBranch, array $providerAffectedFiles, string $logBase): bool { - $allowedBranches = $resource->getAttribute('providerBranches', []); - if (!$this->matchesPatterns($providerBranch, $allowedBranches)) { + $branchTrigger = new BuildTrigger($resource->getAttribute('providerBranches', [])); + if (!$branchTrigger->isValid($providerBranch)) { Span::add("{$logBase}.build.skipped.reason", 'branch'); return false; } - $allowedPaths = $resource->getAttribute('providerPaths', []); - if (!empty($allowedPaths) && !empty($providerAffectedFiles)) { - $pathMatched = false; - foreach ($providerAffectedFiles as $file) { - if ($this->matchesPatterns($file, $allowedPaths)) { - $pathMatched = true; - break; - } - } - if (!$pathMatched) { + $pathTrigger = new BuildTrigger($resource->getAttribute('providerPaths', [])); + foreach ($providerAffectedFiles as $file) { + if (!$pathTrigger->isValid($file)) { Span::add("{$logBase}.build.skipped.reason", 'path'); return false; } @@ -592,46 +586,4 @@ trait Deployment return true; } - - private function matchesPatterns(string $subject, array $patterns): bool - { - if (empty($patterns)) { - return true; - } - - $include = array_filter($patterns, fn ($p) => !str_starts_with($p, '!')); - $exclude = array_filter($patterns, fn ($p) => str_starts_with($p, '!')); - - foreach ($include as $pattern) { - if ($this->matchGlob($subject, $pattern)) { - return true; - } - } - - foreach ($exclude as $pattern) { - if ($this->matchGlob($subject, substr($pattern, 1))) { - return false; - } - } - - return empty($include); - } - - private function matchGlob(string $subject, string $pattern): bool - { - $regex = preg_replace_callback( - '/\*\*|\*|\?|[^*?]+/', - static function (array $m): string { - return match ($m[0]) { - '**' => '.*', - '*' => '[^/]*', - '?' => '[^/]', - default => preg_quote($m[0], '/'), - }; - }, - $pattern - ); - - return (bool) preg_match('/^' . $regex . '$/', $subject); - } } diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php new file mode 100644 index 0000000000..44296ae73a --- /dev/null +++ b/src/Appwrite/Vcs/Validator/BuildTrigger.php @@ -0,0 +1,91 @@ +patterns)) { + return true; + } + + $include = array_filter($this->patterns, fn ($p) => !str_starts_with($p, '!')); + $exclude = array_filter($this->patterns, fn ($p) => str_starts_with($p, '!')); + + foreach ($include as $pattern) { + if ($this->matchGlob($value, $pattern)) { + return true; + } + } + + foreach ($exclude as $pattern) { + if ($this->matchGlob($value, substr($pattern, 1))) { + return false; + } + } + + return empty($include); + } + + public function getDescription(): string + { + return 'Value must match at least one inclusion pattern and must not match any exclusion pattern.'; + } + + public function isArray(): bool + { + return false; + } + + public function getType(): string + { + return self::TYPE_STRING; + } + + private function matchGlob(string $subject, string $pattern): bool + { + $regex = ''; + $len = strlen($pattern); + $i = 0; + + while ($i < $len) { + $char = $pattern[$i]; + + if ($char === '*' && isset($pattern[$i + 1]) && $pattern[$i + 1] === '*') { + $prevSlash = $i === 0 || $pattern[$i - 1] === '/'; + $nextSlash = isset($pattern[$i + 2]) && $pattern[$i + 2] === '/'; + + if ($prevSlash && $nextSlash) { + // a/**/b → zero or more intermediate dirs (matches a/b, a/x/b, a/x/y/b) + // **/foo → zero or more leading dirs (matches foo, a/foo, a/b/foo) + $regex .= '(?:.+/)?'; + $i += 3; // consume ** and the trailing / + } else { + // foo/** → everything inside (matches foo/a, foo/a/b) + $regex .= '.*'; + $i += 2; + } + } elseif ($char === '*') { + $regex .= '[^/]*'; // anything except a path separator + $i++; + } elseif ($char === '?') { + $regex .= '[^/]'; // any single character except a path separator + $i++; + } else { + $regex .= preg_quote($char, '~'); + $i++; + } + } + + return (bool) preg_match('~^' . $regex . '$~', $subject); + } +} diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php new file mode 100644 index 0000000000..7dbf4e8204 --- /dev/null +++ b/tests/unit/Vcs/Validator/BuildTriggerTest.php @@ -0,0 +1,86 @@ +assertTrue($validator->isValid('anything')); + $this->assertTrue($validator->isValid('main')); + } + + public function testExactMatch(): void + { + $validator = new BuildTrigger(['main']); + $this->assertTrue($validator->isValid('main')); + $this->assertFalse($validator->isValid('develop')); + } + + public function testSingleWildcard(): void + { + $validator = new BuildTrigger(['feature/*']); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertFalse($validator->isValid('feature/foo/bar')); // * does not cross / + $this->assertFalse($validator->isValid('main')); + } + + public function testDashInPattern(): void + { + $validator = new BuildTrigger(['feature/test-*']); + $this->assertTrue($validator->isValid('feature/test-1')); + $this->assertTrue($validator->isValid('feature/test-abc')); + $this->assertFalse($validator->isValid('feature/other')); + } + + public function testDoubleWildcardEnd(): void + { + $validator = new BuildTrigger(['src/**']); + $this->assertTrue($validator->isValid('src/foo.js')); + $this->assertTrue($validator->isValid('src/a/b/c.js')); + } + + public function testDoubleWildcardMiddle(): void + { + $validator = new BuildTrigger(['a/**/b']); + $this->assertTrue($validator->isValid('a/b')); // zero intermediate dirs + $this->assertTrue($validator->isValid('a/x/b')); // one + $this->assertTrue($validator->isValid('a/x/y/b')); // two + $this->assertFalse($validator->isValid('a/b/c')); + } + + public function testDoubleWildcardStart(): void + { + $validator = new BuildTrigger(['**/foo']); + $this->assertTrue($validator->isValid('foo')); + $this->assertTrue($validator->isValid('a/foo')); + $this->assertTrue($validator->isValid('a/b/foo')); + $this->assertFalse($validator->isValid('foobar')); + } + + public function testOrSemantics(): void + { + $validator = new BuildTrigger(['main', 'develop']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('develop')); + $this->assertFalse($validator->isValid('feature/x')); + } + + public function testInclusionTakesPrecedenceOverExclusion(): void + { + $validator = new BuildTrigger(['!feature/*', 'feature/abc']); + $this->assertTrue($validator->isValid('feature/abc')); // inclusion wins + $this->assertFalse($validator->isValid('feature/xyz')); // excluded + } + + public function testOnlyExclusions(): void + { + $validator = new BuildTrigger(['!main']); + $this->assertFalse($validator->isValid('main')); + $this->assertTrue($validator->isValid('develop')); // not excluded, passes by default + } +} From abad809a91580ff72b9ce5d9e9f84a880d32f840 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 13:23:12 +0530 Subject: [PATCH 03/25] get PR files in Appwrite --- .../Platform/Modules/VCS/Http/GitHub/Events/Create.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index b04a4e7c5e..09929cc64c 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -212,12 +212,14 @@ class Create extends Action $providerCommitAuthor = $commitDetails["commitAuthor"] ?? ''; $providerCommitMessage = $commitDetails["commitMessage"] ?? ''; + $prFiles = $github->getPullRequestFiles($providerRepositoryOwner, $providerRepositoryName, $providerPullRequestId); + $providerAffectedFiles = array_column($prFiles, 'filename'); + $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [ Query::equal('providerRepositoryId', [$providerRepositoryId]), Query::orderDesc('$createdAt') ])); - $providerAffectedFiles = $parsedPayload['affectedFiles'] ?? []; $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, $external, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); } elseif ($action == "closed") { // Allowed external contributions cleanup From 772358ff5182587a5c59b1620c96ebbdc092bad4 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 13:38:51 +0530 Subject: [PATCH 04/25] more tests --- tests/unit/Vcs/Validator/BuildTriggerTest.php | 186 +++++++++++++++--- 1 file changed, 161 insertions(+), 25 deletions(-) diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php index 7dbf4e8204..61d839cf99 100644 --- a/tests/unit/Vcs/Validator/BuildTriggerTest.php +++ b/tests/unit/Vcs/Validator/BuildTriggerTest.php @@ -7,80 +7,216 @@ use PHPUnit\Framework\TestCase; class BuildTriggerTest extends TestCase { - public function testEmptyPatterns(): void + // ------------------------------------------------------------------------- + // Empty patterns + // ------------------------------------------------------------------------- + + public function testEmptyPatternsAlwaysPass(): void { $validator = new BuildTrigger([]); - $this->assertTrue($validator->isValid('anything')); $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('feature/anything')); + $this->assertTrue($validator->isValid('src/deep/nested/file.php')); } - public function testExactMatch(): void + // ------------------------------------------------------------------------- + // Pure inclusion — OR semantics (any one match is enough) + // ------------------------------------------------------------------------- + + public function testSingleExactInclusion(): void { $validator = new BuildTrigger(['main']); $this->assertTrue($validator->isValid('main')); $this->assertFalse($validator->isValid('develop')); + $this->assertFalse($validator->isValid('main-extra')); } - public function testSingleWildcard(): void + public function testMultipleExactInclusionsOr(): void + { + $validator = new BuildTrigger(['main', 'develop', 'staging']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('develop')); + $this->assertTrue($validator->isValid('staging')); + $this->assertFalse($validator->isValid('feature/foo')); + $this->assertFalse($validator->isValid('production')); + } + + public function testSingleWildcardInclusion(): void { $validator = new BuildTrigger(['feature/*']); $this->assertTrue($validator->isValid('feature/foo')); + $this->assertTrue($validator->isValid('feature/bar')); $this->assertFalse($validator->isValid('feature/foo/bar')); // * does not cross / $this->assertFalse($validator->isValid('main')); } - public function testDashInPattern(): void + public function testWildcardWithDash(): void { $validator = new BuildTrigger(['feature/test-*']); $this->assertTrue($validator->isValid('feature/test-1')); $this->assertTrue($validator->isValid('feature/test-abc')); $this->assertFalse($validator->isValid('feature/other')); + $this->assertFalse($validator->isValid('feature/test')); } - public function testDoubleWildcardEnd(): void + public function testDoubleWildcardAtEnd(): void { $validator = new BuildTrigger(['src/**']); $this->assertTrue($validator->isValid('src/foo.js')); $this->assertTrue($validator->isValid('src/a/b/c.js')); + $this->assertTrue($validator->isValid('src/deep/nested/file.php')); + $this->assertFalse($validator->isValid('lib/foo.js')); } - public function testDoubleWildcardMiddle(): void + public function testDoubleWildcardInMiddle(): void { $validator = new BuildTrigger(['a/**/b']); - $this->assertTrue($validator->isValid('a/b')); // zero intermediate dirs - $this->assertTrue($validator->isValid('a/x/b')); // one + $this->assertTrue($validator->isValid('a/b')); // zero intermediate dirs + $this->assertTrue($validator->isValid('a/x/b')); // one $this->assertTrue($validator->isValid('a/x/y/b')); // two $this->assertFalse($validator->isValid('a/b/c')); + $this->assertFalse($validator->isValid('x/a/b')); } - public function testDoubleWildcardStart(): void + public function testDoubleWildcardAtStart(): void { $validator = new BuildTrigger(['**/foo']); - $this->assertTrue($validator->isValid('foo')); - $this->assertTrue($validator->isValid('a/foo')); - $this->assertTrue($validator->isValid('a/b/foo')); + $this->assertTrue($validator->isValid('foo')); // zero leading dirs + $this->assertTrue($validator->isValid('a/foo')); // one + $this->assertTrue($validator->isValid('a/b/foo')); // two $this->assertFalse($validator->isValid('foobar')); + $this->assertFalse($validator->isValid('a/foobar')); } - public function testOrSemantics(): void + public function testMixedExactAndWildcardInclusions(): void { - $validator = new BuildTrigger(['main', 'develop']); + $validator = new BuildTrigger(['main', 'feature/*']); $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); - $this->assertFalse($validator->isValid('feature/x')); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertFalse($validator->isValid('develop')); + $this->assertFalse($validator->isValid('feature/foo/bar')); } - public function testInclusionTakesPrecedenceOverExclusion(): void - { - $validator = new BuildTrigger(['!feature/*', 'feature/abc']); - $this->assertTrue($validator->isValid('feature/abc')); // inclusion wins - $this->assertFalse($validator->isValid('feature/xyz')); // excluded - } + // ------------------------------------------------------------------------- + // Pure exclusion — AND semantics (must not match any exclusion) + // ------------------------------------------------------------------------- - public function testOnlyExclusions(): void + public function testSingleExactExclusion(): void { $validator = new BuildTrigger(['!main']); $this->assertFalse($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); // not excluded, passes by default + $this->assertTrue($validator->isValid('develop')); + $this->assertTrue($validator->isValid('feature/foo')); + } + + public function testMultipleExactExclusionsAnd(): void + { + $validator = new BuildTrigger(['!main', '!develop']); + $this->assertFalse($validator->isValid('main')); + $this->assertFalse($validator->isValid('develop')); + $this->assertTrue($validator->isValid('staging')); // neither excluded + $this->assertTrue($validator->isValid('feature/foo')); + } + + public function testWildcardExclusion(): void + { + $validator = new BuildTrigger(['!feature/*']); + $this->assertFalse($validator->isValid('feature/foo')); + $this->assertFalse($validator->isValid('feature/bar')); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('hotfix/urgent')); // not matched by feature/* + } + + public function testDoubleWildcardExclusion(): void + { + $validator = new BuildTrigger(['!src/**']); + $this->assertFalse($validator->isValid('src/foo.js')); + $this->assertFalse($validator->isValid('src/a/b/c.js')); + $this->assertTrue($validator->isValid('lib/foo.js')); + $this->assertTrue($validator->isValid('main')); + } + + // ------------------------------------------------------------------------- + // Mixed inclusion + exclusion + // ------------------------------------------------------------------------- + + public function testInclusionTakesPrecedenceWhenBothMatch(): void + { + // feature/abc matches both '!feature/*' (exclusion) and 'feature/abc' (inclusion) + // Inclusion is checked first, so it wins + $validator = new BuildTrigger(['!feature/*', 'feature/abc']); + $this->assertTrue($validator->isValid('feature/abc')); // inclusion wins + $this->assertFalse($validator->isValid('feature/xyz')); // only exclusion matches + $this->assertFalse($validator->isValid('main')); // no inclusion matches + } + + public function testInclusionWithNoMatchFails(): void + { + // Inclusions exist but none match — exclusion is irrelevant + $validator = new BuildTrigger(['main', '!develop']); + $this->assertTrue($validator->isValid('main')); + $this->assertFalse($validator->isValid('develop')); // excluded even if inclusion didn't match + $this->assertFalse($validator->isValid('staging')); // no inclusion match + } + + public function testExclusionBlocksWhenInclusionDoesNotMatch(): void + { + $validator = new BuildTrigger(['feature/*', '!hotfix/*']); + $this->assertTrue($validator->isValid('feature/foo')); // matches inclusion + $this->assertFalse($validator->isValid('hotfix/urgent')); // no inclusion match, also excluded + $this->assertFalse($validator->isValid('main')); // no inclusion match + } + + public function testMultipleInclusionsWithSingleExclusion(): void + { + // feature/wip matches the inclusion feature/* → true (exclusion !feature/wip is never reached) + $validator = new BuildTrigger(['main', 'develop', 'feature/*', '!feature/wip']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('develop')); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins + $this->assertFalse($validator->isValid('hotfix/urgent')); // no inclusion match + } + + public function testSingleInclusionWithMultipleExclusions(): void + { + // feature/wip and feature/experimental both match the inclusion feature/** → true + $validator = new BuildTrigger(['feature/**', '!feature/wip', '!feature/experimental']); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertTrue($validator->isValid('feature/a/b')); + $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins + $this->assertTrue($validator->isValid('feature/experimental')); // inclusion wins + $this->assertFalse($validator->isValid('main')); // no inclusion match + } + + public function testMultipleInclusionsWithMultipleExclusions(): void + { + // feature/wip and feature/experimental both match the inclusion feature/** → true + $validator = new BuildTrigger(['main', 'feature/**', '!feature/wip', '!feature/experimental']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertTrue($validator->isValid('feature/a/b')); + $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins + $this->assertTrue($validator->isValid('feature/experimental')); // inclusion wins + $this->assertFalse($validator->isValid('develop')); // no inclusion match + } + + public function testSpecificInclusionOverridesWildcardExclusion(): void + { + // Narrow allowlist with a carve-out: exclude all of feature/* except feature/hotfix/critical + $validator = new BuildTrigger(['feature/hotfix/critical', '!feature/**']); + $this->assertTrue($validator->isValid('feature/hotfix/critical')); // inclusion wins + $this->assertFalse($validator->isValid('feature/foo')); // excluded + $this->assertFalse($validator->isValid('feature/hotfix/other')); // excluded + $this->assertFalse($validator->isValid('main')); // no inclusion match + } + + public function testOnlyExclusionsDefaultToTrueUnlessExcluded(): void + { + $validator = new BuildTrigger(['!main', '!develop']); + $this->assertFalse($validator->isValid('main')); + $this->assertFalse($validator->isValid('develop')); + $this->assertTrue($validator->isValid('staging')); // passes — no inclusions required + $this->assertTrue($validator->isValid('feature/foo')); } } From 175fcb51a8eb289cb2d5362b6d2474d06a0846a9 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 13:41:52 +0530 Subject: [PATCH 05/25] remove default --- src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index f4c522fb44..3f39ac9018 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -41,7 +41,7 @@ trait Deployment string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, - array $providerAffectedFiles = [], + array $providerAffectedFiles, bool $external, Database $dbForPlatform, Authorization $authorization, From a4f174ea7ed47eff656b953325d69c66c4fb6ecd Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 14:21:32 +0530 Subject: [PATCH 06/25] update VCS --- composer.lock | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index d3d9600e5d..cdbf3c535d 100644 --- a/composer.lock +++ b/composer.lock @@ -8441,18 +8441,9 @@ "time": "2024-11-07T12:36:22+00:00" } ], - "aliases": [ - { - "package": "utopia-php/vcs", - "version": "dev-ser-401", - "alias": "3.0.99", - "alias_normalized": "3.0.99.0" - } - ], + "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "utopia-php/vcs": 20 - }, + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { From e17cdc2bd47602f3942ff23e9a5c0e2aaba290fa Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 16:31:42 +0530 Subject: [PATCH 07/25] fix pattern logic --- src/Appwrite/Vcs/Validator/BuildTrigger.php | 32 ++++++++++-- tests/unit/Vcs/Validator/BuildTriggerTest.php | 50 +++++++++++++++---- 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php index 44296ae73a..0cad312e7b 100644 --- a/src/Appwrite/Vcs/Validator/BuildTrigger.php +++ b/src/Appwrite/Vcs/Validator/BuildTrigger.php @@ -21,24 +21,48 @@ class BuildTrigger extends Validator $include = array_filter($this->patterns, fn ($p) => !str_starts_with($p, '!')); $exclude = array_filter($this->patterns, fn ($p) => str_starts_with($p, '!')); + if (empty($include)) { + // Only exclusions: pass everything unless excluded. + foreach ($exclude as $pattern) { + if ($this->matchGlob($value, substr($pattern, 1))) { + return false; + } + } + return true; + } + + // A pattern is "specific" when it contains no wildcard characters. + $isSpecific = fn($p) => !str_contains($p, '*') && !str_contains($p, '?'); + + // 1. Specific inclusion always wins — an explicit exact match is never blocked. foreach ($include as $pattern) { - if ($this->matchGlob($value, $pattern)) { + if ($isSpecific($pattern) && $this->matchGlob($value, $pattern)) { return true; } } + // 2. Specific exclusion overrides a wildcard inclusion — refines broad patterns. foreach ($exclude as $pattern) { - if ($this->matchGlob($value, substr($pattern, 1))) { + $raw = substr($pattern, 1); + if ($isSpecific($raw) && $this->matchGlob($value, $raw)) { return false; } } - return empty($include); + // 3. Wildcard inclusion wins over any remaining wildcard exclusion. + foreach ($include as $pattern) { + if (!$isSpecific($pattern) && $this->matchGlob($value, $pattern)) { + return true; + } + } + + // No inclusion matched. + return false; } public function getDescription(): string { - return 'Value must match at least one inclusion pattern and must not match any exclusion pattern.'; + return 'Value must match a specific inclusion, or a wildcard inclusion not overridden by a specific exclusion.'; } public function isArray(): bool diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php index 61d839cf99..a359a570ac 100644 --- a/tests/unit/Vcs/Validator/BuildTriggerTest.php +++ b/tests/unit/Vcs/Validator/BuildTriggerTest.php @@ -59,6 +59,34 @@ class BuildTriggerTest extends TestCase $this->assertFalse($validator->isValid('feature/test')); } + public function testQuestionMarkWildcard(): void + { + $validator = new BuildTrigger(['v?.?']); + $this->assertTrue($validator->isValid('v1.0')); + $this->assertTrue($validator->isValid('v2.5')); + $this->assertFalse($validator->isValid('v10.0')); // ? matches exactly one char, not two + $this->assertFalse($validator->isValid('v1/0')); // ? does not cross / + } + + public function testQuestionMarkDoesNotCrossSlash(): void + { + $validator = new BuildTrigger(['feature/?']); + $this->assertTrue($validator->isValid('feature/a')); + $this->assertTrue($validator->isValid('feature/z')); + $this->assertFalse($validator->isValid('feature/ab')); // ? matches only one char + $this->assertFalse($validator->isValid('feature/a/b')); // ? does not cross / + $this->assertFalse($validator->isValid('feature/')); + } + + public function testQuestionMarkMixedWithStar(): void + { + $validator = new BuildTrigger(['fix-?.*']); + $this->assertTrue($validator->isValid('fix-1.php')); + $this->assertTrue($validator->isValid('fix-a.js')); + $this->assertFalse($validator->isValid('fix-12.php')); // ? matches only one char + $this->assertFalse($validator->isValid('fix-.php')); // ? requires exactly one char + } + public function testDoubleWildcardAtEnd(): void { $validator = new BuildTrigger(['src/**']); @@ -169,36 +197,36 @@ class BuildTriggerTest extends TestCase public function testMultipleInclusionsWithSingleExclusion(): void { - // feature/wip matches the inclusion feature/* → true (exclusion !feature/wip is never reached) + // feature/wip matches wildcard inclusion feature/* but specific exclusion !feature/wip overrides it $validator = new BuildTrigger(['main', 'develop', 'feature/*', '!feature/wip']); $this->assertTrue($validator->isValid('main')); $this->assertTrue($validator->isValid('develop')); $this->assertTrue($validator->isValid('feature/foo')); - $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins + $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion overrides wildcard inclusion $this->assertFalse($validator->isValid('hotfix/urgent')); // no inclusion match } public function testSingleInclusionWithMultipleExclusions(): void { - // feature/wip and feature/experimental both match the inclusion feature/** → true + // specific exclusions !feature/wip and !feature/experimental override wildcard inclusion feature/** $validator = new BuildTrigger(['feature/**', '!feature/wip', '!feature/experimental']); $this->assertTrue($validator->isValid('feature/foo')); $this->assertTrue($validator->isValid('feature/a/b')); - $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins - $this->assertTrue($validator->isValid('feature/experimental')); // inclusion wins - $this->assertFalse($validator->isValid('main')); // no inclusion match + $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion wins + $this->assertFalse($validator->isValid('feature/experimental')); // specific exclusion wins + $this->assertFalse($validator->isValid('main')); // no inclusion match } public function testMultipleInclusionsWithMultipleExclusions(): void { - // feature/wip and feature/experimental both match the inclusion feature/** → true + // specific exclusions override the wildcard inclusion; specific inclusion 'main' is unaffected $validator = new BuildTrigger(['main', 'feature/**', '!feature/wip', '!feature/experimental']); - $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('main')); // specific inclusion wins regardless $this->assertTrue($validator->isValid('feature/foo')); $this->assertTrue($validator->isValid('feature/a/b')); - $this->assertTrue($validator->isValid('feature/wip')); // inclusion wins - $this->assertTrue($validator->isValid('feature/experimental')); // inclusion wins - $this->assertFalse($validator->isValid('develop')); // no inclusion match + $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion wins + $this->assertFalse($validator->isValid('feature/experimental')); // specific exclusion wins + $this->assertFalse($validator->isValid('develop')); // no inclusion match } public function testSpecificInclusionOverridesWildcardExclusion(): void From a70d241da049abead910561f0b9bff06fca68e65 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 16:37:31 +0530 Subject: [PATCH 08/25] fix path trigger --- .../Modules/VCS/Http/GitHub/Deployment.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 3f39ac9018..c30f960262 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -576,9 +576,17 @@ trait Deployment return false; } - $pathTrigger = new BuildTrigger($resource->getAttribute('providerPaths', [])); - foreach ($providerAffectedFiles as $file) { - if (!$pathTrigger->isValid($file)) { + $providerPaths = $resource->getAttribute('providerPaths', []); + if (!empty($providerPaths) && !empty($providerAffectedFiles)) { + $pathTrigger = new BuildTrigger($providerPaths); + $pathMatched = false; + foreach ($providerAffectedFiles as $file) { + if ($pathTrigger->isValid($file)) { + $pathMatched = true; + break; + } + } + if (!$pathMatched) { Span::add("{$logBase}.build.skipped.reason", 'path'); return false; } From 87f29c688932426a587520d1104199a7dccaee21 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 16:48:37 +0530 Subject: [PATCH 09/25] include previous_filename --- .../Modules/VCS/Http/GitHub/Authorize/External/Update.php | 5 ++++- .../Platform/Modules/VCS/Http/GitHub/Events/Create.php | 5 ++++- src/Appwrite/Vcs/Validator/BuildTrigger.php | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php index b3ff4f96fa..56230b7de3 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php @@ -131,7 +131,10 @@ class Update extends Action $providerCommitAuthorUrl = $commitDetails["commitAuthorUrl"] ?? ''; $prFiles = $github->getPullRequestFiles($owner, $providerRepositoryName, $providerPullRequestId); - $providerAffectedFiles = array_column($prFiles, 'filename'); + $providerAffectedFiles = [ + ...array_column($prFiles, 'filename'), + ...array_column($prFiles, 'previous_filename') + ]; $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index 09929cc64c..28aeb8c140 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -213,7 +213,10 @@ class Create extends Action $providerCommitMessage = $commitDetails["commitMessage"] ?? ''; $prFiles = $github->getPullRequestFiles($providerRepositoryOwner, $providerRepositoryName, $providerPullRequestId); - $providerAffectedFiles = array_column($prFiles, 'filename'); + $providerAffectedFiles = [ + ...array_column($prFiles, 'filename'), + ...array_column($prFiles, 'previous_filename') + ]; $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [ Query::equal('providerRepositoryId', [$providerRepositoryId]), diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php index 0cad312e7b..842d81a455 100644 --- a/src/Appwrite/Vcs/Validator/BuildTrigger.php +++ b/src/Appwrite/Vcs/Validator/BuildTrigger.php @@ -6,7 +6,9 @@ use Utopia\Validator; class BuildTrigger extends Validator { - public function __construct(private readonly array $patterns) {} + public function __construct(private readonly array $patterns) + { + } public function isValid($value): bool { @@ -32,7 +34,7 @@ class BuildTrigger extends Validator } // A pattern is "specific" when it contains no wildcard characters. - $isSpecific = fn($p) => !str_contains($p, '*') && !str_contains($p, '?'); + $isSpecific = fn ($p) => !str_contains($p, '*') && !str_contains($p, '?'); // 1. Specific inclusion always wins — an explicit exact match is never blocked. foreach ($include as $pattern) { From e802102c8f08419720c1ee0599367c22a2723ba0 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 17:09:38 +0530 Subject: [PATCH 10/25] fix exclusion sub-directory --- src/Appwrite/Vcs/Validator/BuildTrigger.php | 11 +++++------ tests/unit/Vcs/Validator/BuildTriggerTest.php | 11 +++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php index 842d81a455..22037c8907 100644 --- a/src/Appwrite/Vcs/Validator/BuildTrigger.php +++ b/src/Appwrite/Vcs/Validator/BuildTrigger.php @@ -34,7 +34,7 @@ class BuildTrigger extends Validator } // A pattern is "specific" when it contains no wildcard characters. - $isSpecific = fn ($p) => !str_contains($p, '*') && !str_contains($p, '?'); + $isSpecific = fn ($pattern) => !str_contains($pattern, '*') && !str_contains($pattern, '?'); // 1. Specific inclusion always wins — an explicit exact match is never blocked. foreach ($include as $pattern) { @@ -43,15 +43,14 @@ class BuildTrigger extends Validator } } - // 2. Specific exclusion overrides a wildcard inclusion — refines broad patterns. + // 2. Any exclusion (specific or wildcard) overrides a wildcard inclusion — refines broad patterns. foreach ($exclude as $pattern) { - $raw = substr($pattern, 1); - if ($isSpecific($raw) && $this->matchGlob($value, $raw)) { + if ($this->matchGlob($value, substr($pattern, 1))) { return false; } } - // 3. Wildcard inclusion wins over any remaining wildcard exclusion. + // 3. Wildcard inclusion — no exclusion blocked it. foreach ($include as $pattern) { if (!$isSpecific($pattern) && $this->matchGlob($value, $pattern)) { return true; @@ -64,7 +63,7 @@ class BuildTrigger extends Validator public function getDescription(): string { - return 'Value must match a specific inclusion, or a wildcard inclusion not overridden by a specific exclusion.'; + return 'Value must match a specific inclusion, or a wildcard inclusion not overridden by any exclusion.'; } public function isArray(): bool diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php index a359a570ac..b26033b20b 100644 --- a/tests/unit/Vcs/Validator/BuildTriggerTest.php +++ b/tests/unit/Vcs/Validator/BuildTriggerTest.php @@ -229,6 +229,17 @@ class BuildTriggerTest extends TestCase $this->assertFalse($validator->isValid('develop')); // no inclusion match } + public function testWildcardExclusionOverridesWildcardInclusion(): void + { + // src/** is a broad inclusion; !src/generated/** carves out the generated subtree + $validator = new BuildTrigger(['src/**', '!src/generated/**']); + $this->assertTrue($validator->isValid('src/components/Button.php')); + $this->assertTrue($validator->isValid('src/utils/helper.js')); + $this->assertFalse($validator->isValid('src/generated/Foo.php')); // wildcard exclusion wins + $this->assertFalse($validator->isValid('src/generated/bar/Baz.php')); // wildcard exclusion wins + $this->assertFalse($validator->isValid('lib/other.php')); // no inclusion match + } + public function testSpecificInclusionOverridesWildcardExclusion(): void { // Narrow allowlist with a carve-out: exclude all of feature/* except feature/hotfix/critical From 60e51548e8983f4e719ba0e2261df8c3adfbff5b Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 17:09:45 +0530 Subject: [PATCH 11/25] more tests --- tests/unit/Vcs/Validator/BuildTriggerTest.php | 205 ++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php index b26033b20b..66aa94abed 100644 --- a/tests/unit/Vcs/Validator/BuildTriggerTest.php +++ b/tests/unit/Vcs/Validator/BuildTriggerTest.php @@ -258,4 +258,209 @@ class BuildTriggerTest extends TestCase $this->assertTrue($validator->isValid('staging')); // passes — no inclusions required $this->assertTrue($validator->isValid('feature/foo')); } + + // ------------------------------------------------------------------------- + // Standalone wildcards + // ------------------------------------------------------------------------- + + public function testStarAloneMatchesSingleSegmentOnly(): void + { + // * → ^[^/]*$ — matches any single segment; the [^/]* guard prevents crossing / + $validator = new BuildTrigger(['*']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('develop')); + $this->assertFalse($validator->isValid('feature/foo')); // * cannot cross / + $this->assertFalse($validator->isValid('a/b/c')); + } + + public function testDoubleStarAloneMatchesEverything(): void + { + // ** alone → ^.*$ — matches any string including paths with separators + $validator = new BuildTrigger(['**']); + $this->assertTrue($validator->isValid('main')); + $this->assertTrue($validator->isValid('feature/foo')); + $this->assertTrue($validator->isValid('src/a/b/c/d/file.php')); + } + + // ------------------------------------------------------------------------- + // Extension patterns — * scope vs. ** scope + // ------------------------------------------------------------------------- + + public function testStarDotExtMatchesRootLevelOnly(): void + { + // *.php → ^[^/]*\.php$ — root-level only; * cannot cross / + $validator = new BuildTrigger(['*.php']); + $this->assertTrue($validator->isValid('Foo.php')); + $this->assertTrue($validator->isValid('index.php')); + $this->assertFalse($validator->isValid('src/Foo.php')); // * does not cross / + $this->assertFalse($validator->isValid('a/b/Foo.php')); + $this->assertFalse($validator->isValid('Foo.js')); + } + + public function testDoubleStarSlashExtMatchesAnyDepth(): void + { + // **/*.php → ^(?:.+/)?[^/]*\.php$ — (?:.+/)? is optional so root also matches + $validator = new BuildTrigger(['**/*.php']); + $this->assertTrue($validator->isValid('Foo.php')); // root — zero leading dirs + $this->assertTrue($validator->isValid('src/Foo.php')); + $this->assertTrue($validator->isValid('src/components/Foo.php')); + $this->assertTrue($validator->isValid('a/b/c/d/Foo.php')); // four levels deep + $this->assertFalse($validator->isValid('Foo.js')); + $this->assertFalse($validator->isValid('src/Foo.js')); + } + + public function testDirPrefixDoubleStarExtPattern(): void + { + // src/**/*.php → ^src/(?:.+/)?[^/]*\.php$ — scoped to src/ at any depth + $validator = new BuildTrigger(['src/**/*.php']); + $this->assertTrue($validator->isValid('src/Foo.php')); + $this->assertTrue($validator->isValid('src/components/Foo.php')); + $this->assertTrue($validator->isValid('src/a/b/c/Foo.php')); + $this->assertFalse($validator->isValid('Foo.php')); // outside src/ + $this->assertFalse($validator->isValid('lib/Foo.php')); + $this->assertFalse($validator->isValid('src/Foo.js')); + } + + // ------------------------------------------------------------------------- + // Dots as literal characters + // ------------------------------------------------------------------------- + + public function testDotsInPatternAreLiteral(): void + { + // preg_quote escapes . to \. — dots are never regex wildcards + $validator = new BuildTrigger(['release-1.0.0']); + $this->assertTrue($validator->isValid('release-1.0.0')); + $this->assertFalse($validator->isValid('release-1X0Y0')); // X/Y must not satisfy a literal dot + $this->assertFalse($validator->isValid('release-1.0.0-hotfix')); // extra suffix rejected by $ anchor + } + + public function testVersionWildcardBranchPattern(): void + { + // v*.*.* → ^v[^/]*\.[^/]*\.[^/]*$ — dots literal; [^/]* is greedy and can consume dots, + // so v1.2.3.4 also matches (first [^/]* eats "1.2") — documents current behavior + $validator = new BuildTrigger(['v*.*.*']); + $this->assertTrue($validator->isValid('v1.2.3')); + $this->assertTrue($validator->isValid('v10.20.30')); + $this->assertTrue($validator->isValid('v1.2.3.4')); // greedy match — first [^/]* eats "1.2" + $this->assertFalse($validator->isValid('v1.2')); // only two dot-segments; third \.[^/]* fails + $this->assertFalse($validator->isValid('1.2.3')); // missing leading v + $this->assertFalse($validator->isValid('v1/2/3')); // [^/]* cannot cross / + } + + public function testDottedFilenamePattern(): void + { + // *.test.js → ^[^/]*\.test\.js$ — both dots literal; * stays in root segment + $validator = new BuildTrigger(['*.test.js']); + $this->assertTrue($validator->isValid('Button.test.js')); + $this->assertTrue($validator->isValid('App.test.js')); + $this->assertFalse($validator->isValid('ButtonXtestYjs')); // dots must be literal + $this->assertFalse($validator->isValid('src/Button.test.js')); // * does not cross / + $this->assertFalse($validator->isValid('Button.test.ts')); + } + + // ------------------------------------------------------------------------- + // Prefix wildcard + // ------------------------------------------------------------------------- + + public function testPrefixWildcardBranchPattern(): void + { + // main* → ^main[^/]*$ — suffix wildcard; [^/]* cannot cross / + $validator = new BuildTrigger(['main*']); + $this->assertTrue($validator->isValid('main')); // zero trailing chars + $this->assertTrue($validator->isValid('main-extra')); + $this->assertTrue($validator->isValid('mainline')); + $this->assertFalse($validator->isValid('main/branch')); // [^/]* cannot cross / + $this->assertFalse($validator->isValid('develop')); + } + + // ------------------------------------------------------------------------- + // Deep nesting + // ------------------------------------------------------------------------- + + public function testDoubleWildcardInMiddleDeepNesting(): void + { + // a/**/b → ^a/(?:.+/)?b$ — .+ inside (?:.+/)? matches any chars including /, + // so it handles arbitrarily many intermediate directories + $validator = new BuildTrigger(['a/**/b']); + $this->assertTrue($validator->isValid('a/x/y/z/b')); // three intermediate dirs + $this->assertTrue($validator->isValid('a/p/q/r/s/b')); // four intermediate dirs + $this->assertTrue($validator->isValid('a/1/2/3/4/5/b')); // five intermediate dirs + $this->assertFalse($validator->isValid('a/x/y/z/b/extra')); // trailing segment rejected + $this->assertFalse($validator->isValid('prefix/a/x/b')); // leading segment rejected + } + + public function testDoubleWildcardAtStartDeepNesting(): void + { + // **/README.md → ^(?:.+/)?README\.md$ — matches at any depth; $ anchor prevents suffixes + $validator = new BuildTrigger(['**/README.md']); + $this->assertTrue($validator->isValid('README.md')); // zero leading dirs + $this->assertTrue($validator->isValid('docs/README.md')); + $this->assertTrue($validator->isValid('a/b/c/d/README.md')); // four levels deep + $this->assertTrue($validator->isValid('x/y/z/w/v/README.md')); // five levels deep + $this->assertFalse($validator->isValid('a/b/c/README.md.bak')); // $ anchor — no suffix + $this->assertFalse($validator->isValid('a/b/c/README.md/extra')); // trailing segment rejected + } + + // ------------------------------------------------------------------------- + // Real-world path patterns + // ------------------------------------------------------------------------- + + public function testGeneratedFilesAnywhereExclusion(): void + { + // !**/generated/** → ^(?:.+/)?generated/.*$ — excludes generated/ at any depth + $validator = new BuildTrigger(['!**/generated/**']); + $this->assertFalse($validator->isValid('generated/Foo.php')); // root generated/ + $this->assertFalse($validator->isValid('src/generated/Foo.php')); + $this->assertFalse($validator->isValid('src/api/generated/Bar.php')); // deep generated/ + $this->assertFalse($validator->isValid('generated/sub/deep/File.php')); // deep inside root generated/ + $this->assertTrue($validator->isValid('src/components/Button.php')); // not under generated/ + $this->assertTrue($validator->isValid('main')); + } + + public function testMultipleExtensionInclusions(): void + { + // OR semantics: any PHP or JS file triggers; other extensions do not + $validator = new BuildTrigger(['**/*.php', '**/*.js']); + $this->assertTrue($validator->isValid('index.php')); + $this->assertTrue($validator->isValid('src/App.php')); + $this->assertTrue($validator->isValid('index.js')); + $this->assertTrue($validator->isValid('src/components/App.js')); + $this->assertFalse($validator->isValid('styles.css')); + $this->assertFalse($validator->isValid('src/styles.css')); + $this->assertFalse($validator->isValid('README.md')); + } + + // ------------------------------------------------------------------------- + // Named-prefix single-level branch + // ------------------------------------------------------------------------- + + public function testReleaseBranchPattern(): void + { + // release/* → ^release/[^/]*$ — one level only; * stops at the next / + $validator = new BuildTrigger(['release/*']); + $this->assertTrue($validator->isValid('release/1.0')); + $this->assertTrue($validator->isValid('release/hotfix')); + $this->assertTrue($validator->isValid('release/2024-01-15')); + $this->assertFalse($validator->isValid('release/1.0/patch')); // * stops at / + $this->assertFalse($validator->isValid('release')); // missing the /* segment + $this->assertFalse($validator->isValid('main')); + } + + // ------------------------------------------------------------------------- + // Case sensitivity + // ------------------------------------------------------------------------- + + public function testPatternMatchingIsCaseSensitive(): void + { + // preg_match is used without the i flag — matching is always case-sensitive + $branchValidator = new BuildTrigger(['main']); + $this->assertTrue($branchValidator->isValid('main')); + $this->assertFalse($branchValidator->isValid('Main')); + $this->assertFalse($branchValidator->isValid('MAIN')); + + $wildcardValidator = new BuildTrigger(['feature/*']); + $this->assertTrue($wildcardValidator->isValid('feature/foo')); + $this->assertFalse($wildcardValidator->isValid('Feature/foo')); + $this->assertFalse($wildcardValidator->isValid('FEATURE/foo')); + } } From aa5543ac0afd259848fa1ded7345a884dd0dd338 Mon Sep 17 00:00:00 2001 From: Hemachandar Date: Tue, 24 Mar 2026 17:31:48 +0530 Subject: [PATCH 12/25] filter out null values --- .../Modules/VCS/Http/GitHub/Authorize/External/Update.php | 2 +- src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php index 56230b7de3..99f0e0cadd 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php @@ -133,7 +133,7 @@ class Update extends Action $prFiles = $github->getPullRequestFiles($owner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), - ...array_column($prFiles, 'previous_filename') + ...array_filter(array_column($prFiles, 'previous_filename')) // Filter out null values ]; $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $platform); diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index 28aeb8c140..4c75515aaa 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -215,7 +215,7 @@ class Create extends Action $prFiles = $github->getPullRequestFiles($providerRepositoryOwner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), - ...array_column($prFiles, 'previous_filename') + ...array_filter(array_column($prFiles, 'previous_filename')) // Filter out null values ]; $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [ From 63f04f893ddfff7c672495ccc5e3ff6131caa2c2 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 20 Apr 2026 12:18:26 +0530 Subject: [PATCH 13/25] fix composer --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index cdbf3c535d..d0d69bd0c5 100644 --- a/composer.lock +++ b/composer.lock @@ -8464,5 +8464,5 @@ "platform-dev": { "ext-fileinfo": "*" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } From 2d3c1086ae0e15ac60b38a0af6ae9a8d13265926 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Wed, 29 Apr 2026 13:50:40 +0530 Subject: [PATCH 14/25] add endpoints --- .../Platform/Modules/Functions/Http/Functions/Create.php | 6 ++++++ .../Platform/Modules/Functions/Http/Functions/Update.php | 6 ++++++ src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php | 7 +++++++ src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php | 7 +++++++ 4 files changed, 26 insertions(+) diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php index 7b294f3f90..f25c48937b 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php @@ -93,6 +93,8 @@ class Create extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true) + ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -145,6 +147,8 @@ class Create extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, + array $providerBranches, + array $providerPaths, string $buildSpecification, string $runtimeSpecification, string $templateRepository, @@ -246,6 +250,8 @@ class Create extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, + 'providerBranches' => $providerBranches, + 'providerPaths' => $providerPaths, 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, ])); diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php index 7d6572d336..5c5d312ae8 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php @@ -87,6 +87,8 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true) + ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -131,6 +133,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, + array $providerBranches, + array $providerPaths, string $buildSpecification, string $runtimeSpecification, int $deploymentRetention, @@ -274,6 +278,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, + 'providerBranches' => $providerBranches, + 'providerPaths' => $providerPaths, 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$functionId, $name, $runtime]), diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php index d01d0d8ca7..9f3d46ffd0 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php @@ -19,6 +19,7 @@ use Utopia\Database\Helpers\ID; use Utopia\Platform\Action; use Utopia\Platform\Scope\HTTP; use Utopia\System\System; +use Utopia\Validator\ArrayList; use Utopia\Validator\Boolean; use Utopia\Validator\Range; use Utopia\Validator\Text; @@ -78,6 +79,8 @@ class Create extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true) + ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -118,6 +121,8 @@ class Create extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, + array $providerBranches, + array $providerPaths, string $buildSpecification, string $runtimeSpecification, int $deploymentRetention, @@ -173,6 +178,8 @@ class Create extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, + 'providerBranches' => $providerBranches, + 'providerPaths' => $providerPaths, 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, 'buildRuntime' => $buildRuntime, diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php index 3c0d090b7b..32443d2250 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php @@ -22,6 +22,7 @@ use Utopia\Http\Adapter\Swoole\Request; use Utopia\Platform\Action; use Utopia\Platform\Scope\HTTP; use Utopia\System\System; +use Utopia\Validator\ArrayList; use Utopia\Validator\Boolean; use Utopia\Validator\Range; use Utopia\Validator\Text; @@ -81,6 +82,8 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true) + ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -125,6 +128,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, + array $providerBranches, + array $providerPaths, string $buildSpecification, string $runtimeSpecification, int $deploymentRetention, @@ -269,6 +274,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, + 'providerBranches' => $providerBranches, + 'providerPaths' => $providerPaths, 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$siteId, $name, $framework]), From e7405b439362f2471e20916c5dbbe9ecd9b4dc57 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 30 Apr 2026 13:01:00 +0530 Subject: [PATCH 15/25] addressed comments --- .../Modules/Functions/Http/Functions/Update.php | 12 ++++++------ .../Platform/Modules/Sites/Http/Sites/Update.php | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php index 5c5d312ae8..b165026688 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php @@ -87,8 +87,8 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true) - ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) - ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) + ->param('providerBranches', null, new Nullable(new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', null, new Nullable(new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -133,8 +133,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - array $providerBranches, - array $providerPaths, + ?array $providerBranches, + ?array $providerPaths, string $buildSpecification, string $runtimeSpecification, int $deploymentRetention, @@ -278,8 +278,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'providerBranches' => $providerBranches, - 'providerPaths' => $providerPaths, + 'providerBranches' => $providerBranches ?? $function->getAttribute('providerBranches', []), + 'providerPaths' => $providerPaths ?? $function->getAttribute('providerPaths', []), 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$functionId, $name, $runtime]), diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php index 32443d2250..fd079fcda8 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php @@ -24,6 +24,7 @@ use Utopia\Platform\Scope\HTTP; use Utopia\System\System; use Utopia\Validator\ArrayList; use Utopia\Validator\Boolean; +use Utopia\Validator\Nullable; use Utopia\Validator\Range; use Utopia\Validator\Text; use Utopia\Validator\WhiteList; @@ -82,8 +83,8 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true) - ->param('providerBranches', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) - ->param('providerPaths', [], new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) + ->param('providerBranches', null, new Nullable(new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'List of branch name patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all branches.', true) + ->param('providerPaths', null, new Nullable(new ArrayList(new Text(128), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'List of file path patterns to trigger automatic deployments. Supports wildcards. Leave empty to deploy on all file changes.', true) ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), @@ -128,8 +129,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - array $providerBranches, - array $providerPaths, + ?array $providerBranches, + ?array $providerPaths, string $buildSpecification, string $runtimeSpecification, int $deploymentRetention, @@ -274,8 +275,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'providerBranches' => $providerBranches, - 'providerPaths' => $providerPaths, + 'providerBranches' => $providerBranches ?? $site->getAttribute('providerBranches', []), + 'providerPaths' => $providerPaths ?? $site->getAttribute('providerPaths', []), 'buildSpecification' => $buildSpecification, 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$siteId, $name, $framework]), From 40c2e1a1faff5468983b30d7ffafb1d84bd1efac Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 4 May 2026 13:09:38 +0530 Subject: [PATCH 16/25] feat: skip deployment on commit message pattern match Add providerCommitSkipPatterns array field to functions and sites. Any commit message containing one of the patterns (case-insensitive substring) skips the VCS-triggered deployment. Co-Authored-By: Claude Sonnet 4.6 --- app/config/collections/projects.php | 22 +++ .../Modules/VCS/Http/GitHub/Deployment.php | 11 +- .../Vcs/Validator/CommitSkipPatterns.php | 50 +++++++ .../Vcs/Validator/CommitSkipPatternsTest.php | 141 ++++++++++++++++++ 4 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 src/Appwrite/Vcs/Validator/CommitSkipPatterns.php create mode 100644 tests/unit/Vcs/Validator/CommitSkipPatternsTest.php diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php index 9ac5c562e3..72daf91688 100644 --- a/app/config/collections/projects.php +++ b/app/config/collections/projects.php @@ -863,6 +863,17 @@ return [ 'array' => true, 'filters' => [], ], + [ + '$id' => ID::custom('providerCommitSkipPatterns'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], ], 'indexes' => [ [ @@ -1364,6 +1375,17 @@ return [ 'array' => true, 'filters' => [], ], + [ + '$id' => ID::custom('providerCommitSkipPatterns'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => true, + 'required' => false, + 'default' => [], + 'array' => true, + 'filters' => [], + ], ], 'indexes' => [ [ diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 6c59d3c80a..d2b2511a43 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -8,6 +8,7 @@ use Appwrite\Extend\Exception; use Appwrite\Filter\BranchDomain as BranchDomainFilter; use Appwrite\Vcs\Comment; use Appwrite\Vcs\Validator\BuildTrigger; +use Appwrite\Vcs\Validator\CommitSkipPatterns; use Utopia\Config\Config; use Utopia\Console; use Utopia\Database\Database; @@ -96,7 +97,7 @@ trait Deployment $resource = $authorization->skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId)); $resourceInternalId = $resource->getSequence(); - if (!$this->isResourceBuildable($resource, $providerBranch, $providerAffectedFiles, $logBase)) { + if (!$this->isResourceBuildable($resource, $providerBranch, $providerAffectedFiles, $logBase, $providerCommitMessage)) { Span::add("{$logBase}.build.skipped", 'true'); continue; } @@ -568,7 +569,7 @@ trait Deployment return System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME); } - private function isResourceBuildable(Document $resource, string $providerBranch, array $providerAffectedFiles, string $logBase): bool + private function isResourceBuildable(Document $resource, string $providerBranch, array $providerAffectedFiles, string $logBase, string $providerCommitMessage = ''): bool { $branchTrigger = new BuildTrigger($resource->getAttribute('providerBranches', [])); if (!$branchTrigger->isValid($providerBranch)) { @@ -592,6 +593,12 @@ trait Deployment } } + $commitSkip = new CommitSkipPatterns($resource->getAttribute('providerCommitSkipPatterns', [])); + if (!$commitSkip->isValid($providerCommitMessage)) { + Span::add("{$logBase}.build.skipped.reason", 'commitMessage'); + return false; + } + return true; } } diff --git a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php new file mode 100644 index 0000000000..76c04e5417 --- /dev/null +++ b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php @@ -0,0 +1,50 @@ +patterns as $pattern) { + if (!is_string($pattern) || $pattern === '') { + continue; + } + if (stripos($value, $pattern) !== false) { + return false; + } + } + + return true; + } + + public function getDescription(): string + { + return 'Commit message must not contain any of the configured skip patterns.'; + } + + public function isArray(): bool + { + return false; + } + + public function getType(): string + { + return self::TYPE_STRING; + } +} diff --git a/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php new file mode 100644 index 0000000000..3725c643bc --- /dev/null +++ b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php @@ -0,0 +1,141 @@ +assertTrue($validator->isValid('fix: update readme')); + $this->assertTrue($validator->isValid('[skip deploy] docs only')); + $this->assertTrue($validator->isValid('')); + } + + // ------------------------------------------------------------------------- + // Single pattern — exact substring + // ------------------------------------------------------------------------- + + public function testSinglePatternMatchSkips(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]']); + $this->assertFalse($validator->isValid('[skip deploy] docs only')); + $this->assertFalse($validator->isValid('chore: update deps [skip deploy]')); + $this->assertFalse($validator->isValid('prefix [skip deploy] suffix')); + } + + public function testSinglePatternNoMatchProceeds(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]']); + $this->assertTrue($validator->isValid('fix: real bug fix')); + $this->assertTrue($validator->isValid('feat: add new feature')); + $this->assertTrue($validator->isValid('skip deploy without brackets')); + } + + // ------------------------------------------------------------------------- + // Case insensitivity + // ------------------------------------------------------------------------- + + public function testCaseInsensitiveMatch(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]']); + $this->assertFalse($validator->isValid('[SKIP DEPLOY] uppercase')); + $this->assertFalse($validator->isValid('[Skip Deploy] mixed case')); + $this->assertFalse($validator->isValid('[skip DEPLOY] partial upper')); + } + + public function testPatternItselfCaseInsensitive(): void + { + $validator = new CommitSkipPatterns(['[SKIP DEPLOY]']); + $this->assertFalse($validator->isValid('[skip deploy] lowercase message')); + $this->assertFalse($validator->isValid('[Skip Deploy] mixed message')); + } + + // ------------------------------------------------------------------------- + // Array of patterns — any match skips (OR semantics) + // ------------------------------------------------------------------------- + + public function testMultiplePatternsFirstMatches(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); + $this->assertFalse($validator->isValid('[skip deploy] docs only')); + } + + public function testMultiplePatternsSecondMatches(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); + $this->assertFalse($validator->isValid('chore: update readme [skip ci]')); + } + + public function testMultiplePatternsThirdMatches(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); + $this->assertFalse($validator->isValid('[no deploy] just docs')); + } + + public function testMultiplePatternsNoneMatchProceeds(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); + $this->assertTrue($validator->isValid('feat: completely new feature')); + $this->assertTrue($validator->isValid('fix: important bug fix')); + } + + // ------------------------------------------------------------------------- + // Common real-world skip conventions + // ------------------------------------------------------------------------- + + public function testCommonSkipCiPattern(): void + { + $validator = new CommitSkipPatterns(['[skip ci]']); + $this->assertFalse($validator->isValid('[skip ci] update changelog')); + $this->assertFalse($validator->isValid('[SKIP CI]')); + $this->assertTrue($validator->isValid('feat: something real')); + } + + public function testNoDeployPattern(): void + { + $validator = new CommitSkipPatterns(['[no deploy]']); + $this->assertFalse($validator->isValid('[no deploy] tweak docs')); + $this->assertTrue($validator->isValid('deploy this please')); + } + + // ------------------------------------------------------------------------- + // Edge cases + // ------------------------------------------------------------------------- + + public function testEmptyCommitMessageNeverSkipsWithPatterns(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]']); + $this->assertTrue($validator->isValid('')); + } + + public function testBlankPatternsInArrayAreIgnored(): void + { + $validator = new CommitSkipPatterns(['', ' ', '[skip deploy]']); + // empty/whitespace-only patterns must not cause a false positive on empty messages + $this->assertTrue($validator->isValid('normal commit message')); + // but the real pattern still works + $this->assertFalse($validator->isValid('[skip deploy] docs')); + } + + public function testPatternAsSubstringOfLongerWord(): void + { + // "skip" is a substring of "skippy" — should NOT accidentally skip + $validator = new CommitSkipPatterns(['[skip deploy]']); + $this->assertTrue($validator->isValid('skippy the kangaroo')); + } + + public function testMultilineCommitMessage(): void + { + $validator = new CommitSkipPatterns(['[skip deploy]']); + $msg = "feat: add new stuff\n\nMore detail here.\n\n[skip deploy]"; + $this->assertFalse($validator->isValid($msg)); + } +} From 61cee5892afdb89e8a629b365991f0b09255da57 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 5 May 2026 18:23:14 +0530 Subject: [PATCH 17/25] fix: tighten commit skip directive matching --- .../Vcs/Validator/CommitSkipPatterns.php | 74 +++++++++++++++++-- .../Vcs/Validator/CommitSkipPatternsTest.php | 23 ++++-- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php index 76c04e5417..7243808bf8 100644 --- a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php +++ b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php @@ -12,7 +12,7 @@ class CommitSkipPatterns extends Validator /** * Returns false (skip deployment) when the commit message contains any of the - * configured patterns (case-insensitive substring match). + * configured skip directives. * Returns true (proceed) when no patterns are configured or none match. */ public function isValid($value): bool @@ -21,11 +21,13 @@ class CommitSkipPatterns extends Validator return false; } - foreach ($this->patterns as $pattern) { - if (!is_string($pattern) || $pattern === '') { - continue; - } - if (stripos($value, $pattern) !== false) { + $patterns = $this->normalizePatterns($this->patterns); + if (empty($patterns)) { + return true; + } + + foreach ($this->extractDirectives($value) as $directive) { + if (isset($patterns[$directive])) { return false; } } @@ -47,4 +49,64 @@ class CommitSkipPatterns extends Validator { return self::TYPE_STRING; } + + /** + * @param array $patterns + * @return array + */ + private function normalizePatterns(array $patterns): array + { + $normalized = []; + + foreach ($patterns as $pattern) { + if (!\is_string($pattern)) { + continue; + } + + $pattern = $this->normalizeDirective($pattern); + if ($pattern === '') { + continue; + } + + $normalized[$pattern] = true; + } + + return $normalized; + } + + /** + * @return array + */ + private function extractDirectives(string $message): array + { + $directives = []; + + if (\preg_match_all('/\[[^\]\r\n]+\]/u', $message, $matches) > 0) { + foreach ($matches[0] as $match) { + $directives[] = $this->normalizeDirective($match); + } + } + + foreach (\preg_split("/\r\n|\n|\r/", $message) ?: [] as $line) { + $line = \trim($line); + if ($line === '' || !\str_contains($line, ':')) { + continue; + } + + $directives[] = $this->normalizeDirective($line); + } + + return \array_values(\array_filter(\array_unique($directives))); + } + + private function normalizeDirective(string $value): string + { + $value = \trim($value); + if ($value === '') { + return ''; + } + + $value = (string) \preg_replace('/\s+/u', ' ', $value); + return \mb_strtolower($value); + } } diff --git a/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php index 3725c643bc..efc88bbf6a 100644 --- a/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php +++ b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php @@ -20,7 +20,7 @@ class CommitSkipPatternsTest extends TestCase } // ------------------------------------------------------------------------- - // Single pattern — exact substring + // Single pattern — directive match // ------------------------------------------------------------------------- public function testSinglePatternMatchSkips(): void @@ -37,6 +37,7 @@ class CommitSkipPatternsTest extends TestCase $this->assertTrue($validator->isValid('fix: real bug fix')); $this->assertTrue($validator->isValid('feat: add new feature')); $this->assertTrue($validator->isValid('skip deploy without brackets')); + $this->assertTrue($validator->isValid('prefix[skip deploy]suffix')); } // ------------------------------------------------------------------------- @@ -119,17 +120,15 @@ class CommitSkipPatternsTest extends TestCase public function testBlankPatternsInArrayAreIgnored(): void { $validator = new CommitSkipPatterns(['', ' ', '[skip deploy]']); - // empty/whitespace-only patterns must not cause a false positive on empty messages $this->assertTrue($validator->isValid('normal commit message')); - // but the real pattern still works $this->assertFalse($validator->isValid('[skip deploy] docs')); } - public function testPatternAsSubstringOfLongerWord(): void + public function testPatternMustBeStandaloneDirective(): void { - // "skip" is a substring of "skippy" — should NOT accidentally skip $validator = new CommitSkipPatterns(['[skip deploy]']); $this->assertTrue($validator->isValid('skippy the kangaroo')); + $this->assertTrue($validator->isValid('prefix[skip deploy]suffix')); } public function testMultilineCommitMessage(): void @@ -138,4 +137,18 @@ class CommitSkipPatternsTest extends TestCase $msg = "feat: add new stuff\n\nMore detail here.\n\n[skip deploy]"; $this->assertFalse($validator->isValid($msg)); } + + public function testWhitespaceInsideDirectiveIsNormalized(): void + { + $validator = new CommitSkipPatterns([' [skip deploy] ']); + $this->assertFalse($validator->isValid('[skip deploy] docs only')); + $this->assertFalse($validator->isValid('[SKIP DEPLOY] docs only')); + } + + public function testTrailerDirectiveCanSkip(): void + { + $validator = new CommitSkipPatterns(['skip-checks: true']); + $msg = "feat: add new stuff\n\nMore detail here.\n\nskip-checks:true"; + $this->assertFalse($validator->isValid($msg)); + } } From 90f5f9b30be6f1263d9675c4ca80006361c2bd39 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 7 May 2026 18:25:39 +0530 Subject: [PATCH 18/25] refactor: standalone regex matching for commit skip patterns Replace directive-extraction approach with word-boundary regex matching so plain-word patterns like "skip appwrite" and "appwrite skip" work alongside bracket directives. Use \s+ between word tokens (required space) and \s* only after ":" tokens (git trailer flexibility). Add tests for "skip appwrite" and "appwrite skip" with case insensitivity. Co-Authored-By: Claude Sonnet 4.6 --- .../Vcs/Validator/CommitSkipPatterns.php | 107 +++++++----------- .../Vcs/Validator/CommitSkipPatternsTest.php | 61 ++++++++++ 2 files changed, 101 insertions(+), 67 deletions(-) diff --git a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php index 7243808bf8..9dbe45ba83 100644 --- a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php +++ b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php @@ -12,8 +12,16 @@ class CommitSkipPatterns extends Validator /** * Returns false (skip deployment) when the commit message contains any of the - * configured skip directives. + * configured patterns as a standalone directive (case-insensitive). * Returns true (proceed) when no patterns are configured or none match. + * + * Matching rules: + * - Case-insensitive + * - The directive must be surrounded by whitespace or string boundaries, so + * "prefix[skip deploy]suffix" does NOT accidentally skip + * - Internal whitespace in the pattern is normalised: tokens are split on \s+ + * and rejoined with \s* in the regex, so "[skip deploy]" matches + * "[skip deploy]" and "skip-checks: true" matches "skip-checks:true" */ public function isValid($value): bool { @@ -21,13 +29,38 @@ class CommitSkipPatterns extends Validator return false; } - $patterns = $this->normalizePatterns($this->patterns); - if (empty($patterns)) { - return true; - } + foreach ($this->patterns as $pattern) { + if (!is_string($pattern)) { + continue; + } - foreach ($this->extractDirectives($value) as $directive) { - if (isset($patterns[$directive])) { + $pattern = trim($pattern); + if ($pattern === '') { + continue; + } + + // Split on whitespace; each token is regex-quoted. Tokens are rejoined + // with \s+ (required space) so that "skipappwrite" does NOT match the + // pattern "skip appwrite". The only exception: when the preceding token + // ends with ":" (git trailer style), \s* is used so that + // "skip-checks:true" still matches the pattern "skip-checks: true". + $tokens = preg_split('/\s+/', $pattern); + $regexParts = []; + $count = count($tokens); + for ($i = 0; $i < $count; $i++) { + $regexParts[] = preg_quote($tokens[$i], '~'); + if ($i < $count - 1) { + $regexParts[] = str_ends_with($tokens[$i], ':') ? '\s*' : '\s+'; + } + } + $regexBody = implode('', $regexParts); + + // (? $patterns - * @return array - */ - private function normalizePatterns(array $patterns): array - { - $normalized = []; - - foreach ($patterns as $pattern) { - if (!\is_string($pattern)) { - continue; - } - - $pattern = $this->normalizeDirective($pattern); - if ($pattern === '') { - continue; - } - - $normalized[$pattern] = true; - } - - return $normalized; - } - - /** - * @return array - */ - private function extractDirectives(string $message): array - { - $directives = []; - - if (\preg_match_all('/\[[^\]\r\n]+\]/u', $message, $matches) > 0) { - foreach ($matches[0] as $match) { - $directives[] = $this->normalizeDirective($match); - } - } - - foreach (\preg_split("/\r\n|\n|\r/", $message) ?: [] as $line) { - $line = \trim($line); - if ($line === '' || !\str_contains($line, ':')) { - continue; - } - - $directives[] = $this->normalizeDirective($line); - } - - return \array_values(\array_filter(\array_unique($directives))); - } - - private function normalizeDirective(string $value): string - { - $value = \trim($value); - if ($value === '') { - return ''; - } - - $value = (string) \preg_replace('/\s+/u', ' ', $value); - return \mb_strtolower($value); - } } diff --git a/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php index efc88bbf6a..b546199d22 100644 --- a/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php +++ b/tests/unit/Vcs/Validator/CommitSkipPatternsTest.php @@ -151,4 +151,65 @@ class CommitSkipPatternsTest extends TestCase $msg = "feat: add new stuff\n\nMore detail here.\n\nskip-checks:true"; $this->assertFalse($validator->isValid($msg)); } + + // ------------------------------------------------------------------------- + // Plain-word patterns: "skip appwrite" and "appwrite skip" + // ------------------------------------------------------------------------- + + public function testSkipAppwritePatternSkips(): void + { + $validator = new CommitSkipPatterns(['skip appwrite']); + $this->assertFalse($validator->isValid('docs: update readme skip appwrite')); + $this->assertFalse($validator->isValid('skip appwrite')); + } + + public function testSkipAppwritePatternCaseInsensitive(): void + { + $validator = new CommitSkipPatterns(['skip appwrite']); + $this->assertFalse($validator->isValid('SKIP APPWRITE')); + $this->assertFalse($validator->isValid('Skip Appwrite')); + $this->assertFalse($validator->isValid('SKIP appwrite')); + } + + public function testSkipAppwritePatternNoMatchProceeds(): void + { + $validator = new CommitSkipPatterns(['skip appwrite']); + $this->assertTrue($validator->isValid('feat: real feature')); + $this->assertTrue($validator->isValid('skipappwrite')); // no space — not standalone + $this->assertTrue($validator->isValid('appwrite is great')); + } + + public function testAppwriteSkipPatternSkips(): void + { + $validator = new CommitSkipPatterns(['appwrite skip']); + $this->assertFalse($validator->isValid('appwrite skip ci')); + $this->assertFalse($validator->isValid('docs appwrite skip')); + $this->assertFalse($validator->isValid('appwrite skip')); + } + + public function testAppwriteSkipPatternCaseInsensitive(): void + { + $validator = new CommitSkipPatterns(['appwrite skip']); + $this->assertFalse($validator->isValid('APPWRITE SKIP')); + $this->assertFalse($validator->isValid('Appwrite Skip')); + $this->assertFalse($validator->isValid('appwrite SKIP')); + } + + public function testAppwriteSkipPatternNoMatchProceeds(): void + { + $validator = new CommitSkipPatterns(['appwrite skip']); + $this->assertTrue($validator->isValid('feat: deploy appwrite changes')); + $this->assertTrue($validator->isValid('appwriteskip')); // no space — not standalone + $this->assertTrue($validator->isValid('skip the appwrite stuff')); + } + + public function testBothAppwritePatternsInArray(): void + { + $validator = new CommitSkipPatterns(['skip appwrite', 'appwrite skip']); + $this->assertFalse($validator->isValid('skip appwrite')); + $this->assertFalse($validator->isValid('appwrite skip')); + $this->assertFalse($validator->isValid('SKIP APPWRITE')); + $this->assertFalse($validator->isValid('APPWRITE SKIP')); + $this->assertTrue($validator->isValid('feat: deploy appwrite changes')); + } } From 3b3a04877f488f21ba340fe07565c47db49cbcbc Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 19 May 2026 11:21:04 +0530 Subject: [PATCH 19/25] feat: remove CommitSkipPatterns - already available in 1.9.x Keep only branch and path skip trigger logic. Commit message skip is handled by the existing Contains(VCS_DEPLOYMENT_SKIP_PATTERNS) check. Co-Authored-By: Claude Sonnet 4.6 --- app/config/collections/projects.php | 22 -- .../Vcs/Validator/CommitSkipPatterns.php | 85 ------- .../Vcs/Validator/CommitSkipPatternsTest.php | 215 ------------------ 3 files changed, 322 deletions(-) delete mode 100644 src/Appwrite/Vcs/Validator/CommitSkipPatterns.php delete mode 100644 tests/unit/Vcs/Validator/CommitSkipPatternsTest.php diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php index 30c82fbef0..120c9704ce 100644 --- a/app/config/collections/projects.php +++ b/app/config/collections/projects.php @@ -863,17 +863,6 @@ return [ 'array' => true, 'filters' => [], ], - [ - '$id' => ID::custom('providerCommitSkipPatterns'), - 'type' => Database::VAR_STRING, - 'format' => '', - 'size' => 128, - 'signed' => true, - 'required' => false, - 'default' => [], - 'array' => true, - 'filters' => [], - ], ], 'indexes' => [ [ @@ -1375,17 +1364,6 @@ return [ 'array' => true, 'filters' => [], ], - [ - '$id' => ID::custom('providerCommitSkipPatterns'), - 'type' => Database::VAR_STRING, - 'format' => '', - 'size' => 128, - 'signed' => true, - 'required' => false, - 'default' => [], - 'array' => true, - 'filters' => [], - ], ], 'indexes' => [ [ diff --git a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php b/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php deleted file mode 100644 index 9dbe45ba83..0000000000 --- a/src/Appwrite/Vcs/Validator/CommitSkipPatterns.php +++ /dev/null @@ -1,85 +0,0 @@ -patterns as $pattern) { - if (!is_string($pattern)) { - continue; - } - - $pattern = trim($pattern); - if ($pattern === '') { - continue; - } - - // Split on whitespace; each token is regex-quoted. Tokens are rejoined - // with \s+ (required space) so that "skipappwrite" does NOT match the - // pattern "skip appwrite". The only exception: when the preceding token - // ends with ":" (git trailer style), \s* is used so that - // "skip-checks:true" still matches the pattern "skip-checks: true". - $tokens = preg_split('/\s+/', $pattern); - $regexParts = []; - $count = count($tokens); - for ($i = 0; $i < $count; $i++) { - $regexParts[] = preg_quote($tokens[$i], '~'); - if ($i < $count - 1) { - $regexParts[] = str_ends_with($tokens[$i], ':') ? '\s*' : '\s+'; - } - } - $regexBody = implode('', $regexParts); - - // (?assertTrue($validator->isValid('fix: update readme')); - $this->assertTrue($validator->isValid('[skip deploy] docs only')); - $this->assertTrue($validator->isValid('')); - } - - // ------------------------------------------------------------------------- - // Single pattern — directive match - // ------------------------------------------------------------------------- - - public function testSinglePatternMatchSkips(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $this->assertFalse($validator->isValid('[skip deploy] docs only')); - $this->assertFalse($validator->isValid('chore: update deps [skip deploy]')); - $this->assertFalse($validator->isValid('prefix [skip deploy] suffix')); - } - - public function testSinglePatternNoMatchProceeds(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $this->assertTrue($validator->isValid('fix: real bug fix')); - $this->assertTrue($validator->isValid('feat: add new feature')); - $this->assertTrue($validator->isValid('skip deploy without brackets')); - $this->assertTrue($validator->isValid('prefix[skip deploy]suffix')); - } - - // ------------------------------------------------------------------------- - // Case insensitivity - // ------------------------------------------------------------------------- - - public function testCaseInsensitiveMatch(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $this->assertFalse($validator->isValid('[SKIP DEPLOY] uppercase')); - $this->assertFalse($validator->isValid('[Skip Deploy] mixed case')); - $this->assertFalse($validator->isValid('[skip DEPLOY] partial upper')); - } - - public function testPatternItselfCaseInsensitive(): void - { - $validator = new CommitSkipPatterns(['[SKIP DEPLOY]']); - $this->assertFalse($validator->isValid('[skip deploy] lowercase message')); - $this->assertFalse($validator->isValid('[Skip Deploy] mixed message')); - } - - // ------------------------------------------------------------------------- - // Array of patterns — any match skips (OR semantics) - // ------------------------------------------------------------------------- - - public function testMultiplePatternsFirstMatches(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); - $this->assertFalse($validator->isValid('[skip deploy] docs only')); - } - - public function testMultiplePatternsSecondMatches(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); - $this->assertFalse($validator->isValid('chore: update readme [skip ci]')); - } - - public function testMultiplePatternsThirdMatches(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); - $this->assertFalse($validator->isValid('[no deploy] just docs')); - } - - public function testMultiplePatternsNoneMatchProceeds(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]', '[skip ci]', '[no deploy]']); - $this->assertTrue($validator->isValid('feat: completely new feature')); - $this->assertTrue($validator->isValid('fix: important bug fix')); - } - - // ------------------------------------------------------------------------- - // Common real-world skip conventions - // ------------------------------------------------------------------------- - - public function testCommonSkipCiPattern(): void - { - $validator = new CommitSkipPatterns(['[skip ci]']); - $this->assertFalse($validator->isValid('[skip ci] update changelog')); - $this->assertFalse($validator->isValid('[SKIP CI]')); - $this->assertTrue($validator->isValid('feat: something real')); - } - - public function testNoDeployPattern(): void - { - $validator = new CommitSkipPatterns(['[no deploy]']); - $this->assertFalse($validator->isValid('[no deploy] tweak docs')); - $this->assertTrue($validator->isValid('deploy this please')); - } - - // ------------------------------------------------------------------------- - // Edge cases - // ------------------------------------------------------------------------- - - public function testEmptyCommitMessageNeverSkipsWithPatterns(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $this->assertTrue($validator->isValid('')); - } - - public function testBlankPatternsInArrayAreIgnored(): void - { - $validator = new CommitSkipPatterns(['', ' ', '[skip deploy]']); - $this->assertTrue($validator->isValid('normal commit message')); - $this->assertFalse($validator->isValid('[skip deploy] docs')); - } - - public function testPatternMustBeStandaloneDirective(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $this->assertTrue($validator->isValid('skippy the kangaroo')); - $this->assertTrue($validator->isValid('prefix[skip deploy]suffix')); - } - - public function testMultilineCommitMessage(): void - { - $validator = new CommitSkipPatterns(['[skip deploy]']); - $msg = "feat: add new stuff\n\nMore detail here.\n\n[skip deploy]"; - $this->assertFalse($validator->isValid($msg)); - } - - public function testWhitespaceInsideDirectiveIsNormalized(): void - { - $validator = new CommitSkipPatterns([' [skip deploy] ']); - $this->assertFalse($validator->isValid('[skip deploy] docs only')); - $this->assertFalse($validator->isValid('[SKIP DEPLOY] docs only')); - } - - public function testTrailerDirectiveCanSkip(): void - { - $validator = new CommitSkipPatterns(['skip-checks: true']); - $msg = "feat: add new stuff\n\nMore detail here.\n\nskip-checks:true"; - $this->assertFalse($validator->isValid($msg)); - } - - // ------------------------------------------------------------------------- - // Plain-word patterns: "skip appwrite" and "appwrite skip" - // ------------------------------------------------------------------------- - - public function testSkipAppwritePatternSkips(): void - { - $validator = new CommitSkipPatterns(['skip appwrite']); - $this->assertFalse($validator->isValid('docs: update readme skip appwrite')); - $this->assertFalse($validator->isValid('skip appwrite')); - } - - public function testSkipAppwritePatternCaseInsensitive(): void - { - $validator = new CommitSkipPatterns(['skip appwrite']); - $this->assertFalse($validator->isValid('SKIP APPWRITE')); - $this->assertFalse($validator->isValid('Skip Appwrite')); - $this->assertFalse($validator->isValid('SKIP appwrite')); - } - - public function testSkipAppwritePatternNoMatchProceeds(): void - { - $validator = new CommitSkipPatterns(['skip appwrite']); - $this->assertTrue($validator->isValid('feat: real feature')); - $this->assertTrue($validator->isValid('skipappwrite')); // no space — not standalone - $this->assertTrue($validator->isValid('appwrite is great')); - } - - public function testAppwriteSkipPatternSkips(): void - { - $validator = new CommitSkipPatterns(['appwrite skip']); - $this->assertFalse($validator->isValid('appwrite skip ci')); - $this->assertFalse($validator->isValid('docs appwrite skip')); - $this->assertFalse($validator->isValid('appwrite skip')); - } - - public function testAppwriteSkipPatternCaseInsensitive(): void - { - $validator = new CommitSkipPatterns(['appwrite skip']); - $this->assertFalse($validator->isValid('APPWRITE SKIP')); - $this->assertFalse($validator->isValid('Appwrite Skip')); - $this->assertFalse($validator->isValid('appwrite SKIP')); - } - - public function testAppwriteSkipPatternNoMatchProceeds(): void - { - $validator = new CommitSkipPatterns(['appwrite skip']); - $this->assertTrue($validator->isValid('feat: deploy appwrite changes')); - $this->assertTrue($validator->isValid('appwriteskip')); // no space — not standalone - $this->assertTrue($validator->isValid('skip the appwrite stuff')); - } - - public function testBothAppwritePatternsInArray(): void - { - $validator = new CommitSkipPatterns(['skip appwrite', 'appwrite skip']); - $this->assertFalse($validator->isValid('skip appwrite')); - $this->assertFalse($validator->isValid('appwrite skip')); - $this->assertFalse($validator->isValid('SKIP APPWRITE')); - $this->assertFalse($validator->isValid('APPWRITE SKIP')); - $this->assertTrue($validator->isValid('feat: deploy appwrite changes')); - } -} From 74a4ae19eea38d4cb61686ee3e65cee79b30f6f5 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 19 May 2026 11:28:04 +0530 Subject: [PATCH 20/25] refactor: remove unnecessary comments Co-Authored-By: Claude Sonnet 4.6 --- .../Modules/VCS/Http/GitHub/Authorize/External/Update.php | 2 +- .../Platform/Modules/VCS/Http/GitHub/Events/Create.php | 2 +- src/Appwrite/Vcs/Validator/BuildTrigger.php | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php index fed7248ddf..86ac0899d1 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php @@ -133,7 +133,7 @@ class Update extends Action $prFiles = $github->getPullRequestFiles($owner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), - ...array_filter(array_column($prFiles, 'previous_filename')) // Filter out null values + ...array_filter(array_column($prFiles, 'previous_filename')) ]; $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $providerAffectedFiles, true, $dbForPlatform, $authorization, $publisherForBuilds, $getProjectDB, $platform); diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index fd8a48ac15..7ce9ece505 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -215,7 +215,7 @@ class Create extends Action $prFiles = $github->getPullRequestFiles($providerRepositoryOwner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), - ...array_filter(array_column($prFiles, 'previous_filename')) // Filter out null values + ...array_filter(array_column($prFiles, 'previous_filename')) ]; $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [ diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php index 22037c8907..be8b9c43d1 100644 --- a/src/Appwrite/Vcs/Validator/BuildTrigger.php +++ b/src/Appwrite/Vcs/Validator/BuildTrigger.php @@ -24,7 +24,6 @@ class BuildTrigger extends Validator $exclude = array_filter($this->patterns, fn ($p) => str_starts_with($p, '!')); if (empty($include)) { - // Only exclusions: pass everything unless excluded. foreach ($exclude as $pattern) { if ($this->matchGlob($value, substr($pattern, 1))) { return false; @@ -33,31 +32,26 @@ class BuildTrigger extends Validator return true; } - // A pattern is "specific" when it contains no wildcard characters. $isSpecific = fn ($pattern) => !str_contains($pattern, '*') && !str_contains($pattern, '?'); - // 1. Specific inclusion always wins — an explicit exact match is never blocked. foreach ($include as $pattern) { if ($isSpecific($pattern) && $this->matchGlob($value, $pattern)) { return true; } } - // 2. Any exclusion (specific or wildcard) overrides a wildcard inclusion — refines broad patterns. foreach ($exclude as $pattern) { if ($this->matchGlob($value, substr($pattern, 1))) { return false; } } - // 3. Wildcard inclusion — no exclusion blocked it. foreach ($include as $pattern) { if (!$isSpecific($pattern) && $this->matchGlob($value, $pattern)) { return true; } } - // No inclusion matched. return false; } From 9bcb4d7ca725bd760d24ce8c03bca5830597f074 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 21 May 2026 15:31:05 +0530 Subject: [PATCH 21/25] Clarify renamed PR file filtering --- .../Modules/VCS/Http/GitHub/Authorize/External/Update.php | 1 + src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php index 86ac0899d1..993740c61a 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php @@ -133,6 +133,7 @@ class Update extends Action $prFiles = $github->getPullRequestFiles($owner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), + // Only renamed files include previous_filename; skip missing values from other file changes. ...array_filter(array_column($prFiles, 'previous_filename')) ]; diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index 7ce9ece505..e139ff68d8 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -215,6 +215,7 @@ class Create extends Action $prFiles = $github->getPullRequestFiles($providerRepositoryOwner, $providerRepositoryName, $providerPullRequestId); $providerAffectedFiles = [ ...array_column($prFiles, 'filename'), + // Only renamed files include previous_filename; skip missing values from other file changes. ...array_filter(array_column($prFiles, 'previous_filename')) ]; From c1e902c79ce8c9356f0484e6cbf6382f304a6a6d Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 21 May 2026 15:32:35 +0530 Subject: [PATCH 22/25] Restore deployments on branch creation --- .../Platform/Modules/VCS/Http/GitHub/Events/Create.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php index e139ff68d8..c79df05f8a 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php @@ -133,7 +133,6 @@ class Create extends Action callable $getProjectDB, array $platform, ) { - $providerBranchCreated = $parsedPayload["branchCreated"] ?? false; $providerBranchDeleted = $parsedPayload["branchDeleted"] ?? false; $providerBranch = $parsedPayload["branch"] ?? ''; $providerBranchUrl = $parsedPayload["branchUrl"] ?? ''; @@ -162,8 +161,8 @@ class Create extends Action Query::limit(100), ])); - // Create new deployment only on push (not committed by us) and not when branch is created or deleted - if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchCreated && !$providerBranchDeleted) { + // Create new deployment only on push (not committed by us) and not when branch is deleted + if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchDeleted) { $providerAffectedFiles = $parsedPayload['affectedFiles'] ?? []; $this->createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', $providerAffectedFiles, false, $dbForPlatform, $authorization, $publisherForBuilds, $getProjectDB, $platform); } From 01a6d6e4d68cc5c6bb9827b81374f266e3673df8 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 21 May 2026 15:35:44 +0530 Subject: [PATCH 23/25] Inline VCS build trigger checks --- .../Modules/VCS/Http/GitHub/Deployment.php | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 76e0fbc2b9..0978122e02 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -105,11 +105,32 @@ trait Deployment continue; } - if (!$this->isResourceBuildable($resource, $providerBranch, $providerAffectedFiles, $logBase)) { + // Skip deployments when the branch or affected files do not match configured build triggers. + $branchTrigger = new BuildTrigger($resource->getAttribute('providerBranches', [])); + if (!$branchTrigger->isValid($providerBranch)) { + Span::add("{$logBase}.build.skipped.reason", 'branch'); Span::add("{$logBase}.build.skipped", 'true'); continue; } + $providerPaths = $resource->getAttribute('providerPaths', []); + if (!empty($providerPaths) && !empty($providerAffectedFiles)) { + $pathTrigger = new BuildTrigger($providerPaths); + $pathMatched = false; + foreach ($providerAffectedFiles as $file) { + if ($pathTrigger->isValid($file)) { + $pathMatched = true; + break; + } + } + + if (!$pathMatched) { + Span::add("{$logBase}.build.skipped.reason", 'path'); + Span::add("{$logBase}.build.skipped", 'true'); + continue; + } + } + $deploymentId = ID::unique(); $repositoryId = $repository->getId(); $repositoryInternalId = $repository->getSequence(); @@ -577,30 +598,4 @@ trait Deployment return System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME); } - private function isResourceBuildable(Document $resource, string $providerBranch, array $providerAffectedFiles, string $logBase): bool - { - $branchTrigger = new BuildTrigger($resource->getAttribute('providerBranches', [])); - if (!$branchTrigger->isValid($providerBranch)) { - Span::add("{$logBase}.build.skipped.reason", 'branch'); - return false; - } - - $providerPaths = $resource->getAttribute('providerPaths', []); - if (!empty($providerPaths) && !empty($providerAffectedFiles)) { - $pathTrigger = new BuildTrigger($providerPaths); - $pathMatched = false; - foreach ($providerAffectedFiles as $file) { - if ($pathTrigger->isValid($file)) { - $pathMatched = true; - break; - } - } - if (!$pathMatched) { - Span::add("{$logBase}.build.skipped.reason", 'path'); - return false; - } - } - - return true; - } } From 268dd501067e2617f8d81840110c9b52ce5b1018 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 21 May 2026 18:43:21 +0530 Subject: [PATCH 24/25] Use Globstar validator directly, remove BuildTrigger wrapper Co-Authored-By: Claude Sonnet 4.6 --- composer.lock | 12 +- .../Modules/VCS/Http/GitHub/Deployment.php | 6 +- src/Appwrite/Vcs/Validator/BuildTrigger.php | 110 ----- tests/unit/Vcs/Validator/BuildTriggerTest.php | 466 ------------------ 4 files changed, 9 insertions(+), 585 deletions(-) delete mode 100644 src/Appwrite/Vcs/Validator/BuildTrigger.php delete mode 100644 tests/unit/Vcs/Validator/BuildTriggerTest.php diff --git a/composer.lock b/composer.lock index a0a687d8ae..07f8594b55 100644 --- a/composer.lock +++ b/composer.lock @@ -5355,16 +5355,16 @@ }, { "name": "utopia-php/validators", - "version": "0.2.3", + "version": "0.2.4", "source": { "type": "git", "url": "https://github.com/utopia-php/validators.git", - "reference": "9770269c8ed8e6909934965fa8722103c7434c23" + "reference": "b4ee60db4dbae5ffbe53968d01f69b6941251576" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/validators/zipball/9770269c8ed8e6909934965fa8722103c7434c23", - "reference": "9770269c8ed8e6909934965fa8722103c7434c23", + "url": "https://api.github.com/repos/utopia-php/validators/zipball/b4ee60db4dbae5ffbe53968d01f69b6941251576", + "reference": "b4ee60db4dbae5ffbe53968d01f69b6941251576", "shasum": "" }, "require": { @@ -5394,9 +5394,9 @@ ], "support": { "issues": "https://github.com/utopia-php/validators/issues", - "source": "https://github.com/utopia-php/validators/tree/0.2.3" + "source": "https://github.com/utopia-php/validators/tree/0.2.4" }, - "time": "2026-05-14T08:05:44+00:00" + "time": "2026-05-21T12:47:43+00:00" }, { "name": "utopia-php/vcs", diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 0978122e02..260fec77af 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -8,7 +8,7 @@ use Appwrite\Event\Publisher\Build as BuildPublisher; use Appwrite\Extend\Exception; use Appwrite\Filter\BranchDomain as BranchDomainFilter; use Appwrite\Vcs\Comment; -use Appwrite\Vcs\Validator\BuildTrigger; +use Utopia\Validator\Globstar; use Utopia\Config\Config; use Utopia\Console; use Utopia\Database\Database; @@ -106,7 +106,7 @@ trait Deployment } // Skip deployments when the branch or affected files do not match configured build triggers. - $branchTrigger = new BuildTrigger($resource->getAttribute('providerBranches', [])); + $branchTrigger = new Globstar($resource->getAttribute('providerBranches', [])); if (!$branchTrigger->isValid($providerBranch)) { Span::add("{$logBase}.build.skipped.reason", 'branch'); Span::add("{$logBase}.build.skipped", 'true'); @@ -115,7 +115,7 @@ trait Deployment $providerPaths = $resource->getAttribute('providerPaths', []); if (!empty($providerPaths) && !empty($providerAffectedFiles)) { - $pathTrigger = new BuildTrigger($providerPaths); + $pathTrigger = new Globstar($providerPaths); $pathMatched = false; foreach ($providerAffectedFiles as $file) { if ($pathTrigger->isValid($file)) { diff --git a/src/Appwrite/Vcs/Validator/BuildTrigger.php b/src/Appwrite/Vcs/Validator/BuildTrigger.php deleted file mode 100644 index be8b9c43d1..0000000000 --- a/src/Appwrite/Vcs/Validator/BuildTrigger.php +++ /dev/null @@ -1,110 +0,0 @@ -patterns)) { - return true; - } - - $include = array_filter($this->patterns, fn ($p) => !str_starts_with($p, '!')); - $exclude = array_filter($this->patterns, fn ($p) => str_starts_with($p, '!')); - - if (empty($include)) { - foreach ($exclude as $pattern) { - if ($this->matchGlob($value, substr($pattern, 1))) { - return false; - } - } - return true; - } - - $isSpecific = fn ($pattern) => !str_contains($pattern, '*') && !str_contains($pattern, '?'); - - foreach ($include as $pattern) { - if ($isSpecific($pattern) && $this->matchGlob($value, $pattern)) { - return true; - } - } - - foreach ($exclude as $pattern) { - if ($this->matchGlob($value, substr($pattern, 1))) { - return false; - } - } - - foreach ($include as $pattern) { - if (!$isSpecific($pattern) && $this->matchGlob($value, $pattern)) { - return true; - } - } - - return false; - } - - public function getDescription(): string - { - return 'Value must match a specific inclusion, or a wildcard inclusion not overridden by any exclusion.'; - } - - public function isArray(): bool - { - return false; - } - - public function getType(): string - { - return self::TYPE_STRING; - } - - private function matchGlob(string $subject, string $pattern): bool - { - $regex = ''; - $len = strlen($pattern); - $i = 0; - - while ($i < $len) { - $char = $pattern[$i]; - - if ($char === '*' && isset($pattern[$i + 1]) && $pattern[$i + 1] === '*') { - $prevSlash = $i === 0 || $pattern[$i - 1] === '/'; - $nextSlash = isset($pattern[$i + 2]) && $pattern[$i + 2] === '/'; - - if ($prevSlash && $nextSlash) { - // a/**/b → zero or more intermediate dirs (matches a/b, a/x/b, a/x/y/b) - // **/foo → zero or more leading dirs (matches foo, a/foo, a/b/foo) - $regex .= '(?:.+/)?'; - $i += 3; // consume ** and the trailing / - } else { - // foo/** → everything inside (matches foo/a, foo/a/b) - $regex .= '.*'; - $i += 2; - } - } elseif ($char === '*') { - $regex .= '[^/]*'; // anything except a path separator - $i++; - } elseif ($char === '?') { - $regex .= '[^/]'; // any single character except a path separator - $i++; - } else { - $regex .= preg_quote($char, '~'); - $i++; - } - } - - return (bool) preg_match('~^' . $regex . '$~', $subject); - } -} diff --git a/tests/unit/Vcs/Validator/BuildTriggerTest.php b/tests/unit/Vcs/Validator/BuildTriggerTest.php deleted file mode 100644 index 66aa94abed..0000000000 --- a/tests/unit/Vcs/Validator/BuildTriggerTest.php +++ /dev/null @@ -1,466 +0,0 @@ -assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('feature/anything')); - $this->assertTrue($validator->isValid('src/deep/nested/file.php')); - } - - // ------------------------------------------------------------------------- - // Pure inclusion — OR semantics (any one match is enough) - // ------------------------------------------------------------------------- - - public function testSingleExactInclusion(): void - { - $validator = new BuildTrigger(['main']); - $this->assertTrue($validator->isValid('main')); - $this->assertFalse($validator->isValid('develop')); - $this->assertFalse($validator->isValid('main-extra')); - } - - public function testMultipleExactInclusionsOr(): void - { - $validator = new BuildTrigger(['main', 'develop', 'staging']); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); - $this->assertTrue($validator->isValid('staging')); - $this->assertFalse($validator->isValid('feature/foo')); - $this->assertFalse($validator->isValid('production')); - } - - public function testSingleWildcardInclusion(): void - { - $validator = new BuildTrigger(['feature/*']); - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertTrue($validator->isValid('feature/bar')); - $this->assertFalse($validator->isValid('feature/foo/bar')); // * does not cross / - $this->assertFalse($validator->isValid('main')); - } - - public function testWildcardWithDash(): void - { - $validator = new BuildTrigger(['feature/test-*']); - $this->assertTrue($validator->isValid('feature/test-1')); - $this->assertTrue($validator->isValid('feature/test-abc')); - $this->assertFalse($validator->isValid('feature/other')); - $this->assertFalse($validator->isValid('feature/test')); - } - - public function testQuestionMarkWildcard(): void - { - $validator = new BuildTrigger(['v?.?']); - $this->assertTrue($validator->isValid('v1.0')); - $this->assertTrue($validator->isValid('v2.5')); - $this->assertFalse($validator->isValid('v10.0')); // ? matches exactly one char, not two - $this->assertFalse($validator->isValid('v1/0')); // ? does not cross / - } - - public function testQuestionMarkDoesNotCrossSlash(): void - { - $validator = new BuildTrigger(['feature/?']); - $this->assertTrue($validator->isValid('feature/a')); - $this->assertTrue($validator->isValid('feature/z')); - $this->assertFalse($validator->isValid('feature/ab')); // ? matches only one char - $this->assertFalse($validator->isValid('feature/a/b')); // ? does not cross / - $this->assertFalse($validator->isValid('feature/')); - } - - public function testQuestionMarkMixedWithStar(): void - { - $validator = new BuildTrigger(['fix-?.*']); - $this->assertTrue($validator->isValid('fix-1.php')); - $this->assertTrue($validator->isValid('fix-a.js')); - $this->assertFalse($validator->isValid('fix-12.php')); // ? matches only one char - $this->assertFalse($validator->isValid('fix-.php')); // ? requires exactly one char - } - - public function testDoubleWildcardAtEnd(): void - { - $validator = new BuildTrigger(['src/**']); - $this->assertTrue($validator->isValid('src/foo.js')); - $this->assertTrue($validator->isValid('src/a/b/c.js')); - $this->assertTrue($validator->isValid('src/deep/nested/file.php')); - $this->assertFalse($validator->isValid('lib/foo.js')); - } - - public function testDoubleWildcardInMiddle(): void - { - $validator = new BuildTrigger(['a/**/b']); - $this->assertTrue($validator->isValid('a/b')); // zero intermediate dirs - $this->assertTrue($validator->isValid('a/x/b')); // one - $this->assertTrue($validator->isValid('a/x/y/b')); // two - $this->assertFalse($validator->isValid('a/b/c')); - $this->assertFalse($validator->isValid('x/a/b')); - } - - public function testDoubleWildcardAtStart(): void - { - $validator = new BuildTrigger(['**/foo']); - $this->assertTrue($validator->isValid('foo')); // zero leading dirs - $this->assertTrue($validator->isValid('a/foo')); // one - $this->assertTrue($validator->isValid('a/b/foo')); // two - $this->assertFalse($validator->isValid('foobar')); - $this->assertFalse($validator->isValid('a/foobar')); - } - - public function testMixedExactAndWildcardInclusions(): void - { - $validator = new BuildTrigger(['main', 'feature/*']); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertFalse($validator->isValid('develop')); - $this->assertFalse($validator->isValid('feature/foo/bar')); - } - - // ------------------------------------------------------------------------- - // Pure exclusion — AND semantics (must not match any exclusion) - // ------------------------------------------------------------------------- - - public function testSingleExactExclusion(): void - { - $validator = new BuildTrigger(['!main']); - $this->assertFalse($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); - $this->assertTrue($validator->isValid('feature/foo')); - } - - public function testMultipleExactExclusionsAnd(): void - { - $validator = new BuildTrigger(['!main', '!develop']); - $this->assertFalse($validator->isValid('main')); - $this->assertFalse($validator->isValid('develop')); - $this->assertTrue($validator->isValid('staging')); // neither excluded - $this->assertTrue($validator->isValid('feature/foo')); - } - - public function testWildcardExclusion(): void - { - $validator = new BuildTrigger(['!feature/*']); - $this->assertFalse($validator->isValid('feature/foo')); - $this->assertFalse($validator->isValid('feature/bar')); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('hotfix/urgent')); // not matched by feature/* - } - - public function testDoubleWildcardExclusion(): void - { - $validator = new BuildTrigger(['!src/**']); - $this->assertFalse($validator->isValid('src/foo.js')); - $this->assertFalse($validator->isValid('src/a/b/c.js')); - $this->assertTrue($validator->isValid('lib/foo.js')); - $this->assertTrue($validator->isValid('main')); - } - - // ------------------------------------------------------------------------- - // Mixed inclusion + exclusion - // ------------------------------------------------------------------------- - - public function testInclusionTakesPrecedenceWhenBothMatch(): void - { - // feature/abc matches both '!feature/*' (exclusion) and 'feature/abc' (inclusion) - // Inclusion is checked first, so it wins - $validator = new BuildTrigger(['!feature/*', 'feature/abc']); - $this->assertTrue($validator->isValid('feature/abc')); // inclusion wins - $this->assertFalse($validator->isValid('feature/xyz')); // only exclusion matches - $this->assertFalse($validator->isValid('main')); // no inclusion matches - } - - public function testInclusionWithNoMatchFails(): void - { - // Inclusions exist but none match — exclusion is irrelevant - $validator = new BuildTrigger(['main', '!develop']); - $this->assertTrue($validator->isValid('main')); - $this->assertFalse($validator->isValid('develop')); // excluded even if inclusion didn't match - $this->assertFalse($validator->isValid('staging')); // no inclusion match - } - - public function testExclusionBlocksWhenInclusionDoesNotMatch(): void - { - $validator = new BuildTrigger(['feature/*', '!hotfix/*']); - $this->assertTrue($validator->isValid('feature/foo')); // matches inclusion - $this->assertFalse($validator->isValid('hotfix/urgent')); // no inclusion match, also excluded - $this->assertFalse($validator->isValid('main')); // no inclusion match - } - - public function testMultipleInclusionsWithSingleExclusion(): void - { - // feature/wip matches wildcard inclusion feature/* but specific exclusion !feature/wip overrides it - $validator = new BuildTrigger(['main', 'develop', 'feature/*', '!feature/wip']); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion overrides wildcard inclusion - $this->assertFalse($validator->isValid('hotfix/urgent')); // no inclusion match - } - - public function testSingleInclusionWithMultipleExclusions(): void - { - // specific exclusions !feature/wip and !feature/experimental override wildcard inclusion feature/** - $validator = new BuildTrigger(['feature/**', '!feature/wip', '!feature/experimental']); - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertTrue($validator->isValid('feature/a/b')); - $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion wins - $this->assertFalse($validator->isValid('feature/experimental')); // specific exclusion wins - $this->assertFalse($validator->isValid('main')); // no inclusion match - } - - public function testMultipleInclusionsWithMultipleExclusions(): void - { - // specific exclusions override the wildcard inclusion; specific inclusion 'main' is unaffected - $validator = new BuildTrigger(['main', 'feature/**', '!feature/wip', '!feature/experimental']); - $this->assertTrue($validator->isValid('main')); // specific inclusion wins regardless - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertTrue($validator->isValid('feature/a/b')); - $this->assertFalse($validator->isValid('feature/wip')); // specific exclusion wins - $this->assertFalse($validator->isValid('feature/experimental')); // specific exclusion wins - $this->assertFalse($validator->isValid('develop')); // no inclusion match - } - - public function testWildcardExclusionOverridesWildcardInclusion(): void - { - // src/** is a broad inclusion; !src/generated/** carves out the generated subtree - $validator = new BuildTrigger(['src/**', '!src/generated/**']); - $this->assertTrue($validator->isValid('src/components/Button.php')); - $this->assertTrue($validator->isValid('src/utils/helper.js')); - $this->assertFalse($validator->isValid('src/generated/Foo.php')); // wildcard exclusion wins - $this->assertFalse($validator->isValid('src/generated/bar/Baz.php')); // wildcard exclusion wins - $this->assertFalse($validator->isValid('lib/other.php')); // no inclusion match - } - - public function testSpecificInclusionOverridesWildcardExclusion(): void - { - // Narrow allowlist with a carve-out: exclude all of feature/* except feature/hotfix/critical - $validator = new BuildTrigger(['feature/hotfix/critical', '!feature/**']); - $this->assertTrue($validator->isValid('feature/hotfix/critical')); // inclusion wins - $this->assertFalse($validator->isValid('feature/foo')); // excluded - $this->assertFalse($validator->isValid('feature/hotfix/other')); // excluded - $this->assertFalse($validator->isValid('main')); // no inclusion match - } - - public function testOnlyExclusionsDefaultToTrueUnlessExcluded(): void - { - $validator = new BuildTrigger(['!main', '!develop']); - $this->assertFalse($validator->isValid('main')); - $this->assertFalse($validator->isValid('develop')); - $this->assertTrue($validator->isValid('staging')); // passes — no inclusions required - $this->assertTrue($validator->isValid('feature/foo')); - } - - // ------------------------------------------------------------------------- - // Standalone wildcards - // ------------------------------------------------------------------------- - - public function testStarAloneMatchesSingleSegmentOnly(): void - { - // * → ^[^/]*$ — matches any single segment; the [^/]* guard prevents crossing / - $validator = new BuildTrigger(['*']); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('develop')); - $this->assertFalse($validator->isValid('feature/foo')); // * cannot cross / - $this->assertFalse($validator->isValid('a/b/c')); - } - - public function testDoubleStarAloneMatchesEverything(): void - { - // ** alone → ^.*$ — matches any string including paths with separators - $validator = new BuildTrigger(['**']); - $this->assertTrue($validator->isValid('main')); - $this->assertTrue($validator->isValid('feature/foo')); - $this->assertTrue($validator->isValid('src/a/b/c/d/file.php')); - } - - // ------------------------------------------------------------------------- - // Extension patterns — * scope vs. ** scope - // ------------------------------------------------------------------------- - - public function testStarDotExtMatchesRootLevelOnly(): void - { - // *.php → ^[^/]*\.php$ — root-level only; * cannot cross / - $validator = new BuildTrigger(['*.php']); - $this->assertTrue($validator->isValid('Foo.php')); - $this->assertTrue($validator->isValid('index.php')); - $this->assertFalse($validator->isValid('src/Foo.php')); // * does not cross / - $this->assertFalse($validator->isValid('a/b/Foo.php')); - $this->assertFalse($validator->isValid('Foo.js')); - } - - public function testDoubleStarSlashExtMatchesAnyDepth(): void - { - // **/*.php → ^(?:.+/)?[^/]*\.php$ — (?:.+/)? is optional so root also matches - $validator = new BuildTrigger(['**/*.php']); - $this->assertTrue($validator->isValid('Foo.php')); // root — zero leading dirs - $this->assertTrue($validator->isValid('src/Foo.php')); - $this->assertTrue($validator->isValid('src/components/Foo.php')); - $this->assertTrue($validator->isValid('a/b/c/d/Foo.php')); // four levels deep - $this->assertFalse($validator->isValid('Foo.js')); - $this->assertFalse($validator->isValid('src/Foo.js')); - } - - public function testDirPrefixDoubleStarExtPattern(): void - { - // src/**/*.php → ^src/(?:.+/)?[^/]*\.php$ — scoped to src/ at any depth - $validator = new BuildTrigger(['src/**/*.php']); - $this->assertTrue($validator->isValid('src/Foo.php')); - $this->assertTrue($validator->isValid('src/components/Foo.php')); - $this->assertTrue($validator->isValid('src/a/b/c/Foo.php')); - $this->assertFalse($validator->isValid('Foo.php')); // outside src/ - $this->assertFalse($validator->isValid('lib/Foo.php')); - $this->assertFalse($validator->isValid('src/Foo.js')); - } - - // ------------------------------------------------------------------------- - // Dots as literal characters - // ------------------------------------------------------------------------- - - public function testDotsInPatternAreLiteral(): void - { - // preg_quote escapes . to \. — dots are never regex wildcards - $validator = new BuildTrigger(['release-1.0.0']); - $this->assertTrue($validator->isValid('release-1.0.0')); - $this->assertFalse($validator->isValid('release-1X0Y0')); // X/Y must not satisfy a literal dot - $this->assertFalse($validator->isValid('release-1.0.0-hotfix')); // extra suffix rejected by $ anchor - } - - public function testVersionWildcardBranchPattern(): void - { - // v*.*.* → ^v[^/]*\.[^/]*\.[^/]*$ — dots literal; [^/]* is greedy and can consume dots, - // so v1.2.3.4 also matches (first [^/]* eats "1.2") — documents current behavior - $validator = new BuildTrigger(['v*.*.*']); - $this->assertTrue($validator->isValid('v1.2.3')); - $this->assertTrue($validator->isValid('v10.20.30')); - $this->assertTrue($validator->isValid('v1.2.3.4')); // greedy match — first [^/]* eats "1.2" - $this->assertFalse($validator->isValid('v1.2')); // only two dot-segments; third \.[^/]* fails - $this->assertFalse($validator->isValid('1.2.3')); // missing leading v - $this->assertFalse($validator->isValid('v1/2/3')); // [^/]* cannot cross / - } - - public function testDottedFilenamePattern(): void - { - // *.test.js → ^[^/]*\.test\.js$ — both dots literal; * stays in root segment - $validator = new BuildTrigger(['*.test.js']); - $this->assertTrue($validator->isValid('Button.test.js')); - $this->assertTrue($validator->isValid('App.test.js')); - $this->assertFalse($validator->isValid('ButtonXtestYjs')); // dots must be literal - $this->assertFalse($validator->isValid('src/Button.test.js')); // * does not cross / - $this->assertFalse($validator->isValid('Button.test.ts')); - } - - // ------------------------------------------------------------------------- - // Prefix wildcard - // ------------------------------------------------------------------------- - - public function testPrefixWildcardBranchPattern(): void - { - // main* → ^main[^/]*$ — suffix wildcard; [^/]* cannot cross / - $validator = new BuildTrigger(['main*']); - $this->assertTrue($validator->isValid('main')); // zero trailing chars - $this->assertTrue($validator->isValid('main-extra')); - $this->assertTrue($validator->isValid('mainline')); - $this->assertFalse($validator->isValid('main/branch')); // [^/]* cannot cross / - $this->assertFalse($validator->isValid('develop')); - } - - // ------------------------------------------------------------------------- - // Deep nesting - // ------------------------------------------------------------------------- - - public function testDoubleWildcardInMiddleDeepNesting(): void - { - // a/**/b → ^a/(?:.+/)?b$ — .+ inside (?:.+/)? matches any chars including /, - // so it handles arbitrarily many intermediate directories - $validator = new BuildTrigger(['a/**/b']); - $this->assertTrue($validator->isValid('a/x/y/z/b')); // three intermediate dirs - $this->assertTrue($validator->isValid('a/p/q/r/s/b')); // four intermediate dirs - $this->assertTrue($validator->isValid('a/1/2/3/4/5/b')); // five intermediate dirs - $this->assertFalse($validator->isValid('a/x/y/z/b/extra')); // trailing segment rejected - $this->assertFalse($validator->isValid('prefix/a/x/b')); // leading segment rejected - } - - public function testDoubleWildcardAtStartDeepNesting(): void - { - // **/README.md → ^(?:.+/)?README\.md$ — matches at any depth; $ anchor prevents suffixes - $validator = new BuildTrigger(['**/README.md']); - $this->assertTrue($validator->isValid('README.md')); // zero leading dirs - $this->assertTrue($validator->isValid('docs/README.md')); - $this->assertTrue($validator->isValid('a/b/c/d/README.md')); // four levels deep - $this->assertTrue($validator->isValid('x/y/z/w/v/README.md')); // five levels deep - $this->assertFalse($validator->isValid('a/b/c/README.md.bak')); // $ anchor — no suffix - $this->assertFalse($validator->isValid('a/b/c/README.md/extra')); // trailing segment rejected - } - - // ------------------------------------------------------------------------- - // Real-world path patterns - // ------------------------------------------------------------------------- - - public function testGeneratedFilesAnywhereExclusion(): void - { - // !**/generated/** → ^(?:.+/)?generated/.*$ — excludes generated/ at any depth - $validator = new BuildTrigger(['!**/generated/**']); - $this->assertFalse($validator->isValid('generated/Foo.php')); // root generated/ - $this->assertFalse($validator->isValid('src/generated/Foo.php')); - $this->assertFalse($validator->isValid('src/api/generated/Bar.php')); // deep generated/ - $this->assertFalse($validator->isValid('generated/sub/deep/File.php')); // deep inside root generated/ - $this->assertTrue($validator->isValid('src/components/Button.php')); // not under generated/ - $this->assertTrue($validator->isValid('main')); - } - - public function testMultipleExtensionInclusions(): void - { - // OR semantics: any PHP or JS file triggers; other extensions do not - $validator = new BuildTrigger(['**/*.php', '**/*.js']); - $this->assertTrue($validator->isValid('index.php')); - $this->assertTrue($validator->isValid('src/App.php')); - $this->assertTrue($validator->isValid('index.js')); - $this->assertTrue($validator->isValid('src/components/App.js')); - $this->assertFalse($validator->isValid('styles.css')); - $this->assertFalse($validator->isValid('src/styles.css')); - $this->assertFalse($validator->isValid('README.md')); - } - - // ------------------------------------------------------------------------- - // Named-prefix single-level branch - // ------------------------------------------------------------------------- - - public function testReleaseBranchPattern(): void - { - // release/* → ^release/[^/]*$ — one level only; * stops at the next / - $validator = new BuildTrigger(['release/*']); - $this->assertTrue($validator->isValid('release/1.0')); - $this->assertTrue($validator->isValid('release/hotfix')); - $this->assertTrue($validator->isValid('release/2024-01-15')); - $this->assertFalse($validator->isValid('release/1.0/patch')); // * stops at / - $this->assertFalse($validator->isValid('release')); // missing the /* segment - $this->assertFalse($validator->isValid('main')); - } - - // ------------------------------------------------------------------------- - // Case sensitivity - // ------------------------------------------------------------------------- - - public function testPatternMatchingIsCaseSensitive(): void - { - // preg_match is used without the i flag — matching is always case-sensitive - $branchValidator = new BuildTrigger(['main']); - $this->assertTrue($branchValidator->isValid('main')); - $this->assertFalse($branchValidator->isValid('Main')); - $this->assertFalse($branchValidator->isValid('MAIN')); - - $wildcardValidator = new BuildTrigger(['feature/*']); - $this->assertTrue($wildcardValidator->isValid('feature/foo')); - $this->assertFalse($wildcardValidator->isValid('Feature/foo')); - $this->assertFalse($wildcardValidator->isValid('FEATURE/foo')); - } -} From f62d765bbfd2e54040bfc4377eab39dede1df977 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Thu, 21 May 2026 18:46:18 +0530 Subject: [PATCH 25/25] format --- src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php index 260fec77af..27c4eacba3 100644 --- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php +++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php @@ -8,7 +8,6 @@ use Appwrite\Event\Publisher\Build as BuildPublisher; use Appwrite\Extend\Exception; use Appwrite\Filter\BranchDomain as BranchDomainFilter; use Appwrite\Vcs\Comment; -use Utopia\Validator\Globstar; use Utopia\Config\Config; use Utopia\Console; use Utopia\Database\Database; @@ -23,6 +22,7 @@ use Utopia\DSN\DSN; use Utopia\Span\Span; use Utopia\System\System; use Utopia\Validator\Contains; +use Utopia\Validator\Globstar; use Utopia\VCS\Adapter\Git\GitHub; use Utopia\VCS\Exception\RepositoryNotFound;