Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Black Duck: Support origin-id queries using the "conan" namespace #9826

Merged
merged 3 commits into from
Jan 24, 2025

Conversation

fviernau
Copy link
Member

See individual commits.

Part of #8739.

@fviernau fviernau requested a review from a team as a code owner January 24, 2025 11:11
@@ -1,4 +1,46 @@
{
"componentsViewsForExternalId": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit message: "lacks an entry" (as you refer to plural "forges")

@@ -58,3 +58,8 @@ internal data class BlackDuckOriginId(
}
}
}

// A replacement for `Forge.getKnownForges()`, because the latter does not contain entries for all forges.
private val KNOWN_FORGES = Forge.getKnownForges() + listOf(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively:

 private val KNOWN_FORGES = Forge.getKnownForges() + Forge(":", "conan").let { it.name to it }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll need to add another forge to that list (in a following PR). So, I'd prefer to keep this a list for easy extension.

@fviernau fviernau force-pushed the black-duck-conan-namespace-workaround branch from 210e6c4 to a9500e5 Compare January 24, 2025 11:17
This is fix-up for ae2ae6e.

Signed-off-by: Frank Viernau <[email protected]>
@fviernau fviernau force-pushed the black-duck-conan-namespace-workaround branch from a9500e5 to 8f1cf23 Compare January 24, 2025 11:19
@fviernau fviernau requested a review from sschuberth January 24, 2025 11:19
The known forges, `Forge.getKnowForges()`, defined in
`bdio-integration` lack an entry for the "conan" forge. Fix this with a
work around, see also [1].

[1]: blackducksoftware/integration-bdio#40

Signed-off-by: Frank Viernau <[email protected]>
@fviernau fviernau force-pushed the black-duck-conan-namespace-workaround branch from 8f1cf23 to 3cfb144 Compare January 24, 2025 11:21
@fviernau fviernau enabled auto-merge (rebase) January 24, 2025 11:32
Copy link

codecov bot commented Jan 24, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.08%. Comparing base (ad34316) to head (3cfb144).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #9826   +/-   ##
=========================================
  Coverage     68.08%   68.08%           
  Complexity     1286     1286           
=========================================
  Files           249      249           
  Lines          8829     8829           
  Branches        918      918           
=========================================
  Hits           6011     6011           
  Misses         2432     2432           
  Partials        386      386           
Flag Coverage Δ
funTest-docker 65.01% <ø> (ø)
funTest-non-docker 33.35% <ø> (ø)
test-ubuntu-24.04 35.85% <ø> (ø)
test-windows-2022 35.83% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fviernau fviernau merged commit 72662ff into main Jan 24, 2025
26 checks passed
@fviernau fviernau deleted the black-duck-conan-namespace-workaround branch January 24, 2025 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants