ahmido
1acbf8cc54
## Summary - remove tenant-based Graph options access from runtime service paths and enforce provider-only resolution - add `MicrosoftGraphOptionsResolver` and `ProviderConfigurationRequiredException` for centralized, actionable provider-config errors - turn `Tenant::graphOptions()` into a fail-fast kill switch to prevent legacy runtime usage - add and update tests (including guardrail) to enforce no reintroduction in `app/` - update Spec 088 artifacts (`spec`, `plan`, `research`, `tasks`, checklist) ## Validation - `vendor/bin/sail bin pint --dirty` - `vendor/bin/sail artisan test --compact --filter=NoLegacyTenantGraphOptions` - `vendor/bin/sail artisan test --compact tests/Feature/Filament` - `CI=1 vendor/bin/sail artisan test --compact` ## Notes - Branch includes the guardrail test for legacy callsite detection in `app/`. - Full suite currently green: 1227 passed, 5 skipped. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Reviewed-on: #105
85 lines
3.0 KiB
PHP
85 lines
3.0 KiB
PHP
<?php
|
|
|
|
use App\Models\Policy;
|
|
use App\Models\PolicyVersion;
|
|
use App\Models\Tenant;
|
|
use App\Services\Graph\AssignmentFetcher;
|
|
use App\Services\Graph\AssignmentFilterResolver;
|
|
use App\Services\Graph\GroupResolver;
|
|
use App\Services\Graph\ScopeTagResolver;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\Intune\PolicySnapshotService;
|
|
use App\Services\Intune\VersionService;
|
|
use App\Services\Providers\MicrosoftGraphOptionsResolver;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('retries and succeeds after a policy_versions unique collision during capture', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$policy = Policy::factory()->for($tenant)->create();
|
|
$policy->load('tenant');
|
|
|
|
$service = new VersionService(
|
|
auditLogger: new AuditLogger,
|
|
snapshotService: Mockery::mock(PolicySnapshotService::class),
|
|
assignmentFetcher: Mockery::mock(AssignmentFetcher::class),
|
|
groupResolver: Mockery::mock(GroupResolver::class),
|
|
assignmentFilterResolver: Mockery::mock(AssignmentFilterResolver::class),
|
|
scopeTagResolver: Mockery::mock(ScopeTagResolver::class),
|
|
graphOptionsResolver: app(MicrosoftGraphOptionsResolver::class),
|
|
);
|
|
|
|
$fired = false;
|
|
$collisionInserted = false;
|
|
$dispatcher = PolicyVersion::getEventDispatcher();
|
|
|
|
PolicyVersion::creating(function (PolicyVersion $model) use (&$fired, &$collisionInserted): void {
|
|
if ($fired) {
|
|
return;
|
|
}
|
|
|
|
$fired = true;
|
|
|
|
PolicyVersion::withoutEvents(function () use ($model, &$collisionInserted): void {
|
|
PolicyVersion::query()->create([
|
|
'tenant_id' => $model->tenant_id,
|
|
'policy_id' => $model->policy_id,
|
|
'version_number' => $model->version_number,
|
|
'policy_type' => $model->policy_type,
|
|
'platform' => $model->platform,
|
|
'created_by' => $model->created_by,
|
|
'captured_at' => now(),
|
|
'snapshot' => $model->snapshot,
|
|
'metadata' => $model->metadata,
|
|
'assignments' => $model->assignments,
|
|
'scope_tags' => $model->scope_tags,
|
|
'assignments_hash' => $model->assignments_hash,
|
|
'scope_tags_hash' => $model->scope_tags_hash,
|
|
]);
|
|
|
|
$collisionInserted = true;
|
|
});
|
|
});
|
|
|
|
try {
|
|
$version = $service->captureVersion(
|
|
policy: $policy,
|
|
payload: ['id' => 'p-1'],
|
|
createdBy: 'tester@example.com',
|
|
metadata: ['source' => 'test'],
|
|
assignments: null,
|
|
scopeTags: null,
|
|
);
|
|
} finally {
|
|
PolicyVersion::flushEventListeners();
|
|
PolicyVersion::setEventDispatcher($dispatcher);
|
|
}
|
|
|
|
expect($fired)->toBeTrue();
|
|
expect($collisionInserted)->toBeTrue();
|
|
expect($version->policy_id)->toBe($policy->getKey());
|
|
expect($version->version_number)->toBe(1);
|
|
expect(PolicyVersion::query()->where('policy_id', $policy->getKey())->count())->toBe(1);
|
|
});
|