feat(reporter)!: Support secrets in reporter options #7837
Merged
Conversation
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
oheger-bosch
force-pushed
the
oheger-bosch/reporter/secrets_for_reporter_plugins
branch
from
b56897b to
a8727df
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7837 +/- ##
============================================
- Coverage 67.24% 67.05% -0.19%
+ Complexity 2044 2042 -2
============================================
Files 356 356
Lines 17050 17043 -7
Branches 2439 2444 +5
============================================
- Hits 11465 11429 -36
- Misses 4567 4594 +27
- Partials 1018 1020 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
sschuberth
requested changes
Nov 9, 2023
There was a problem hiding this comment.
Basically LGTM, but I'd also like @mnonnenmacher's opinion.
plugins/reporters/cyclonedx/src/funTest/kotlin/CycloneDxReporterFunTest.kt
Outdated
Show resolved
Hide resolved
plugins/reporters/evaluated-model/src/main/kotlin/EvaluatedModelReporter.kt
Outdated
Show resolved
Hide resolved
Some reporter implementations need access to secrets. Therefore, align the `ReporterConfiguration` class with the configuration classes for Advisor and Scanner which use `PluginConfiguration` to distinguish between plain options and secrets. Signed-off-by: Oliver Heger <[email protected]>
oheger-bosch
force-pushed
the
oheger-bosch/reporter/secrets_for_reporter_plugins
branch
from
a8727df to
d87ac7e
Compare
sschuberth
reviewed
Nov 10, 2023
| @@ -50,6 +50,7 @@ import org.ossreviewtoolkit.model.PackageCuration | |||
| import org.ossreviewtoolkit.model.Severity | |||
| import org.ossreviewtoolkit.model.config.CopyrightGarbage | |||
| import org.ossreviewtoolkit.model.config.NotifierConfiguration | |||
| import org.ossreviewtoolkit.model.config.PluginConfiguration | |||
There was a problem hiding this comment.
This commit should refer to / auto-close #7833?
There was a problem hiding this comment.
Did this for the 2nd commit.
In FossIdReporter, read the FossID user and API key from the secrets of the `PluginConfiguration` rather than from the plain options. Fixes oss-review-toolkit#7833. Signed-off-by: Oliver Heger <[email protected]>
oheger-bosch
force-pushed
the
oheger-bosch/reporter/secrets_for_reporter_plugins
branch
from
d87ac7e to
84990c7
Compare
sschuberth
approved these changes
Nov 10, 2023
oheger-bosch
deleted the
oheger-bosch/reporter/secrets_for_reporter_plugins
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some reporter implementations need access to secrets. Therefore, align the
ReporterConfigurationclass with the configuration classes for Advisor and Scanner which usePluginConfigurationto distinguish between plain options and secrets.