ahmido
61b0b1bc23
Problem: Restore nutzt bisher den Snapshot aus dem BackupSet (BackupItem). Wenn der Snapshot “unvollständig”/nicht der gewünschte Stand ist, landen nach Restore nur wenige Admin-Template-Settings in Intune. Lösung: Neue Action “Restore to Intune” direkt an einer konkreten PolicyVersion (inkl. Dry-Run Toggle) → reproduzierbarer Rollback auf exakt diese Version. Restore-UI zeigt jetzt PolicyVersion-Nummer (version: X) in der Item-Auswahl + BackupSet Items Tabelle hat eine Version-Spalte. Implementierung: RestoreService::executeFromPolicyVersion() erzeugt dafür einen kleinen, temporären BackupSet+BackupItem aus der Version und startet einen normalen RestoreRun. Pest-Test: PolicyVersionRestoreToIntuneTest.php Specs/TODO: Offene Follow-ups sind dokumentiert in tasks.md unter “Open TODOs (Follow-up)”. QA (GUI): Inventory → Policies → <Policy> → Versions → Restore to Intune (erst Dry-Run, dann Execute) Backups & Restore → Restore Runs → Create (bei Items steht version: X) Backups & Restore → Backup Sets → <Set> (Version-Spalte) Tests: PolicyVersionRestoreToIntuneTest.php Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #13
56 lines
2.0 KiB
PHP
56 lines
2.0 KiB
PHP
<?php
|
|
|
|
use App\Models\SettingsCatalogCategory;
|
|
use App\Models\SettingsCatalogDefinition;
|
|
use App\Services\Intune\PolicyNormalizer;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('settings catalog normalized diff keys use definition display names', function () {
|
|
SettingsCatalogCategory::create([
|
|
'category_id' => 'cat-1',
|
|
'display_name' => 'Account Management',
|
|
'description' => null,
|
|
]);
|
|
|
|
SettingsCatalogDefinition::create([
|
|
'definition_id' => 'device_vendor_msft_accountmanagement_userprofilemanagement_deletionpolicy',
|
|
'display_name' => 'Deletion Policy',
|
|
'description' => null,
|
|
'help_text' => null,
|
|
'category_id' => 'cat-1',
|
|
'ux_behavior' => null,
|
|
'raw' => [],
|
|
]);
|
|
|
|
$flat = app(PolicyNormalizer::class)->flattenForDiff(
|
|
snapshot: [
|
|
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationPolicy',
|
|
'id' => 'scp-policy-1',
|
|
'name' => 'Settings Catalog Policy',
|
|
'platforms' => 'windows10',
|
|
'technologies' => 'mdm',
|
|
'settings' => [
|
|
[
|
|
'id' => 's1',
|
|
'settingInstance' => [
|
|
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance',
|
|
'settingDefinitionId' => 'device_vendor_msft_accountmanagement_userprofilemanagement_deletionpolicy',
|
|
'choiceSettingValue' => [
|
|
'value' => 'enabled',
|
|
],
|
|
],
|
|
],
|
|
],
|
|
],
|
|
policyType: 'settingsCatalogPolicy',
|
|
platform: 'windows',
|
|
);
|
|
|
|
$keys = array_keys($flat);
|
|
|
|
expect($keys)->toContain('Settings > Account Management > Deletion Policy');
|
|
expect(implode("\n", $keys))->not->toContain('device_vendor_msft_accountmanagement_userprofilemanagement_deletionpolicy');
|
|
});
|