-
Notifications
You must be signed in to change notification settings - Fork 314
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor!: Move config helpers from
model to new config-utils module
Move the `ConfigurationResolver` and related helper functions to a new `config-utils` module. This is preparation for being able to move the `PackageConfigurationProvider` and `PackageCurationProvider` to the respective API modules which is required for migrating them to the new plugin API. Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.com>
- Loading branch information
1 parent
d782466
commit 3c8b32a
Showing
15 changed files
with
110 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright (C) 2024 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * License-Filename: LICENSE | ||
| */ | ||
|
|
||
| plugins { | ||
| // Apply precompiled plugins. | ||
| id("ort-library-conventions") | ||
| } | ||
|
|
||
| dependencies { | ||
| api(projects.model) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright (C) 2023 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * License-Filename: LICENSE | ||
| */ | ||
|
|
||
| package org.ossreviewtoolkit.utils.config | ||
|
|
||
| import org.ossreviewtoolkit.model.OrtResult | ||
| import org.ossreviewtoolkit.model.utils.PackageConfigurationProvider | ||
| import org.ossreviewtoolkit.model.utils.PackageCurationProvider | ||
| import org.ossreviewtoolkit.model.utils.ResolutionProvider | ||
|
|
||
| /** | ||
| * Replace the package configurations in [OrtResult.resolvedConfiguration] with the ones obtained from | ||
| * [packageConfigurationProvider]. | ||
| */ | ||
| fun OrtResult.setPackageConfigurations(packageConfigurationProvider: PackageConfigurationProvider): OrtResult { | ||
| val packageConfigurations = ConfigurationResolver.resolvePackageConfigurations( | ||
| identifiers = getUncuratedPackages().mapTo(mutableSetOf()) { it.id }, | ||
| scanResultProvider = { id -> getScanResultsForId(id) }, | ||
| packageConfigurationProvider = packageConfigurationProvider | ||
| ) | ||
|
|
||
| return copy(resolvedConfiguration = resolvedConfiguration.copy(packageConfigurations = packageConfigurations)) | ||
| } | ||
|
|
||
| /** | ||
| * Replace the package curations in [OrtResult.resolvedConfiguration] with the ones obtained from | ||
| * [packageCurationProviders]. The [packageCurationProviders] must be ordered highest-priority-first. | ||
| */ | ||
| fun OrtResult.setPackageCurations(packageCurationProviders: List<Pair<String, PackageCurationProvider>>): OrtResult { | ||
| val packageCurations = | ||
| ConfigurationResolver.resolvePackageCurations(getUncuratedPackages(), packageCurationProviders) | ||
|
|
||
| return copy(resolvedConfiguration = resolvedConfiguration.copy(packageCurations = packageCurations)) | ||
| } | ||
|
|
||
| /** | ||
| * Replace the resolutions in [OrtResult.resolvedConfiguration] with the ones obtained from [resolutionProvider]. | ||
| */ | ||
| fun OrtResult.setResolutions(resolutionProvider: ResolutionProvider): OrtResult { | ||
| val resolutions = ConfigurationResolver.resolveResolutions( | ||
| issues = getIssues().values.flatten(), | ||
| ruleViolations = getRuleViolations(), | ||
| vulnerabilities = getVulnerabilities().values.flatten(), | ||
| resolutionProvider = resolutionProvider | ||
| ) | ||
|
|
||
| return copy(resolvedConfiguration = resolvedConfiguration.copy(resolutions = resolutions)) | ||
| } |