diff --git a/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt b/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt index 5b9404c34..b019068cb 100644 --- a/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt +++ b/dao/src/main/kotlin/repositories/DaoScannerRunRepository.kt @@ -27,45 +27,25 @@ import org.eclipse.apoapsis.ortserver.dao.entityQuery import org.eclipse.apoapsis.ortserver.dao.mapAndDeduplicate import org.eclipse.apoapsis.ortserver.dao.tables.ScannerJobDao import org.eclipse.apoapsis.ortserver.dao.tables.provenance.PackageProvenanceDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ClearlyDefinedStorageConfigurationDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.DetectedLicenseMappingDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.FileArchiverConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.FileBasedStorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.FileStorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.HttpFileStorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.LocalFileStorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.PostgresConnectionDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.PostgresStorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ProvenanceStorageConfigurationDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationOptionDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationSecretDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationStorageDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationsOptionsTable import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerConfigurationsSecretsTable import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScannersDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsScannersTable import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.ScannerRunsTable -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.StorageConfigurationDao -import org.eclipse.apoapsis.ortserver.dao.tables.runs.scanner.Sw360StorageConfigurationDao import org.eclipse.apoapsis.ortserver.dao.tables.runs.shared.EnvironmentDao import org.eclipse.apoapsis.ortserver.model.repositories.ScannerRunRepository import org.eclipse.apoapsis.ortserver.model.runs.Environment import org.eclipse.apoapsis.ortserver.model.runs.Identifier import org.eclipse.apoapsis.ortserver.model.runs.OrtIssue -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ClearlyDefinedStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileArchiveConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileBasedStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.KnownProvenance -import org.eclipse.apoapsis.ortserver.model.runs.scanner.PostgresStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceResolutionResult -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScanStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScannerConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScannerRun -import org.eclipse.apoapsis.ortserver.model.runs.scanner.Sw360StorageConfiguration import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.insert @@ -195,8 +175,6 @@ private fun createScannerConfiguration( this.skipConcluded = scannerConfiguration.skipConcluded this.createMissingArchives = scannerConfiguration.createMissingArchives this.ignorePatterns = scannerConfiguration.ignorePatterns - this.storageReaders = scannerConfiguration.storageReaders - this.storageWriters = scannerConfiguration.storageWriters this.detectedLicenseMappings = detectedLicenseMappings } @@ -220,112 +198,9 @@ private fun createScannerConfiguration( } } - createFileArchiverConfiguration(scannerConfigurationDao, scannerConfiguration.archive) - createProvenanceStorageConfiguration(scannerConfigurationDao, scannerConfiguration.provenanceStorage) - createStorages(scannerConfigurationDao, scannerConfiguration.storages) - return scannerConfigurationDao } -fun createStorages( - scannerConfigurationDao: ScannerConfigurationDao, - storages: Map? -): List? = - storages?.map { (storage, storageConfiguration) -> - val scannerStorageConfigurationDao = ScannerConfigurationStorageDao.new { - this.scannerConfiguration = scannerConfigurationDao - this.storage = storage - } - - when (storageConfiguration) { - is ClearlyDefinedStorageConfiguration -> { - StorageConfigurationDao.new { - this.scannerConfigurationStorage = scannerStorageConfigurationDao - this.clearlyDefinedStorageConfiguration = ClearlyDefinedStorageConfigurationDao - .getOrPut(storageConfiguration) - } - } - - is PostgresStorageConfiguration -> { - StorageConfigurationDao.new { - this.scannerConfigurationStorage = scannerStorageConfigurationDao - this.postgresStorageConfiguration = createPostgresStorageConfiguration(storageConfiguration) - } - } - - is FileBasedStorageConfiguration -> { - StorageConfigurationDao.new { - this.scannerConfigurationStorage = scannerStorageConfigurationDao - this.fileBasedStorageConfiguration = createFileBasedStorageConfiguration(storageConfiguration) - } - } - - is Sw360StorageConfiguration -> { - StorageConfigurationDao.new { - this.scannerConfigurationStorage = scannerStorageConfigurationDao - this.sw360StorageConfiguration = Sw360StorageConfigurationDao.getOrPut(storageConfiguration) - } - } - - else -> null - } - } - -private fun createProvenanceStorageConfiguration( - scannerConfigurationDao: ScannerConfigurationDao, - provenanceStorageConfiguration: ProvenanceStorageConfiguration? -): ProvenanceStorageConfigurationDao? = - provenanceStorageConfiguration?.let { - ProvenanceStorageConfigurationDao.new { - this.scannerConfiguration = scannerConfigurationDao - this.fileStorageConfiguration = it.fileStorage?.let { createFileStorageConfiguration(it) } - this.postgresStorageConfiguration = it.postgresStorageConfiguration?.let { - createPostgresStorageConfiguration(it) - } - } - } - -private fun createFileArchiverConfiguration( - scannerConfigurationDao: ScannerConfigurationDao, - archive: FileArchiveConfiguration? -): FileArchiverConfigurationDao? = - archive?.let { - FileArchiverConfigurationDao.new { - this.scannerConfiguration = scannerConfigurationDao - this.fileStorageConfiguration = it.fileStorage?.let { createFileStorageConfiguration(it) } - this.postgresStorageConfiguration = it.postgresStorage?.let { createPostgresStorageConfiguration(it) } - } - } - -private fun createFileStorageConfiguration( - fileStorageConfiguration: FileStorageConfiguration -): FileStorageConfigurationDao = - FileStorageConfigurationDao.new { - this.localFileStorageConfiguration = fileStorageConfiguration.localFileStorage?.let { - LocalFileStorageConfigurationDao.getOrPut(it) - } - - this.httpFileStorageConfiguration = fileStorageConfiguration.httpFileStorage?.let { - HttpFileStorageConfigurationDao.getOrPut(it) - } - } - -private fun createPostgresStorageConfiguration( - postgresStorageConfiguration: PostgresStorageConfiguration -): PostgresStorageConfigurationDao = - PostgresStorageConfigurationDao.new { - this.postgresConnection = PostgresConnectionDao.getOrPut(postgresStorageConfiguration.connection) - this.type = postgresStorageConfiguration.type - } - -private fun createFileBasedStorageConfiguration( - fileBasedStorageConfiguration: FileBasedStorageConfiguration -): FileBasedStorageConfigurationDao = - FileBasedStorageConfigurationDao.new { - this.fileStorageConfiguration = createFileStorageConfiguration(fileBasedStorageConfiguration.backend) - this.type = fileBasedStorageConfiguration.type - } - private fun createScanners(run: ScannerRunDao, scanners: Map>) { scanners.entries.forEach { (id, scannerNames) -> scannerNames.forEach { scanner -> diff --git a/dao/src/main/kotlin/tables/runs/scanner/ScannerConfigurationsTable.kt b/dao/src/main/kotlin/tables/runs/scanner/ScannerConfigurationsTable.kt index 8362177a1..7c46abeb3 100644 --- a/dao/src/main/kotlin/tables/runs/scanner/ScannerConfigurationsTable.kt +++ b/dao/src/main/kotlin/tables/runs/scanner/ScannerConfigurationsTable.kt @@ -83,15 +83,10 @@ class ScannerConfigurationDao(id: EntityID) : LongEntity(id) { return ScannerConfiguration( skipConcluded = skipConcluded, - archive = fileArchiveConfiguration?.mapToModel(), createMissingArchives = createMissingArchives, detectedLicenseMappings = detectedLicenseMappings.associate { it.license to it.spdxLicense }, config = config, - storages = storages.associate { it.storage to it.storages.mapToModel() }, - storageReaders = storageReaders, - storageWriters = storageWriters, - ignorePatterns = ignorePatterns.orEmpty(), - provenanceStorage = provenanceStorageConfiguration?.mapToModel() + ignorePatterns = ignorePatterns.orEmpty() ) } } diff --git a/dao/src/test/kotlin/repositories/DaoScannerRunRepositoryTest.kt b/dao/src/test/kotlin/repositories/DaoScannerRunRepositoryTest.kt index e95e6beab..0302c413d 100644 --- a/dao/src/test/kotlin/repositories/DaoScannerRunRepositoryTest.kt +++ b/dao/src/test/kotlin/repositories/DaoScannerRunRepositoryTest.kt @@ -47,15 +47,7 @@ import org.eclipse.apoapsis.ortserver.model.runs.Identifier import org.eclipse.apoapsis.ortserver.model.runs.RemoteArtifact import org.eclipse.apoapsis.ortserver.model.runs.VcsInfo import org.eclipse.apoapsis.ortserver.model.runs.scanner.ArtifactProvenance -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ClearlyDefinedStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileArchiveConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileBasedStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.LocalFileStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.PostgresConnection -import org.eclipse.apoapsis.ortserver.model.runs.scanner.PostgresStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceResolutionResult -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.RepositoryProvenance import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScannerConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScannerRun @@ -306,19 +298,8 @@ private fun createScanResult( } } -internal val fileStorageConfiguration = FileStorageConfiguration( - localFileStorage = LocalFileStorageConfiguration( - directory = "/path/to/storage", - compression = true - ) -) - internal val scannerConfiguration = ScannerConfiguration( skipConcluded = false, - archive = FileArchiveConfiguration( - enabled = true, - fileStorage = fileStorageConfiguration - ), createMissingArchives = true, detectedLicenseMappings = mapOf( "license-1" to "spdx-license-1", @@ -334,33 +315,7 @@ internal val scannerConfiguration = ScannerConfiguration( secrets = mapOf("secret-key-1" to "secret-value-1", "secret-key-2" to "secret-value-2") ) ), - storages = mapOf( - "local" to FileBasedStorageConfiguration( - backend = fileStorageConfiguration, - type = "PROVENANCE_BASED" - ), - "clearlyDefined" to ClearlyDefinedStorageConfiguration( - serverUrl = "https://api.clearlydefined.io" - ) - ), - storageReaders = listOf("reader-1", "reader-2"), - storageWriters = listOf("writer-1", "writer-2"), - ignorePatterns = listOf("pattern-1", "pattern-2"), - provenanceStorage = ProvenanceStorageConfiguration( - postgresStorageConfiguration = PostgresStorageConfiguration( - connection = PostgresConnection( - url = "jdbc:postgresql://postgresql-server:5432/database", - schema = "public", - username = "username", - sslMode = "required", - sslCert = "/defaultdir/postgresql.crt", - sslKey = "/defaultdir/postgresql.pk8", - sslRootCert = "/defaultdir/root.crt", - parallelTransactions = 5 - ), - type = "PROVENANCE_BASED" - ) - ) + ignorePatterns = listOf("pattern-1", "pattern-2") ) private fun associateScannerRunWithPackageProvenance(scannerRun: ScannerRun, packageProvenance: PackageProvenanceDao) { diff --git a/model/src/commonMain/kotlin/runs/scanner/ScannerConfiguration.kt b/model/src/commonMain/kotlin/runs/scanner/ScannerConfiguration.kt index 6c1be2316..bb67d87bf 100644 --- a/model/src/commonMain/kotlin/runs/scanner/ScannerConfiguration.kt +++ b/model/src/commonMain/kotlin/runs/scanner/ScannerConfiguration.kt @@ -23,13 +23,8 @@ import org.eclipse.apoapsis.ortserver.model.PluginConfiguration data class ScannerConfiguration( val skipConcluded: Boolean, - val archive: FileArchiveConfiguration? = null, val createMissingArchives: Boolean, val detectedLicenseMappings: Map, val config: Map, - val storages: Map?, - val storageReaders: List?, - val storageWriters: List?, - val ignorePatterns: List, - val provenanceStorage: ProvenanceStorageConfiguration? + val ignorePatterns: List ) diff --git a/workers/common/src/main/kotlin/common/OrtMappings.kt b/workers/common/src/main/kotlin/common/OrtMappings.kt index e715d6d2c..b9951092e 100644 --- a/workers/common/src/main/kotlin/common/OrtMappings.kt +++ b/workers/common/src/main/kotlin/common/OrtMappings.kt @@ -448,22 +448,10 @@ fun OrtScannerRun.mapToModel(scannerJobId: Long) = fun OrtScannerConfiguration.mapToModel() = ScannerConfiguration( skipConcluded = skipConcluded, - archive = archive?.mapToModel(), createMissingArchives = createMissingArchives, detectedLicenseMappings = detectedLicenseMapping, config = config?.mapValues { it.value.mapToModel() }.orEmpty(), - storages = storages?.map { (name, storage) -> - name to when (storage) { - is OrtClearlyDefinedStorageConfiguration -> storage.mapToModel() - is OrtFileBasedStorageConfiguration -> storage.mapToModel() - is OrtPostgresStorageConfiguration -> storage.mapToModel() - is OrtSw360StorageConfiguration -> storage.mapToModel() - } - }?.toMap().orEmpty(), - storageReaders = storageReaders, - storageWriters = storageWriters, - ignorePatterns = ignorePatterns, - provenanceStorage = provenanceStorage?.mapToModel() + ignorePatterns = ignorePatterns ) fun OrtScanResult.mapToModel() = diff --git a/workers/common/src/main/kotlin/common/OrtServerMappings.kt b/workers/common/src/main/kotlin/common/OrtServerMappings.kt index 48c9ed821..1bca010a6 100644 --- a/workers/common/src/main/kotlin/common/OrtServerMappings.kt +++ b/workers/common/src/main/kotlin/common/OrtServerMappings.kt @@ -378,24 +378,10 @@ fun RepositoryProvenance.mapToOrt() = OrtRepositoryProvenance(vcsInfo.mapToOrt() fun ScannerConfiguration.mapToOrt() = OrtScannerConfiguration( skipConcluded = skipConcluded, - archive = archive?.mapToOrt(), createMissingArchives = createMissingArchives, detectedLicenseMapping = detectedLicenseMappings, config = config.mapValues { it.value.mapToOrt() }, - storages = storages?.mapNotNull { (name, storage) -> - storage?.let { - name to when (it) { - is PostgresStorageConfiguration -> it.mapToOrt() - is ClearlyDefinedStorageConfiguration -> it.mapToOrt() - is FileBasedStorageConfiguration -> it.mapToOrt() - is Sw360StorageConfiguration -> it.mapToOrt() - } - } - }?.toMap(), - storageReaders = storageReaders, - storageWriters = storageWriters, - ignorePatterns = ignorePatterns, - provenanceStorage = provenanceStorage?.mapToOrt() + ignorePatterns = ignorePatterns ) fun ClearlyDefinedStorageConfiguration.mapToOrt() = OrtClearlyDefinedStorageConfiguration(serverUrl) diff --git a/workers/common/src/test/kotlin/OrtServerMappingsTest.kt b/workers/common/src/test/kotlin/OrtServerMappingsTest.kt index 5dde05670..db1ba9c17 100644 --- a/workers/common/src/test/kotlin/OrtServerMappingsTest.kt +++ b/workers/common/src/test/kotlin/OrtServerMappingsTest.kt @@ -81,13 +81,8 @@ import org.eclipse.apoapsis.ortserver.model.runs.repository.snippet.Provenance import org.eclipse.apoapsis.ortserver.model.runs.repository.snippet.SnippetChoice import org.eclipse.apoapsis.ortserver.model.runs.repository.snippet.SnippetChoiceReason import org.eclipse.apoapsis.ortserver.model.runs.scanner.ArtifactProvenance -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileArchiveConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileBasedStorageConfiguration -import org.eclipse.apoapsis.ortserver.model.runs.scanner.FileStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.LicenseFinding -import org.eclipse.apoapsis.ortserver.model.runs.scanner.LocalFileStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceResolutionResult -import org.eclipse.apoapsis.ortserver.model.runs.scanner.ProvenanceStorageConfiguration import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScanResult import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScanSummary import org.eclipse.apoapsis.ortserver.model.runs.scanner.ScannerConfiguration @@ -361,19 +356,8 @@ class OrtServerMappingsTest : WordSpec({ advisorRecords = mapOf(pkgIdentifier to listOf(advisorResult)) ) - val fileStorageConfiguration = FileStorageConfiguration( - localFileStorage = LocalFileStorageConfiguration( - directory = "/path/to/storage", - compression = true - ) - ) - val scannerConfiguration = ScannerConfiguration( skipConcluded = true, - archive = FileArchiveConfiguration( - enabled = true, - fileStorage = fileStorageConfiguration - ), createMissingArchives = true, detectedLicenseMappings = mapOf("license-1" to "spdx-license-1", "license-2" to "spdx-license-2"), config = mapOf( @@ -386,15 +370,7 @@ class OrtServerMappingsTest : WordSpec({ secrets = mapOf("secret-key-1" to "secret-value-1", "secret-key-2" to "secret-value-2") ) ), - storages = mapOf( - "local" to FileBasedStorageConfiguration(fileStorageConfiguration, "PROVENANCE_BASED") - ), - storageReaders = listOf("reader-1", "reader-2"), - storageWriters = listOf("writer-1", "writer-2"), - ignorePatterns = listOf("pattern-1", "pattern-2"), - provenanceStorage = ProvenanceStorageConfiguration( - fileStorage = fileStorageConfiguration - ) + ignorePatterns = listOf("pattern-1", "pattern-2") ) val packageCuration = PackageCuration( diff --git a/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt b/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt index 2e1900a46..c9286c9b0 100644 --- a/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt +++ b/workers/common/src/test/kotlin/common/OrtRunServiceTest.kt @@ -177,15 +177,10 @@ class OrtRunServiceTest : WordSpec({ ), config = ScannerConfiguration( skipConcluded = true, - archive = null, createMissingArchives = true, detectedLicenseMappings = mapOf("license-1" to "spdx-license-1"), config = emptyMap(), - storages = emptyMap(), - storageReaders = listOf("reader-1"), - storageWriters = listOf("writer-1"), - ignorePatterns = listOf("pattern-1"), - provenanceStorage = null + ignorePatterns = listOf("pattern-1") ), provenances = emptySet(), scanResults = emptySet(), @@ -508,15 +503,10 @@ class OrtRunServiceTest : WordSpec({ ), config = ScannerConfiguration( skipConcluded = true, - archive = null, createMissingArchives = true, detectedLicenseMappings = emptyMap(), - storages = emptyMap(), config = emptyMap(), - storageReaders = null, - storageWriters = null, - ignorePatterns = emptyList(), - provenanceStorage = null + ignorePatterns = emptyList() ), scanners = emptyMap() ) diff --git a/workers/common/src/testFixtures/kotlin/OrtTestData.kt b/workers/common/src/testFixtures/kotlin/OrtTestData.kt index 66d070474..fbd3176e6 100644 --- a/workers/common/src/testFixtures/kotlin/OrtTestData.kt +++ b/workers/common/src/testFixtures/kotlin/OrtTestData.kt @@ -65,8 +65,6 @@ import org.ossreviewtoolkit.model.config.AdvisorConfiguration import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.Curations import org.ossreviewtoolkit.model.config.Excludes -import org.ossreviewtoolkit.model.config.FileArchiverConfiguration -import org.ossreviewtoolkit.model.config.FileBasedStorageConfiguration import org.ossreviewtoolkit.model.config.FileStorageConfiguration import org.ossreviewtoolkit.model.config.IssueResolution import org.ossreviewtoolkit.model.config.IssueResolutionReason @@ -80,7 +78,6 @@ import org.ossreviewtoolkit.model.config.PackageManagerConfiguration import org.ossreviewtoolkit.model.config.PathExclude import org.ossreviewtoolkit.model.config.PathExcludeReason import org.ossreviewtoolkit.model.config.PluginConfiguration -import org.ossreviewtoolkit.model.config.ProvenanceStorageConfiguration import org.ossreviewtoolkit.model.config.RepositoryAnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.config.Resolutions @@ -90,7 +87,6 @@ import org.ossreviewtoolkit.model.config.ScannerConfiguration import org.ossreviewtoolkit.model.config.ScopeExclude import org.ossreviewtoolkit.model.config.ScopeExcludeReason import org.ossreviewtoolkit.model.config.SnippetChoices -import org.ossreviewtoolkit.model.config.StorageType import org.ossreviewtoolkit.model.config.VulnerabilityResolution import org.ossreviewtoolkit.model.config.VulnerabilityResolutionReason import org.ossreviewtoolkit.model.config.snippet.Choice @@ -481,10 +477,7 @@ object OrtTestData { val scannerConfiguration = ScannerConfiguration( skipConcluded = true, - archive = FileArchiverConfiguration( - enabled = true, - fileStorage = fileStorageConfiguration - ), + archive = null, createMissingArchives = true, detectedLicenseMapping = mapOf("license-1" to "spdx-license-1", "license-2" to "spdx-license-2"), config = mapOf( @@ -497,18 +490,11 @@ object OrtTestData { secrets = mapOf("secret-key-1" to "secret-value-1", "secret-key-2" to "secret-value-2") ) ), - storages = mapOf( - "local" to FileBasedStorageConfiguration( - backend = fileStorageConfiguration, - type = StorageType.PROVENANCE_BASED - ) - ), - storageReaders = listOf("reader-1", "reader-2"), - storageWriters = listOf("writer-1", "writer-2"), + storages = null, + storageReaders = null, + storageWriters = null, ignorePatterns = listOf("pattern-1", "pattern-2"), - provenanceStorage = ProvenanceStorageConfiguration( - fileStorage = fileStorageConfiguration - ) + provenanceStorage = null ) val artifactProvenance = ArtifactProvenance(pkgCuration.data.sourceArtifact!!)