Skip to content
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

CO-2873_SqlProvisioner_Plugin_bugs #673

Open
wants to merge 1 commit into
base: hotfix-4.4.x
Choose a base branch
from
Open

CO-2873_SqlProvisioner_Plugin_bugs #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/AvailablePlugin/SqlProvisioner/Controller/CoSqlProvisionerTargetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function reapply($id) {

public function resync($id) {
try {
$this->CoSqlProvisionerTarget->syncAllReferenceData($this->cur_co['Co']['id'], true);
$this->CoSqlProvisionerTarget->syncAllReferenceData($this->cur_co['Co']['id'], true, $id);

$this->Flash->set(_txt('pl.sqlprovisioner.resync.ok'), array('key' => 'success'));
}
Expand Down
47 changes: 31 additions & 16 deletions app/AvailablePlugin/SqlProvisioner/Model/CoSqlProvisionerTarget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,10 @@ public function provision($coProvisioningTargetData, $op, $provisioningData) {
}

// Just let any exceptions bubble up the stack
$prefix = (!empty($this->data['CoSqlProvisionerTarget']['table_prefix'])
? $this->data['CoSqlProvisionerTarget']['table_prefix']
: "sp_");
$prefix = $coProvisioningTargetData['CoSqlProvisionerTarget']['table_prefix'] ?? 'sp_';

$this->CoProvisioningTarget->Co->Server->SqlServer->connect($coProvisioningTargetData['CoSqlProvisionerTarget']['server_id'],
"targetdb",
'targetdb',
$prefix);

// Start a transaction
Expand Down Expand Up @@ -515,12 +513,14 @@ public function syncAllGroups($coId, $dataSource='targetdb') {
* which doesn't have an CO Provisioning Target context, but also used for
* manual resync.
*
* @param int $coId CO ID to sync reference data for
* @param boolean $syncGroups Also sync Group reference data
* @param int $CoSqlProvisionerTargetId CoSqlProvisionerTarget ID to sync reference data for
*
* @since COmanage Registry v3.3.0
* @param int $coId CO ID to sync reference data for
* @param boolean $syncGroups Also sync Group reference data
*/

public function syncAllReferenceData($coId, $syncGroups=false) {
public function syncAllReferenceData($coId, $syncGroups=false, $CoSqlProvisionerTargetId=null) {
// Pull all SqlProvisioner configurations for the CO

$args = array();
Expand All @@ -530,23 +530,24 @@ public function syncAllReferenceData($coId, $syncGroups=false) {
$args['joins'][0]['conditions'][0] = 'CoSqlProvisionerTarget.co_provisioning_target_id=CoProvisioningTarget.id';
$args['conditions']['CoProvisioningTarget.co_id'] = $coId;
$args['conditions']['CoProvisioningTarget.status !='] = ProvisionerModeEnum::Disabled;
if($CoSqlProvisionerTargetId !== null) {
$args['conditions']['CoSqlProvisionerTarget.id'] = $CoSqlProvisionerTargetId;
}
$args['contain'] = false;

$targets = $this->find('all', $args);

// Loop through each configuration, instantiating a DataSource, then
// performing the sync

$prefix = (!empty($this->data['CoSqlProvisionerTarget']['table_prefix'])
? $this->data['CoSqlProvisionerTarget']['table_prefix']
: "sp_");

if(!empty($targets)) {
foreach($targets as $t) {
// Loop through each configuration, instantiating a DataSource, then
// performing the sync

$prefix = $t['CoSqlProvisionerTarget']['table_prefix'] ?? 'sp_';

// We need a unique data source label for each target
$sourceLabel = 'targetdb' . $t['CoSqlProvisionerTarget']['server_id'];

// Just let any exceptions bubble up the stack
// Let any exceptions bubble up the stack
$this->CoProvisioningTarget->Co->Server->SqlServer->connect($t['CoSqlProvisionerTarget']['server_id'],
$sourceLabel,
$prefix);
Expand Down Expand Up @@ -730,7 +731,21 @@ protected function syncPerson($provisioningData) {
}
}
}


// XXX If we try to sync CoGroupMembers without syncing the groups first we will fail to complete the process
// This can occur if we manually sync from CoPerson Canvas, where only CoPerson Sync will fire.
if($Model->alias == 'SpCoGroupMember') {
$SpCoGroup = new Model(array(
'table' => $this->parentModels['CoGroup']['table'],
'name' => $this->parentModels['CoGroup']['name'],
'ds' => 'targetdb'
));
$SpCoGroup->id = $data['SpCoGroupMember']['co_group_id'];
if($SpCoGroup->field('name') === false) {
$this->log(__METHOD__ . "::CO Group with id:{$data['SpCoGroupMember']['co_group_id']} not found");
continue;
}
}
// No need to validate anything, though we also don't have any validation rules
$Model->save($data, false);
}
Expand Down