Skip to content

Migration orchestration #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 12 commits into from
Feb 22, 2022
Merged

Migration orchestration #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d2d8aa
Run exports and imports of registered migrators
Pytal Feb 4, 2022
dffce83
Extend export destination as defined by the public interface
Pytal Feb 9, 2022
ebe7931
Suppress psalm errors
Pytal Feb 15, 2022
c1b931a
Add a stubs file for Coordinator
come-nc Feb 15, 2022
4f7dde7
Update baseline
come-nc Feb 15, 2022
245ad9d
Export migrator versions in the export archive and check compatibilit…
come-nc Feb 14, 2022
474c21b
Moved the trait to server repository
come-nc Feb 14, 2022
cc8393b
Adapt to version handling changes in core interfaces
come-nc Feb 15, 2022
77c4fc8
Trait property default value cannot be overridden
come-nc Feb 15, 2022
60e60ec
Adapt to changes in core
come-nc Feb 21, 2022
b6be1e1
update christophwurst/nextcloud
come-nc Feb 22, 2022
82469c0
Update baseline
come-nc Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Run exports and imports of registered migrators 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Feb 15, 2022
commit 7d2d8aa87c7c99889d66877608d0c07aa3a457aa
1 change: 1 addition & 0 deletions lib/ExportDestination.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\ITempManager;
use OCP\UserMigration\IExportDestination;
use ZipStreamer\COMPR;
use ZipStreamer\ZipStreamer;

Expand Down
54 changes: 0 additions & 54 deletions lib/IExportDestination.php
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions lib/IImportSource.php
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions lib/ImportSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use OC\Archive\Archive;
use OC\Archive\ZIP;
use OCP\Files\Folder;
use OCP\UserMigration\IImportSource;

class ImportSource implements IImportSource {
private Archive $archive;
Expand Down
43 changes: 39 additions & 4 deletions lib/Service/UserMigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/**
* @copyright Copyright (c) 2022 Côme Chilliet <[email protected]>
*
* @author Christopher Ng <[email protected]>
* @author Côme Chilliet <[email protected]>
*
* @license GNU AGPL version 3 or any later version
Expand All @@ -26,19 +27,22 @@

namespace OCA\UserMigration\Service;

use OC\AppFramework\Bootstrap\Coordinator;
use OC\Files\Filesystem;
use OCA\UserMigration\Exception\UserMigrationException;
use OCA\UserMigration\ExportDestination;
use OCA\UserMigration\IExportDestination;
use OCA\UserMigration\IImportSource;
use OCA\UserMigration\ImportSource;
use OC\Files\Filesystem;
use OCP\Accounts\IAccountManager;
use OCP\Files\IRootFolder;
use OCP\IConfig;
use OCP\ITempManager;
use OCP\IUser;
use OCP\IUserManager;
use OCP\Security\ISecureRandom;
use OCP\UserMigration\IExportDestination;
use OCP\UserMigration\IImportSource;
use OCP\UserMigration\IMigrator;
use Psr\Container\ContainerInterface;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\Console\Output\OutputInterface;

Expand All @@ -53,18 +57,26 @@ class UserMigrationService {

protected IUserManager $userManager;

protected ContainerInterface $container;

protected Coordinator $coordinator;

public function __construct(
IRootFolder $rootFolder,
IConfig $config,
IAccountManager $accountManager,
ITempManager $tempManager,
IUserManager $userManager
IUserManager $userManager,
ContainerInterface $container,
Coordinator $coordinator
) {
$this->root = $rootFolder;
$this->config = $config;
$this->accountManager = $accountManager;
$this->tempManager = $tempManager;
$this->userManager = $userManager;
$this->container = $container;
$this->coordinator = $coordinator;
}

/**
Expand Down Expand Up @@ -113,6 +125,17 @@ public function export(IUser $user, ?OutputInterface $output = null): string {
$output
);

// Run exports of registered migrators
$context = $this->coordinator->getRegistrationContext();

if ($context !== null) {
foreach ($context->getUserMigrators() as $migratorRegistration) {
/** @var IMigrator $migrator */
$migrator = $this->container->get($migratorRegistration->getService());
$migrator->export($user, $exportDestination, $output);
}
}

$exportDestination->close();
$output->writeln("Export saved in ".$exportDestination->getPath());
return $exportDestination->getPath();
Expand All @@ -131,6 +154,18 @@ public function import(string $path, ?OutputInterface $output = null): void {
$this->importAccountInformation($user, $importSource, $output);
$this->importAppsSettings($user, $importSource, $output);
$this->importFiles($user, $importSource, $output);

// Run imports of registered migrators
$context = $this->coordinator->getRegistrationContext();

if ($context !== null) {
foreach ($context->getUserMigrators() as $migratorRegistration) {
/** @var IMigrator $migrator */
$migrator = $this->container->get($migratorRegistration->getService());
$migrator->import($user, $importSource, $output);
}
}

$uid = $user->getUID();
$output->writeln("Successfully imported $uid from $path");
} finally {
Expand Down