## Summary - normalize provider-neutral target-scope and identity contracts across provider connection resolution, operation-start gating, verification reporting, and boundary configuration - align provider connection resource, onboarding, tenant summaries, and operation follow-up on the same shared scope contract while keeping Microsoft-specific profile details in provider-owned metadata - add Spec 281 artifacts and focused feature/browser coverage for the new provider-scope contract - move the tenant dashboard context-chip rail into Filament header widgets so the metadata row renders directly under the page subtitle ## Validation - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Feature/Providers/ProviderConnectionTargetScopeNeutralityTest.php tests/Feature/Providers/ProviderIdentityResolutionNeutralityTest.php tests/Feature/Providers/ProviderOperationStartGateTargetScopeContextTest.php tests/Feature/Filament/ProviderConnectionResourceScopeSummaryTest.php tests/Feature/Onboarding/ManagedTenantOnboardingProviderConnectionScopeTest.php tests/Feature/Guards/ProviderConnectionMicrosoftScopeLeakGuardTest.php` - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Browser/Spec281ProviderConnectionScopeSmokeTest.php` - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Feature/Dashboard/TenantDashboardProductizationSummaryTest.php` - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Browser/Dashboard/TenantDashboardProductizationSmokeTest.php` - `cd apps/platform && ./vendor/bin/sail bin pint --dirty --format agent` ## Notes - Filament remains on v5 with Livewire v4-compatible surfaces only. - Provider registration location is unchanged; Laravel 11+ providers stay in `apps/platform/bootstrap/providers.php`. - `ProviderConnectionResource` remains non-globally-searchable and still exposes View/Edit pages. - No new asset registration was added; deploy-time `filament:assets` expectations are unchanged. - No new destructive action path was introduced; existing server authorization and confirmation handling remain in place where applicable. Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #339
157 lines
5.5 KiB
PHP
157 lines
5.5 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Jobs\Middleware\EnsureQueuedExecutionLegitimate;
|
|
use App\Jobs\Middleware\TrackOperationRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Models\User;
|
|
use App\Services\OperationRunService;
|
|
use App\Services\Providers\MicrosoftProviderInventoryCollector;
|
|
use App\Services\Providers\ProviderGateway;
|
|
use App\Support\OperationRunOutcome;
|
|
use App\Support\OperationRunStatus;
|
|
use App\Support\OpsUx\RunFailureSanitizer;
|
|
use App\Support\Providers\TargetScope\ProviderConnectionTargetScopeNormalizer;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use RuntimeException;
|
|
use Throwable;
|
|
|
|
class ProviderInventorySyncJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
public ?OperationRun $operationRun = null;
|
|
|
|
public function __construct(
|
|
public int $tenantId,
|
|
public int $userId,
|
|
public int $providerConnectionId,
|
|
?OperationRun $operationRun = null,
|
|
) {
|
|
$this->operationRun = $operationRun;
|
|
}
|
|
|
|
/**
|
|
* @return array<int, object>
|
|
*/
|
|
public function middleware(): array
|
|
{
|
|
return [new EnsureQueuedExecutionLegitimate, new TrackOperationRun];
|
|
}
|
|
|
|
public function handle(
|
|
MicrosoftProviderInventoryCollector $collector,
|
|
ProviderGateway $gateway,
|
|
OperationRunService $runs,
|
|
): void {
|
|
$tenant = ManagedEnvironment::query()->find($this->tenantId);
|
|
if (! $tenant instanceof ManagedEnvironment) {
|
|
throw new RuntimeException('ManagedEnvironment not found.');
|
|
}
|
|
|
|
$user = User::query()->find($this->userId);
|
|
if (! $user instanceof User) {
|
|
throw new RuntimeException('User not found.');
|
|
}
|
|
|
|
$connection = ProviderConnection::query()
|
|
->where('managed_environment_id', $tenant->getKey())
|
|
->find($this->providerConnectionId);
|
|
|
|
if (! $connection instanceof ProviderConnection) {
|
|
throw new RuntimeException('ProviderConnection not found.');
|
|
}
|
|
|
|
try {
|
|
$counts = $collector->collect($connection);
|
|
$entraTenantName = $this->resolveEntraTenantName($connection, $gateway);
|
|
|
|
if ($entraTenantName !== null) {
|
|
$metadata = is_array($connection->metadata) ? $connection->metadata : [];
|
|
$metadata['entra_tenant_name'] = $entraTenantName;
|
|
$connection->update(['metadata' => $metadata]);
|
|
}
|
|
|
|
if ($this->operationRun instanceof OperationRun) {
|
|
$this->updateRunTargetScope($this->operationRun, $connection, $entraTenantName);
|
|
|
|
$runs->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Succeeded->value,
|
|
summaryCounts: $counts,
|
|
);
|
|
}
|
|
} catch (Throwable $throwable) {
|
|
if (! $this->operationRun instanceof OperationRun) {
|
|
throw $throwable;
|
|
}
|
|
|
|
$message = RunFailureSanitizer::sanitizeMessage($throwable->getMessage());
|
|
$reasonCode = RunFailureSanitizer::normalizeReasonCode($throwable->getMessage());
|
|
|
|
$runs->updateRun(
|
|
$this->operationRun,
|
|
status: OperationRunStatus::Completed->value,
|
|
outcome: OperationRunOutcome::Failed->value,
|
|
failures: [[
|
|
'code' => 'inventory.sync.failed',
|
|
'reason_code' => $reasonCode,
|
|
'message' => $message !== '' ? $message : 'Inventory sync failed.',
|
|
]],
|
|
);
|
|
}
|
|
}
|
|
|
|
private function resolveEntraTenantName(ProviderConnection $connection, ProviderGateway $gateway): ?string
|
|
{
|
|
$metadata = is_array($connection->metadata) ? $connection->metadata : [];
|
|
$existing = $metadata['entra_tenant_name'] ?? null;
|
|
|
|
if (is_string($existing) && trim($existing) !== '') {
|
|
return trim($existing);
|
|
}
|
|
|
|
try {
|
|
$response = $gateway->getOrganization($connection);
|
|
} catch (Throwable) {
|
|
return null;
|
|
}
|
|
|
|
if (! $response->successful()) {
|
|
return null;
|
|
}
|
|
|
|
$displayName = $response->data['displayName'] ?? null;
|
|
|
|
return is_string($displayName) && trim($displayName) !== '' ? trim($displayName) : null;
|
|
}
|
|
|
|
private function updateRunTargetScope(OperationRun $run, ProviderConnection $connection, ?string $entraTenantName): void
|
|
{
|
|
$context = is_array($run->context) ? $run->context : [];
|
|
$normalizer = app(ProviderConnectionTargetScopeNormalizer::class);
|
|
$targetScope = $normalizer->descriptorForConnection($connection)->toArray();
|
|
|
|
if (is_string($entraTenantName) && $entraTenantName !== '') {
|
|
$targetScope['scope_display_name'] = $entraTenantName;
|
|
}
|
|
|
|
$context['connection_type'] = $connection->connection_type?->value ?? $connection->connection_type;
|
|
$context['target_scope'] = $targetScope;
|
|
$context['provider_context'] = $normalizer->providerContext(
|
|
provider: (string) $connection->provider,
|
|
details: $normalizer->contextualIdentityDetailsForConnection($connection),
|
|
);
|
|
|
|
$run->update(['context' => $context]);
|
|
}
|
|
}
|