Merge pull request #6828 from appwrite/feat-improve-migration-validations
Improve Error Handling and Add more Validation
This commit is contained in:
commit
d64d56069f
3 changed files with 97 additions and 27 deletions
|
@ -749,4 +749,9 @@ return [
|
||||||
'description' => 'Too many messages.',
|
'description' => 'Too many messages.',
|
||||||
'code' => 1013,
|
'code' => 1013,
|
||||||
],
|
],
|
||||||
|
Exception::MIGRATION_PROVIDER_ERROR => [
|
||||||
|
'name' => Exception::MIGRATION_PROVIDER_ERROR,
|
||||||
|
'description' => 'An error occurred on the provider\'s side. Please try again later.',
|
||||||
|
'code' => 400,
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
|
@ -208,6 +208,16 @@ App::post('/v1/migrations/firebase')
|
||||||
->inject('queueForEvents')
|
->inject('queueForEvents')
|
||||||
->inject('queueForMigrations')
|
->inject('queueForMigrations')
|
||||||
->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
|
->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
|
||||||
|
$serviceAccountData = json_decode($serviceAccount, true);
|
||||||
|
|
||||||
|
if (empty($serviceAccountData)) {
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Invalid Service Account JSON');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($serviceAccountData['project_id']) || !isset($serviceAccountData['client_email']) || !isset($serviceAccountData['private_key'])) {
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Invalid Service Account JSON');
|
||||||
|
}
|
||||||
|
|
||||||
$migration = $dbForProject->createDocument('migrations', new Document([
|
$migration = $dbForProject->createDocument('migrations', new Document([
|
||||||
'$id' => ID::unique(),
|
'$id' => ID::unique(),
|
||||||
'status' => 'pending',
|
'status' => 'pending',
|
||||||
|
@ -449,15 +459,26 @@ App::get('/v1/migrations/appwrite/report')
|
||||||
->inject('project')
|
->inject('project')
|
||||||
->inject('user')
|
->inject('user')
|
||||||
->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
|
->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
|
||||||
try {
|
|
||||||
$appwrite = new Appwrite($projectID, $endpoint, $key);
|
$appwrite = new Appwrite($projectID, $endpoint, $key);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$report = $appwrite->report($resources);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
switch ($e->getCode()) {
|
||||||
|
case 401:
|
||||||
|
throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
|
||||||
|
case 429:
|
||||||
|
throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
|
||||||
|
case 500:
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
$response
|
$response
|
||||||
->setStatusCode(Response::STATUS_CODE_OK)
|
->setStatusCode(Response::STATUS_CODE_OK)
|
||||||
->dynamic(new Document($appwrite->report($resources)), Response::MODEL_MIGRATION_REPORT);
|
->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
|
||||||
} catch (\Throwable $e) {
|
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
App::get('/v1/migrations/firebase/report')
|
App::get('/v1/migrations/firebase/report')
|
||||||
|
@ -475,15 +496,36 @@ App::get('/v1/migrations/firebase/report')
|
||||||
->param('serviceAccount', '', new Text(65536), 'JSON of the Firebase service account credentials')
|
->param('serviceAccount', '', new Text(65536), 'JSON of the Firebase service account credentials')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->action(function (array $resources, string $serviceAccount, Response $response) {
|
->action(function (array $resources, string $serviceAccount, Response $response) {
|
||||||
|
$serviceAccount = json_decode($serviceAccount, true);
|
||||||
|
|
||||||
|
if (empty($serviceAccount)) {
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Invalid Service Account JSON');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($serviceAccount['project_id']) || !isset($serviceAccount['client_email']) || !isset($serviceAccount['private_key'])) {
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Invalid Service Account JSON');
|
||||||
|
}
|
||||||
|
|
||||||
|
$firebase = new Firebase($serviceAccount);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$firebase = new Firebase(json_decode($serviceAccount, true));
|
$report = $firebase->report($resources);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
switch ($e->getCode()) {
|
||||||
|
case 401:
|
||||||
|
throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
|
||||||
|
case 429:
|
||||||
|
throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
|
||||||
|
case 500:
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
$response
|
$response
|
||||||
->setStatusCode(Response::STATUS_CODE_OK)
|
->setStatusCode(Response::STATUS_CODE_OK)
|
||||||
->dynamic(new Document($firebase->report($resources)), Response::MODEL_MIGRATION_REPORT);
|
->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
|
||||||
} catch (\Exception $e) {
|
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
App::get('/v1/migrations/firebase/report/oauth')
|
App::get('/v1/migrations/firebase/report/oauth')
|
||||||
|
@ -869,15 +911,26 @@ App::get('/v1/migrations/supabase/report')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->inject('dbForProject')
|
->inject('dbForProject')
|
||||||
->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response) {
|
->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response) {
|
||||||
try {
|
|
||||||
$supabase = new Supabase($endpoint, $apiKey, $databaseHost, 'postgres', $username, $password, $port);
|
$supabase = new Supabase($endpoint, $apiKey, $databaseHost, 'postgres', $username, $password, $port);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$report = $supabase->report($resources);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
switch ($e->getCode()) {
|
||||||
|
case 401:
|
||||||
|
throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
|
||||||
|
case 429:
|
||||||
|
throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
|
||||||
|
case 500:
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
$response
|
$response
|
||||||
->setStatusCode(Response::STATUS_CODE_OK)
|
->setStatusCode(Response::STATUS_CODE_OK)
|
||||||
->dynamic(new Document($supabase->report($resources)), Response::MODEL_MIGRATION_REPORT);
|
->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
|
||||||
} catch (\Exception $e) {
|
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
App::get('/v1/migrations/nhost/report')
|
App::get('/v1/migrations/nhost/report')
|
||||||
|
@ -901,15 +954,26 @@ App::get('/v1/migrations/nhost/report')
|
||||||
->param('port', 5432, new Integer(true), 'Source\'s Database Port.', true)
|
->param('port', 5432, new Integer(true), 'Source\'s Database Port.', true)
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response) {
|
->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response) {
|
||||||
try {
|
|
||||||
$nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
|
$nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$report = $nhost->report($resources);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
switch ($e->getCode()) {
|
||||||
|
case 401:
|
||||||
|
throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
|
||||||
|
case 429:
|
||||||
|
throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
|
||||||
|
case 500:
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
$response
|
$response
|
||||||
->setStatusCode(Response::STATUS_CODE_OK)
|
->setStatusCode(Response::STATUS_CODE_OK)
|
||||||
->dynamic(new Document($nhost->report($resources)), Response::MODEL_MIGRATION_REPORT);
|
->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
|
||||||
} catch (\Exception $e) {
|
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
App::patch('/v1/migrations/:migrationId')
|
App::patch('/v1/migrations/:migrationId')
|
||||||
|
|
|
@ -224,6 +224,7 @@ class Exception extends \Exception
|
||||||
public const MIGRATION_NOT_FOUND = 'migration_not_found';
|
public const MIGRATION_NOT_FOUND = 'migration_not_found';
|
||||||
public const MIGRATION_ALREADY_EXISTS = 'migration_already_exists';
|
public const MIGRATION_ALREADY_EXISTS = 'migration_already_exists';
|
||||||
public const MIGRATION_IN_PROGRESS = 'migration_in_progress';
|
public const MIGRATION_IN_PROGRESS = 'migration_in_progress';
|
||||||
|
public const MIGRATION_PROVIDER_ERROR = 'migration_provider_error';
|
||||||
|
|
||||||
/** Realtime */
|
/** Realtime */
|
||||||
public const REALTIME_MESSAGE_FORMAT_INVALID = 'realtime_message_format_invalid';
|
public const REALTIME_MESSAGE_FORMAT_INVALID = 'realtime_message_format_invalid';
|
||||||
|
|
Loading…
Reference in a new issue