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

Remove internal string set #2219

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Remove internal string set #2219

merged 4 commits into from
Oct 17, 2023

Conversation

wagoodman
Copy link
Contributor

@wagoodman wagoodman commented Oct 11, 2023

Removes the internal.StringSet, most notably from the exported pkg.License struct as well (for URLs, which has been converted into a []string).

While debugging test failures caused by the replacement I swapped assert.Equal entries for non-trivial comparisons for the superior cmp.Diff utility to get a better sense of the cause of the failures.

Closes #2209

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman marked this pull request as ready for review October 11, 2023 19:42
@wagoodman wagoodman requested a review from a team October 11, 2023 19:43
@wagoodman
Copy link
Contributor Author

Note: needs to be updated to incorporate changes from #2227 before merging

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
syft/pkg/cataloger/golang/licenses.go Show resolved Hide resolved
syft/pkg/license.go Show resolved Hide resolved
syft/pkg/license.go Show resolved Hide resolved
syft/pkg/license_test.go Show resolved Hide resolved
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman merged commit 7018573 into main Oct 17, 2023
9 checks passed
@wagoodman wagoodman deleted the remove-internal-set branch October 17, 2023 16:52
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* remove internal string set

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* incorporate changes from anchore#2227

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* beef up the pkg.License.Merg() doc string

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
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.

Remove internal.StringSet
3 participants