Skip to content

Commit 3cbc1a1

Browse files
MeldironMeldiron
committed
Fixing more gogs tests
1 parent af8b3d5 commit 3cbc1a1

4 files changed

Lines changed: 106 additions & 79 deletions

File tree

‎src/VCS/Adapter/Git/Gitea.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function initializeVariables(string $installationId, string $privateKey,
7171
return;
7272
}
7373

74-
throw new Exception("accessToken is required for Gitea adapter.");
74+
throw new Exception("accessToken is required for this adapter.");
7575
}
7676

7777
/**
@@ -613,7 +613,7 @@ public function getUser(string $username): array
613613
public function getOwnerName(string $installationId, ?int $repositoryId = null): string
614614
{
615615
if ($repositoryId === null || $repositoryId <= 0) {
616-
throw new Exception("repositoryId is required for Gitea");
616+
throw new Exception("repositoryId is required for this adapter");
617617
}
618618

619619
$url = "/repositories/{$repositoryId}";

‎src/VCS/Adapter/Git/Gogs.php‎

Lines changed: 97 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Utopia\VCS\Adapter\Git;
44

55
use Exception;
6+
use Utopia\VCS\Exception\RepositoryNotFound;
67

78
class Gogs extends Gitea
89
{
@@ -63,18 +64,34 @@ public function createOrganization(string $orgName): string
6364
/**
6465
* Search repositories in organization
6566
*
66-
* Gogs requires the `q` parameter for search to return results.
67-
* When no search query is given, we pass '*' as a wildcard.
67+
* When no search query is given, Gogs search API returns empty results,
68+
* so we fall back to listing org repos directly via /orgs/{org}/repos.
6869
*
6970
* @return array<mixed>
7071
*/
7172
public function searchRepositories(string $owner, int $page, int $per_page, string $search = ''): array
7273
{
73-
if (empty($search)) {
74-
$search = '_'; // Gogs requires q param; underscore matches most repo names
74+
if (!empty($search)) {
75+
return parent::searchRepositories($owner, $page, $per_page, $search);
7576
}
7677

77-
return parent::searchRepositories($owner, $page, $per_page, $search);
78+
// List all repos for the org directly
79+
$url = "/orgs/{$owner}/repos";
80+
$response = $this->call(self::METHOD_GET, $url, ['Authorization' => "token $this->accessToken"]);
81+
82+
$responseBody = $response['body'] ?? [];
83+
if (!is_array($responseBody)) {
84+
$responseBody = [];
85+
}
86+
87+
$total = count($responseBody);
88+
$offset = ($page - 1) * $per_page;
89+
$pagedRepos = array_slice($responseBody, $offset, $per_page);
90+
91+
return [
92+
'items' => $pagedRepos,
93+
'total' => $total,
94+
];
7895
}
7996

8097
/**
@@ -118,21 +135,71 @@ public function getRepositoryTree(string $owner, string $repositoryName, string
118135
/**
119136
* Get repository name by ID
120137
*
121-
* Gogs does not support /repositories/{id}. Uses search as fallback.
138+
* Gogs does not have /repositories/{id}. Searches all repos to find by ID.
122139
*/
123140
public function getRepositoryName(string $repositoryId): string
124141
{
125-
throw new Exception("getRepositoryName by ID is not supported by Gogs");
142+
$repo = $this->findRepositoryById((int) $repositoryId);
143+
144+
return $repo['name'];
126145
}
127146

128147
/**
129-
* Get owner name
148+
* Get owner name by repository ID
130149
*
131-
* Gogs does not support /repositories/{id}.
150+
* Gogs does not have /repositories/{id}. Searches all repos to find by ID.
132151
*/
133152
public function getOwnerName(string $installationId, ?int $repositoryId = null): string
134153
{
135-
throw new Exception("getOwnerName by repository ID is not supported by Gogs");
154+
if ($repositoryId === null || $repositoryId <= 0) {
155+
throw new Exception("repositoryId is required for this adapter");
156+
}
157+
158+
$repo = $this->findRepositoryById($repositoryId);
159+
$owner = $repo['owner'] ?? [];
160+
161+
if (empty($owner['login'])) {
162+
throw new Exception("Owner login missing or empty in response");
163+
}
164+
165+
return $owner['login'];
166+
}
167+
168+
/**
169+
* Find a repository by its numeric ID using the search API.
170+
*
171+
* @return array<mixed> Repository data
172+
*/
173+
private function findRepositoryById(int $repositoryId): array
174+
{
175+
$page = 1;
176+
$limit = 50;
177+
178+
while ($page <= 100) {
179+
$url = "/repos/search?q=_&limit={$limit}&page={$page}";
180+
$response = $this->call(self::METHOD_GET, $url, ['Authorization' => "token $this->accessToken"]);
181+
182+
$responseBody = $response['body'] ?? [];
183+
$repos = $responseBody['data'] ?? [];
184+
185+
if (empty($repos)) {
186+
break;
187+
}
188+
189+
foreach ($repos as $repo) {
190+
if (($repo['id'] ?? 0) === $repositoryId) {
191+
return $repo;
192+
}
193+
}
194+
195+
if (count($repos) < $limit) {
196+
break;
197+
}
198+
199+
$page++;
200+
}
201+
202+
throw new RepositoryNotFound("Repository not found");
136203
}
137204

138205
/**
@@ -190,41 +257,34 @@ public function getLatestCommit(string $owner, string $repositoryName, string $b
190257
/**
191258
* Create a file in a repository
192259
*
193-
* Gogs PUT /contents/{path} only works on the default branch and cannot
194-
* target a specific branch. When a branch is specified we fall back to
195-
* git CLI so the file lands on the correct branch.
260+
* Gogs uses PUT /repos/{owner}/{repo}/contents/{path}.
261+
* For non-default branches we use git CLI, because the Gogs API `branch`
262+
* param creates a new branch rather than targeting an existing one.
196263
*
197264
* @return array<mixed>
198265
*/
199266
public function createFile(string $owner, string $repositoryName, string $filepath, string $content, string $message = 'Add file', string $branch = ''): array
200267
{
201-
if (empty($branch)) {
202-
// Default branch — use Gogs API (PUT)
203-
$url = "/repos/{$owner}/{$repositoryName}/contents/{$filepath}";
204-
205-
$response = $this->call(
206-
self::METHOD_PUT,
207-
$url,
208-
['Authorization' => "token $this->accessToken"],
209-
[
210-
'content' => base64_encode($content),
211-
'message' => $message,
212-
]
213-
);
214-
215-
$responseHeaders = $response['headers'] ?? [];
216-
$responseHeadersStatusCode = $responseHeaders['status-code'] ?? 0;
217-
if ($responseHeadersStatusCode >= 400) {
218-
throw new Exception("Failed to create file {$filepath}: HTTP {$responseHeadersStatusCode}");
219-
}
268+
$url = "/repos/{$owner}/{$repositoryName}/contents/{$filepath}";
269+
270+
$response = $this->call(
271+
self::METHOD_PUT,
272+
$url,
273+
['Authorization' => "token $this->accessToken"],
274+
[
275+
'content' => base64_encode($content),
276+
'message' => $message,
277+
'branch' => $branch
278+
]
279+
);
220280

221-
return $response['body'] ?? [];
281+
$responseHeaders = $response['headers'] ?? [];
282+
$responseHeadersStatusCode = $responseHeaders['status-code'] ?? 0;
283+
if ($responseHeadersStatusCode >= 400) {
284+
throw new Exception("Failed to create file {$filepath}: HTTP {$responseHeadersStatusCode}");
222285
}
223286

224-
// Specific branch — use git CLI
225-
$this->gitCreateFile($owner, $repositoryName, $branch, $filepath, $content, $message);
226-
227-
return [];
287+
return $response['body'] ?? [];
228288
}
229289

230290
/**
@@ -269,30 +329,6 @@ private function gitClone(string $owner, string $repositoryName, string $branch
269329
return trim($dir, "'\"");
270330
}
271331

272-
/**
273-
* Create a file via git CLI: clone, write, commit, push.
274-
*/
275-
private function gitCreateFile(string $owner, string $repositoryName, string $branch, string $filepath, string $content, string $message): void
276-
{
277-
$dir = $this->gitClone($owner, $repositoryName, $branch);
278-
279-
try {
280-
$fullPath = $dir . '/' . $filepath;
281-
$parentDir = dirname($fullPath);
282-
283-
if (!is_dir($parentDir)) {
284-
mkdir($parentDir, 0777, true);
285-
}
286-
287-
file_put_contents($fullPath, $content);
288-
289-
$this->exec("git -C " . escapeshellarg($dir) . " add " . escapeshellarg($filepath));
290-
$this->exec("git -C " . escapeshellarg($dir) . " commit -m " . escapeshellarg($message));
291-
$this->exec("git -C " . escapeshellarg($dir) . " push origin " . escapeshellarg($branch));
292-
} finally {
293-
$this->exec("rm -rf " . escapeshellarg($dir));
294-
}
295-
}
296332

297333
/**
298334
* Execute a shell command and throw on failure.

‎tests/VCS/Adapter/GiteaTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ public function testGetLatestCommitWithInvalidBranch(): void
830830
public function testGetEventPush(): void
831831
{
832832
$payload = json_encode([
833-
'ref' => 'refs/heads/main',
833+
'ref' => 'refs/heads/' . static::$defaultBranch,
834834
'before' => 'abc123',
835835
'after' => 'def456',
836836
'created' => false,
@@ -1180,15 +1180,15 @@ public function testGetOwnerName(): void
11801180
public function testGetOwnerNameWithZeroRepositoryId(): void
11811181
{
11821182
$this->expectException(\Exception::class);
1183-
$this->expectExceptionMessage('repositoryId is required for Gitea');
1183+
$this->expectExceptionMessage('repositoryId is required for this adapter');
11841184

11851185
$this->vcsAdapter->getOwnerName('', 0);
11861186
}
11871187

11881188
public function testGetOwnerNameWithoutRepositoryId(): void
11891189
{
11901190
$this->expectException(\Exception::class);
1191-
$this->expectExceptionMessage('repositoryId is required for Gitea');
1191+
$this->expectExceptionMessage('repositoryId is required for this adapter');
11921192

11931193
$this->vcsAdapter->getOwnerName('');
11941194
}
@@ -1203,7 +1203,7 @@ public function testGetOwnerNameWithInvalidRepositoryId(): void
12031203
public function testGetOwnerNameWithNullRepositoryId(): void
12041204
{
12051205
$this->expectException(\Exception::class);
1206-
$this->expectExceptionMessage('repositoryId is required for Gitea');
1206+
$this->expectExceptionMessage('repositoryId is required for this adapter');
12071207

12081208
$this->vcsAdapter->getOwnerName('', null);
12091209
}

‎tests/VCS/Adapter/GogsTest.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ protected function setupGogs(): void
6161
}
6262
}
6363

64+
// Webhook delivery (Gogs queues but does not deliver webhooks in test environment)
65+
public function testWebhookPushEvent(): void { $this->markTestSkipped('Gogs webhook delivery not working in test environment'); }
66+
6467
// --- Skip tests for unsupported Gogs features ---
6568

6669
// Pull request API
@@ -74,15 +77,6 @@ public function testUpdateComment(): void { $this->markTestSkipped('Gogs does no
7477
public function testCreateComment(): void { $this->markTestSkipped('Gogs does not support pull request API'); }
7578
public function testWebhookPullRequestEvent(): void { $this->markTestSkipped('Gogs does not support pull request API'); }
7679

77-
// Repository by ID
78-
public function testGetRepositoryName(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
79-
public function testGetRepositoryNameWithInvalidId(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
80-
public function testGetOwnerName(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
81-
public function testGetOwnerNameWithZeroRepositoryId(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
82-
public function testGetOwnerNameWithoutRepositoryId(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
83-
public function testGetOwnerNameWithInvalidRepositoryId(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
84-
public function testGetOwnerNameWithNullRepositoryId(): void { $this->markTestSkipped('Gogs does not support /repositories/{id} endpoint'); }
85-
8680
// Tag creation
8781
public function testCreateTag(): void { $this->markTestSkipped('Gogs does not support tag creation via API'); }
8882
public function testGenerateCloneCommandWithTag(): void { $this->markTestSkipped('Gogs does not support tag creation via API'); }
@@ -95,7 +89,4 @@ public function testUpdateCommitStatusWithNonExistingRepository(): void { $this-
9589
// Repository languages
9690
public function testListRepositoryLanguages(): void { $this->markTestSkipped('Gogs does not support repository languages endpoint'); }
9791
public function testListRepositoryLanguagesEmptyRepo(): void { $this->markTestSkipped('Gogs does not support repository languages endpoint'); }
98-
99-
// Webhook (missing Fetch dependency)
100-
public function testWebhookPushEvent(): void { $this->markTestSkipped('Gogs webhook test requires request-catcher URL config'); }
10192
}

0 commit comments

Comments
 (0)