review-followup Wave 3 라운드 3(P28·P29): fileserver use case·file:* 권한, 보안 파일 primitive 공용화, jvm-test-suite
- 결정 32: fileserver transport 연산 21개를 `port.in` use case로, 쓰기·읽기에 `file:*` 권한(소유자·tenant 정책은 유지), inbound 서비스 이름 `*UseCase`, port 구현 이름 `<Tech><Port>` 규칙(S2-#13b, 24개) - 디렉터리 descriptor 파일 primitive를 `adapter:outbound:support`로(S4-lead-2 일부 — fileserver는 번역만), persistence-fileserver를 scan·클래스별 조건 대신 명시적 `@Bean` 설정으로(S2-#8a 일부), `FileVerifier`를 adapter로 - 호출자 0인 `poster.image-attached` 이벤트 삭제, SES SDK client를 레지스트리 종료 때 close, fileserver migration V1–V5 고정 - P29: auxiliary 레인 → Gradle `jvm-test-suite`(BUILD-O3-5, build-logic 16,768 → 5,851줄), redis-sdk가 runtime을 api로(P22-new-3) - 통합: JPA API surface 기준선 재승인(이름 규칙 변경), migration lane에 V19 반영, messaging 통합 테스트가 jar 안 migration 목록 조회(ORCH-new-5) - P28·P29 에이전트가 세션 재시작으로 중단 — 커밋된 것만 합치고 결과 파일은 오케스트레이터가 확정, S6-#10a는 P30으로 검증: ./gradlew ci verifyDependencyLocks --warning-mode=fail(714 task) · mainCheck architectureCheck verifyPublicPathSnapshot :app-bootstrap:verifyEnvKeys configContractCheck · :app-bootstrap:integrationTest :sample-portfolio:integrationTest :sample-portfolio:systemTest integrationCheck · -p build-logic test · -p optional-platforms ci · releaseCheck qualificationBootJar 통과 Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
09e2dd63d6
commit
0579935746
+95
@@ -0,0 +1,95 @@
|
||||
package dev.caskeleton.composition.fileserver;
|
||||
|
||||
import dev.caskeleton.application.fileserver.admin.AdminAudit;
|
||||
import dev.caskeleton.application.fileserver.admin.AdminAuditPort;
|
||||
import dev.caskeleton.application.fileserver.admin.CleanupUploadsApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.ForceDeleteFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.OrphanScanPort;
|
||||
import dev.caskeleton.application.fileserver.admin.ReconcileOrphansApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.ReverifyFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.FileMetadataPort;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.UploadSessionPort;
|
||||
import dev.caskeleton.application.fileserver.api.security.FileAccessPolicyPort;
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupQueuePort;
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupService;
|
||||
import dev.caskeleton.application.fileserver.observability.SafeFileFingerprint;
|
||||
import dev.caskeleton.application.fileserver.port.in.CleanupUploadsUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ForceDeleteFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ReconcileOrphansUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ReverifyFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.recovery.StagingUploadLocatorPort;
|
||||
import dev.caskeleton.application.transaction.TransactionPort;
|
||||
import java.time.Clock;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* The management plane's actions, on the admin switch, and the audit trail they write.
|
||||
*
|
||||
* <p>Every operation here carries {@code file:admin}, and each one it takes is recorded.
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ConditionalOnProperty(
|
||||
prefix = "app.fileserver-platform.admin",
|
||||
name = "enabled",
|
||||
havingValue = "true")
|
||||
class FileserverAdminActionUseCaseConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
AdminAudit fileserverAdminAuditTrail(
|
||||
AdminAuditPort auditPort, SafeFileFingerprint fingerprint, Clock clock) {
|
||||
return new AdminAudit(auditPort, fingerprint, clock);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
ReconcileOrphansUseCase fileserverReconcileOrphans(
|
||||
OrphanScanPort orphanScanPort,
|
||||
CleanupQueuePort cleanupQueue,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
AdminAudit audit,
|
||||
TransactionPort transactions) {
|
||||
return new ReconcileOrphansApplicationUseCase(
|
||||
orphanScanPort, cleanupQueue, accessPolicy, audit, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
ReverifyFileUseCase fileserverReverifyFile(
|
||||
FileMetadataPort metadataStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
AdminAudit audit,
|
||||
TransactionPort transactions) {
|
||||
return new ReverifyFileApplicationUseCase(metadataStore, accessPolicy, audit, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
ForceDeleteFileUseCase fileserverForceDeleteFile(
|
||||
FileMetadataPort metadataStore,
|
||||
UploadSessionPort sessionStore,
|
||||
StagingUploadLocatorPort stagingLocator,
|
||||
CleanupQueuePort cleanupQueue,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
AdminAudit audit,
|
||||
TransactionPort transactions) {
|
||||
return new ForceDeleteFileApplicationUseCase(
|
||||
metadataStore,
|
||||
sessionStore,
|
||||
stagingLocator,
|
||||
cleanupQueue,
|
||||
accessPolicy,
|
||||
audit,
|
||||
transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
CleanupUploadsUseCase fileserverCleanupUploads(
|
||||
CleanupService cleanupService, FileAccessPolicyPort accessPolicy, AdminAudit audit) {
|
||||
return new CleanupUploadsApplicationUseCase(cleanupService, accessPolicy, audit);
|
||||
}
|
||||
}
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
package dev.caskeleton.composition.fileserver;
|
||||
|
||||
import dev.caskeleton.application.fileserver.admin.GetRuntimeCapabilitiesApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.GetStorageHealthApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.ListIncompleteUploadsApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.ListOrphansApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.admin.OrphanScanPort;
|
||||
import dev.caskeleton.application.fileserver.admin.StorageHealthPort;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.UploadSessionPort;
|
||||
import dev.caskeleton.application.fileserver.api.security.FileAccessPolicyPort;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetRuntimeCapabilitiesUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetStorageHealthUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ListIncompleteUploadsUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ListOrphansUseCase;
|
||||
import dev.caskeleton.application.transaction.TransactionPort;
|
||||
import java.time.Clock;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* The management plane's reads, on the admin switch.
|
||||
*
|
||||
* <p>Admin is a separate decision from the data plane: a deployment that serves files does not
|
||||
* automatically want an operator surface. Every operation here carries {@code file:admin}.
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ConditionalOnProperty(
|
||||
prefix = "app.fileserver-platform.admin",
|
||||
name = "enabled",
|
||||
havingValue = "true")
|
||||
class FileserverAdminReadUseCaseConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
GetStorageHealthUseCase fileserverGetStorageHealth(
|
||||
StorageHealthPort healthPort, FileAccessPolicyPort accessPolicy) {
|
||||
return new GetStorageHealthApplicationUseCase(healthPort, accessPolicy);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
GetRuntimeCapabilitiesUseCase fileserverGetRuntimeCapabilities(
|
||||
StorageHealthPort healthPort, FileAccessPolicyPort accessPolicy) {
|
||||
return new GetRuntimeCapabilitiesApplicationUseCase(healthPort, accessPolicy);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
ListOrphansUseCase fileserverListOrphans(
|
||||
OrphanScanPort orphanScanPort, FileAccessPolicyPort accessPolicy) {
|
||||
return new ListOrphansApplicationUseCase(orphanScanPort, accessPolicy);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
ListIncompleteUploadsUseCase fileserverListIncompleteUploads(
|
||||
UploadSessionPort sessionStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new ListIncompleteUploadsApplicationUseCase(
|
||||
sessionStore, accessPolicy, transactions, clock);
|
||||
}
|
||||
}
|
||||
+120
@@ -0,0 +1,120 @@
|
||||
package dev.caskeleton.composition.fileserver;
|
||||
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.autoconfigure.FileserverMetricsSupport;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.FileMetadataPort;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.UploadSessionPort;
|
||||
import dev.caskeleton.application.fileserver.api.security.FileAccessPolicyPort;
|
||||
import dev.caskeleton.application.fileserver.api.security.OriginalFilenamePolicy;
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupQueuePort;
|
||||
import dev.caskeleton.application.fileserver.download.DescribeFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.download.DownloadContentPort;
|
||||
import dev.caskeleton.application.fileserver.download.OpenDownloadContentApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.download.PrepareDownloadApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.download.TransferDownloadContentApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.download.ZeroCopyDownloadPort;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.CopyContentPort;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.CopyFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.DeleteFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.MoveFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.observability.FileserverMetricsPort;
|
||||
import dev.caskeleton.application.fileserver.port.in.CopyFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.DeleteFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.DescribeFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.MoveFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.OpenDownloadContentUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.PrepareDownloadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.TransferDownloadContentUseCase;
|
||||
import dev.caskeleton.application.fileserver.recovery.StagingUploadLocatorPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadIdentifierPort;
|
||||
import dev.caskeleton.application.transaction.TransactionPort;
|
||||
import java.time.Clock;
|
||||
import java.util.Optional;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* The operations on a stored file: describe, download, delete, copy, move.
|
||||
*
|
||||
* <p>The reads carry no permission, because a deployment may allow anonymous reads and only {@code
|
||||
* FileAccessPolicyPort} can decide that; the writes carry {@code file:delete}, {@code file:copy}
|
||||
* and {@code file:move}, enforced on the bean's proxy.
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
class FileserverFileUseCaseConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
DescribeFileUseCase fileserverDescribeFile(
|
||||
FileMetadataPort metadataStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
TransactionPort transactions) {
|
||||
return new DescribeFileApplicationUseCase(metadataStore, accessPolicy, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
PrepareDownloadUseCase fileserverPrepareDownload(
|
||||
FileMetadataPort metadataStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
TransactionPort transactions) {
|
||||
return new PrepareDownloadApplicationUseCase(metadataStore, accessPolicy, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
OpenDownloadContentUseCase fileserverOpenDownloadContent(DownloadContentPort contentGateway) {
|
||||
return new OpenDownloadContentApplicationUseCase(contentGateway);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransferDownloadContentUseCase fileserverTransferDownloadContent(
|
||||
ZeroCopyDownloadPort zeroCopyGateway, ObjectProvider<FileserverMetricsPort> metrics) {
|
||||
return new TransferDownloadContentApplicationUseCase(
|
||||
Optional.of(zeroCopyGateway), FileserverMetricsSupport.metricsOrNoop(metrics));
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
DeleteFileUseCase fileserverDeleteFile(
|
||||
FileMetadataPort metadataStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
CleanupQueuePort cleanupQueue,
|
||||
UploadSessionPort sessionStore,
|
||||
StagingUploadLocatorPort stagingLocator,
|
||||
TransactionPort transactions) {
|
||||
return new DeleteFileApplicationUseCase(
|
||||
metadataStore, accessPolicy, cleanupQueue, sessionStore, stagingLocator, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
CopyFileUseCase fileserverCopyFile(
|
||||
FileMetadataPort metadataStore,
|
||||
CopyContentPort copyGateway,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
OriginalFilenamePolicy filenamePolicy,
|
||||
UploadIdentifierPort identifierFactory,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new CopyFileApplicationUseCase(
|
||||
metadataStore,
|
||||
copyGateway,
|
||||
accessPolicy,
|
||||
filenamePolicy,
|
||||
identifierFactory,
|
||||
transactions,
|
||||
clock);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
MoveFileUseCase fileserverMoveFile(
|
||||
FileMetadataPort metadataStore,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
TransactionPort transactions) {
|
||||
return new MoveFileApplicationUseCase(metadataStore, accessPolicy, transactions);
|
||||
}
|
||||
}
|
||||
+5
-1
@@ -40,7 +40,11 @@ import org.springframework.context.annotation.Import;
|
||||
// the composition root's job by definition, so these are where they belong rather than where
|
||||
// they were left.
|
||||
FileserverLocalStorageCoreConfiguration.class,
|
||||
FileserverUploadServiceConfiguration.class,
|
||||
FileserverUploadSupportConfiguration.class,
|
||||
FileserverUploadUseCaseConfiguration.class,
|
||||
FileserverFileUseCaseConfiguration.class,
|
||||
FileserverAdminReadUseCaseConfiguration.class,
|
||||
FileserverAdminActionUseCaseConfiguration.class,
|
||||
FileserverCleanupConfiguration.class,
|
||||
// The HTTP surface itself. Its controllers used to be found by the composition root's component
|
||||
// scan of `dev.caskeleton.adapter`; the capability now brings them, so selecting it is enough.
|
||||
|
||||
+63
@@ -0,0 +1,63 @@
|
||||
package dev.caskeleton.composition.fileserver;
|
||||
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.autoconfigure.FileserverPlatformSettings;
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.identifier.RandomUploadIdentifier;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.UploadSessionPort;
|
||||
import dev.caskeleton.application.fileserver.concurrency.WriterLeaseCoordinator;
|
||||
import dev.caskeleton.application.fileserver.quota.StorageUsagePort;
|
||||
import dev.caskeleton.application.fileserver.quota.TransferAdmissionController;
|
||||
import dev.caskeleton.application.fileserver.quota.TransferAdmissionProperties;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadIdentifierPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadPolicy;
|
||||
import dev.caskeleton.application.transaction.TransactionPort;
|
||||
import java.time.Clock;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* What every upload use case stands on: the identifier generator, transfer admission and the writer
|
||||
* lease. The use cases themselves are {@link FileserverUploadUseCaseConfiguration}'s.
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
class FileserverUploadSupportConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
UploadIdentifierPort fileserverIdentifierFactory() {
|
||||
return new RandomUploadIdentifier();
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransferAdmissionProperties fileserverAdmissionProperties(FileserverPlatformSettings settings) {
|
||||
FileserverPlatformSettings.Quota quota = settings.quota();
|
||||
return new TransferAdmissionProperties(
|
||||
quota.instanceUploadPermits(),
|
||||
quota.scopeUploadPermits(),
|
||||
quota.directDownloadPermits(),
|
||||
quota.softHighWater(),
|
||||
quota.hardHighWater());
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransferAdmissionController fileserverAdmissionController(
|
||||
TransferAdmissionProperties properties,
|
||||
StorageUsagePort usageProbe,
|
||||
FileserverPlatformSettings settings) {
|
||||
return new TransferAdmissionController(
|
||||
properties, usageProbe, settings.upload().maxFileSize().toBytes());
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
WriterLeaseCoordinator fileserverWriterLeaseCoordinator(
|
||||
UploadSessionPort sessionStore,
|
||||
UploadPolicy uploadPolicy,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new WriterLeaseCoordinator(
|
||||
sessionStore, uploadPolicy.leaseDuration(), transactions, clock);
|
||||
}
|
||||
}
|
||||
+88
-60
@@ -1,8 +1,6 @@
|
||||
package dev.caskeleton.composition.fileserver;
|
||||
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.autoconfigure.FileserverMetricsSupport;
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.autoconfigure.FileserverPlatformSettings;
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.identifier.RandomUploadIdentifierFactory;
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.local.LocalBlockingContentStore;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.FileMetadataPort;
|
||||
import dev.caskeleton.application.fileserver.api.metadata.FileQuotaPort;
|
||||
@@ -12,19 +10,23 @@ import dev.caskeleton.application.fileserver.api.security.OriginalFilenamePolicy
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupQueuePort;
|
||||
import dev.caskeleton.application.fileserver.concurrency.WriterLeaseCoordinator;
|
||||
import dev.caskeleton.application.fileserver.observability.FileserverMetricsPort;
|
||||
import dev.caskeleton.application.fileserver.quota.StorageUsagePort;
|
||||
import dev.caskeleton.application.fileserver.port.in.AppendUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CancelUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CreateUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.FinalizeUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetUploadStatusUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.UploadFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.quota.TransferAdmissionController;
|
||||
import dev.caskeleton.application.fileserver.quota.TransferAdmissionProperties;
|
||||
import dev.caskeleton.application.fileserver.recovery.RecoveryQueuePort;
|
||||
import dev.caskeleton.application.fileserver.upload.DefaultFinalizeUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.DefaultSingleShotUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.DefaultUploadApplicationService;
|
||||
import dev.caskeleton.application.fileserver.upload.AppendUploadApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.CancelUploadApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.CreateUploadApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.FileVerificationPort;
|
||||
import dev.caskeleton.application.fileserver.upload.FinalizeUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.FinalizeUploadApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.GetUploadStatusApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.QuotaCommitPort;
|
||||
import dev.caskeleton.application.fileserver.upload.SingleShotUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadApplicationService;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadContentPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadFileApplicationUseCase;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadIdentifierPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadPolicies;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadPolicy;
|
||||
@@ -37,62 +39,73 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* The upload operations, one bean each.
|
||||
*
|
||||
* <p>Each is a use case with its own declared capability; the writes also carry a {@code
|
||||
* file:upload} permission, which the web adapter's method security enforces on the bean's proxy.
|
||||
* That is why they are container beans rather than objects a controller builds: an instance made
|
||||
* with {@code new} outside the container is never proxied, and its permission would be a comment.
|
||||
* Roles and ownership are still {@code FileAccessPolicyPort}'s, inside each use case.
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
class FileserverUploadServiceConfiguration {
|
||||
class FileserverUploadUseCaseConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
UploadIdentifierPort fileserverIdentifierFactory() {
|
||||
return new RandomUploadIdentifierFactory();
|
||||
UploadStores fileserverUploadStores(
|
||||
FileMetadataPort metadataStore, UploadSessionPort sessionStore, CleanupQueuePort queue) {
|
||||
return new UploadStores(metadataStore, sessionStore, queue);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransferAdmissionProperties fileserverAdmissionProperties(FileserverPlatformSettings settings) {
|
||||
FileserverPlatformSettings.Quota quota = settings.quota();
|
||||
return new TransferAdmissionProperties(
|
||||
quota.instanceUploadPermits(),
|
||||
quota.scopeUploadPermits(),
|
||||
quota.directDownloadPermits(),
|
||||
quota.softHighWater(),
|
||||
quota.hardHighWater());
|
||||
UploadPolicies fileserverUploadPolicies(
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
OriginalFilenamePolicy filenamePolicy,
|
||||
UploadPolicy uploadPolicy) {
|
||||
return new UploadPolicies(accessPolicy, filenamePolicy, uploadPolicy);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransferAdmissionController fileserverAdmissionController(
|
||||
TransferAdmissionProperties properties,
|
||||
StorageUsagePort usageProbe,
|
||||
FileserverPlatformSettings settings) {
|
||||
return new TransferAdmissionController(
|
||||
properties, usageProbe, settings.upload().maxFileSize().toBytes());
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
UploadApplicationService fileserverUploadService(
|
||||
FileMetadataPort metadataStore,
|
||||
UploadSessionPort sessionStore,
|
||||
WriterLeaseCoordinator leaseCoordinator,
|
||||
CreateUploadUseCase fileserverCreateUpload(
|
||||
UploadStores stores,
|
||||
UploadPolicies policies,
|
||||
UploadStoragePort storageGateway,
|
||||
FileQuotaPort quotaService,
|
||||
TransferAdmissionController admissionController,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
OriginalFilenamePolicy filenamePolicy,
|
||||
CleanupQueuePort cleanupQueue,
|
||||
UploadIdentifierPort identifierFactory,
|
||||
UploadPolicy uploadPolicy,
|
||||
ObjectProvider<FileserverMetricsPort> metrics,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new DefaultUploadApplicationService(
|
||||
new UploadStores(metadataStore, sessionStore, cleanupQueue),
|
||||
new UploadPolicies(accessPolicy, filenamePolicy, uploadPolicy),
|
||||
leaseCoordinator,
|
||||
return new CreateUploadApplicationUseCase(
|
||||
stores,
|
||||
policies,
|
||||
storageGateway,
|
||||
quotaService,
|
||||
admissionController,
|
||||
identifierFactory,
|
||||
transactions,
|
||||
clock);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
AppendUploadUseCase fileserverAppendUpload(
|
||||
UploadStores stores,
|
||||
UploadPolicies policies,
|
||||
WriterLeaseCoordinator leaseCoordinator,
|
||||
UploadStoragePort storageGateway,
|
||||
TransferAdmissionController admissionController,
|
||||
ObjectProvider<FileserverMetricsPort> metrics,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new AppendUploadApplicationUseCase(
|
||||
stores,
|
||||
policies,
|
||||
leaseCoordinator,
|
||||
storageGateway,
|
||||
admissionController,
|
||||
FileserverMetricsSupport.metricsOrNoop(metrics),
|
||||
transactions,
|
||||
clock);
|
||||
@@ -100,7 +113,24 @@ class FileserverUploadServiceConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
FinalizeUploadService fileserverFinalizeService(
|
||||
GetUploadStatusUseCase fileserverGetUploadStatus(
|
||||
UploadStores stores,
|
||||
FileAccessPolicyPort accessPolicy,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new GetUploadStatusApplicationUseCase(stores, accessPolicy, transactions, clock);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
CancelUploadUseCase fileserverCancelUpload(
|
||||
UploadStores stores, FileAccessPolicyPort accessPolicy, TransactionPort transactions) {
|
||||
return new CancelUploadApplicationUseCase(stores, accessPolicy, transactions);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
FinalizeUploadUseCase fileserverFinalizeUpload(
|
||||
FileMetadataPort metadataStore,
|
||||
UploadSessionPort sessionStore,
|
||||
UploadContentPort contentGateway,
|
||||
@@ -112,7 +142,7 @@ class FileserverUploadServiceConfiguration {
|
||||
LocalBlockingContentStore store,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new DefaultFinalizeUploadService(
|
||||
return new FinalizeUploadApplicationUseCase(
|
||||
metadataStore,
|
||||
sessionStore,
|
||||
contentGateway,
|
||||
@@ -126,21 +156,19 @@ class FileserverUploadServiceConfiguration {
|
||||
clock);
|
||||
}
|
||||
|
||||
/**
|
||||
* The single-request upload, over the other upload use cases' beans.
|
||||
*
|
||||
* <p>It takes the proxies, not new instances, so each step it composes is authorized exactly as
|
||||
* it would be when a client called it directly.
|
||||
*/
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
SingleShotUploadService fileserverSingleShotUploadService(
|
||||
UploadApplicationService uploadService, FinalizeUploadService finalizeService) {
|
||||
return new DefaultSingleShotUploadService(uploadService, finalizeService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
WriterLeaseCoordinator fileserverWriterLeaseCoordinator(
|
||||
UploadSessionPort sessionStore,
|
||||
UploadPolicy uploadPolicy,
|
||||
TransactionPort transactions,
|
||||
Clock clock) {
|
||||
return new WriterLeaseCoordinator(
|
||||
sessionStore, uploadPolicy.leaseDuration(), transactions, clock);
|
||||
UploadFileUseCase fileserverUploadFile(
|
||||
CreateUploadUseCase create,
|
||||
AppendUploadUseCase append,
|
||||
FinalizeUploadUseCase finalizer,
|
||||
CancelUploadUseCase cancel) {
|
||||
return new UploadFileApplicationUseCase(create, append, finalizer, cancel);
|
||||
}
|
||||
}
|
||||
+56
-13
@@ -6,27 +6,42 @@ import dev.caskeleton.adapter.outbound.fileserver.platform.autoconfigure.Fileser
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.security.RoleBasedFileAccessPolicy;
|
||||
import dev.caskeleton.adapter.outbound.fileserver.platform.security.UnenforcedFileAccessPolicy;
|
||||
import dev.caskeleton.application.fileserver.admin.AdminAuditPort;
|
||||
import dev.caskeleton.application.fileserver.admin.FileserverAdminService;
|
||||
import dev.caskeleton.application.fileserver.admin.OrphanScanPort;
|
||||
import dev.caskeleton.application.fileserver.admin.StorageHealthPort;
|
||||
import dev.caskeleton.application.fileserver.api.security.FileAccessPolicyPort;
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupContentPort;
|
||||
import dev.caskeleton.application.fileserver.cleanup.CleanupService;
|
||||
import dev.caskeleton.application.fileserver.concurrency.WriterLeaseCoordinator;
|
||||
import dev.caskeleton.application.fileserver.download.DownloadApplicationService;
|
||||
import dev.caskeleton.application.fileserver.download.DownloadContentPort;
|
||||
import dev.caskeleton.application.fileserver.download.ZeroCopyDownloadPort;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.CopyContentPort;
|
||||
import dev.caskeleton.application.fileserver.lifecycle.FileLifecycleService;
|
||||
import dev.caskeleton.application.fileserver.observability.FileserverAuditPort;
|
||||
import dev.caskeleton.application.fileserver.port.in.AppendUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CancelUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CleanupUploadsUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CopyFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.CreateUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.DeleteFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.DescribeFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.FinalizeUploadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ForceDeleteFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetRuntimeCapabilitiesUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetStorageHealthUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.GetUploadStatusUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ListIncompleteUploadsUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ListOrphansUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.MoveFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.OpenDownloadContentUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.PrepareDownloadUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ReconcileOrphansUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.ReverifyFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.TransferDownloadContentUseCase;
|
||||
import dev.caskeleton.application.fileserver.port.in.UploadFileUseCase;
|
||||
import dev.caskeleton.application.fileserver.quota.StorageUsagePort;
|
||||
import dev.caskeleton.application.fileserver.quota.TransferAdmissionController;
|
||||
import dev.caskeleton.application.fileserver.recovery.FileReconciliationService;
|
||||
import dev.caskeleton.application.fileserver.recovery.ReconciliationContentPort;
|
||||
import dev.caskeleton.application.fileserver.upload.FileVerificationPort;
|
||||
import dev.caskeleton.application.fileserver.upload.FinalizeUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.SingleShotUploadService;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadApplicationService;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadContentPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadIdentifierPort;
|
||||
import dev.caskeleton.application.fileserver.upload.UploadStoragePort;
|
||||
@@ -88,11 +103,19 @@ class FileserverRuntimeAssemblyTest {
|
||||
.forEach(port -> assertThat(context).hasSingleBean(port));
|
||||
|
||||
List.of(
|
||||
UploadApplicationService.class,
|
||||
FinalizeUploadService.class,
|
||||
SingleShotUploadService.class,
|
||||
DownloadApplicationService.class,
|
||||
FileLifecycleService.class,
|
||||
CreateUploadUseCase.class,
|
||||
AppendUploadUseCase.class,
|
||||
GetUploadStatusUseCase.class,
|
||||
CancelUploadUseCase.class,
|
||||
FinalizeUploadUseCase.class,
|
||||
UploadFileUseCase.class,
|
||||
DescribeFileUseCase.class,
|
||||
PrepareDownloadUseCase.class,
|
||||
OpenDownloadContentUseCase.class,
|
||||
TransferDownloadContentUseCase.class,
|
||||
DeleteFileUseCase.class,
|
||||
CopyFileUseCase.class,
|
||||
MoveFileUseCase.class,
|
||||
CleanupService.class,
|
||||
FileReconciliationService.class,
|
||||
WriterLeaseCoordinator.class,
|
||||
@@ -105,7 +128,16 @@ class FileserverRuntimeAssemblyTest {
|
||||
assertThat(context).hasSingleBean(FileserverAuditPort.class);
|
||||
assertThat(context.getBean(FileAccessPolicyPort.class))
|
||||
.isInstanceOf(RoleBasedFileAccessPolicy.class);
|
||||
assertThat(context).doesNotHaveBean(FileserverAdminService.class);
|
||||
List.of(
|
||||
GetStorageHealthUseCase.class,
|
||||
GetRuntimeCapabilitiesUseCase.class,
|
||||
ListOrphansUseCase.class,
|
||||
ReconcileOrphansUseCase.class,
|
||||
ReverifyFileUseCase.class,
|
||||
ForceDeleteFileUseCase.class,
|
||||
ListIncompleteUploadsUseCase.class,
|
||||
CleanupUploadsUseCase.class)
|
||||
.forEach(operation -> assertThat(context).doesNotHaveBean(operation));
|
||||
assertThat(context).doesNotHaveBean(FileserverCleanupWorker.class);
|
||||
});
|
||||
}
|
||||
@@ -153,7 +185,18 @@ class FileserverRuntimeAssemblyTest {
|
||||
void theAdminPlaneAppearsOnItsOwnSwitch() {
|
||||
enabled()
|
||||
.withPropertyValues("app.fileserver-platform.admin.enabled=true")
|
||||
.run(context -> assertThat(context).hasSingleBean(FileserverAdminService.class));
|
||||
.run(
|
||||
context ->
|
||||
List.of(
|
||||
GetStorageHealthUseCase.class,
|
||||
GetRuntimeCapabilitiesUseCase.class,
|
||||
ListOrphansUseCase.class,
|
||||
ReconcileOrphansUseCase.class,
|
||||
ReverifyFileUseCase.class,
|
||||
ForceDeleteFileUseCase.class,
|
||||
ListIncompleteUploadsUseCase.class,
|
||||
CleanupUploadsUseCase.class)
|
||||
.forEach(operation -> assertThat(context).hasSingleBean(operation)));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ class IdempotencyAutoConfigurationTest {
|
||||
.hasSingleBean(IdempotencyExecutor.class)
|
||||
.getBean(IdempotencyStorePort.class)
|
||||
.extracting(store -> store.getClass().getSimpleName())
|
||||
.isEqualTo("PostgreSqlOwnerSafeIdempotencyStore"));
|
||||
.isEqualTo("PostgreSqlIdempotencyStore"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user