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

fix(2.2 json): remove emtpy packageVerificationCode #223

Merged

Conversation

kzantow
Copy link
Collaborator

@kzantow kzantow commented Sep 21, 2023

In SPDX 2.2, the packageVerificationCode element is optional, but the Go struct does not allow this to be omitted. This was corrected by changing the type to a pointer in SPDX 2.3, but still is an issue in SPDX 2.2. In the case filesAnalyzed is false, it is required to omit this field. This PR implements a simple method to remove emtpy packageVerificationCode entries in SPDX 2.2, specifically.

spdx/v2/v2_2/package.go Outdated Show resolved Hide resolved
@kzantow kzantow force-pushed the fix/omit-empty-package-verification-code-2-2 branch from 6d25b5b to 1eeb39c Compare February 28, 2024 19:35
spdx/v2/v2_2/package.go Outdated Show resolved Hide resolved
spdx/v2/v2_2/json/empty_values_test.go Outdated Show resolved Hide resolved
Signed-off-by: Keith Zantow <[email protected]>
Copy link

@willmurphyscode willmurphyscode left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for finding a specific link to the spec @kzantow

@kzantow kzantow merged commit aa7bfad into spdx:main Apr 16, 2024
3 checks passed
@kzantow kzantow deleted the fix/omit-empty-package-verification-code-2-2 branch April 16, 2024 16:03
cuixq referenced this pull request in google/osv-scanner Apr 17, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change | Age | Adoption | Passing |
Confidence |
|---|---|---|---|---|---|---|---|
| [deps.dev/api/v3](https://togithub.com/google/deps.dev) | require |
digest | `2c48bd5` -> `f6f382d` | | | | |
| [deps.dev/util/maven](https://togithub.com/google/deps.dev) | require
| digest | `2c48bd5` -> `f6f382d` | | | | |
| [deps.dev/util/resolve](https://togithub.com/google/deps.dev) |
require | digest | `2c48bd5` -> `f6f382d` | | | | |
| [deps.dev/util/semver](https://togithub.com/google/deps.dev) | require
| digest | `2c48bd5` -> `f6f382d` | | | | |
| [github.com/spdx/tools-golang](https://togithub.com/spdx/tools-golang)
| require | patch | `v0.5.3` -> `v0.5.4` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fspdx%2ftools-golang/v0.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fspdx%2ftools-golang/v0.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fspdx%2ftools-golang/v0.5.3/v0.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fspdx%2ftools-golang/v0.5.3/v0.5.4?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
| golang.org/x/exp | require | digest | `93d18d7` -> `fe59bbe` | | | | |

---

### Release Notes

<details>
<summary>spdx/tools-golang (github.com/spdx/tools-golang)</summary>

###
[`v0.5.4`](https://togithub.com/spdx/tools-golang/releases/tag/v0.5.4)

[Compare
Source](https://togithub.com/spdx/tools-golang/compare/v0.5.3...v0.5.4)

##### What's Changed

- Stop escaping HTML by [@&#8203;kzantow](https://togithub.com/kzantow)
in
[https://github.com/spdx/tools-golang/pull/224](https://togithub.com/spdx/tools-golang/pull/224)
- Don't create empty `ExcludedFiles` array by
[@&#8203;DmitriyLewen](https://togithub.com/DmitriyLewen) in
[https://github.com/spdx/tools-golang/pull/230](https://togithub.com/spdx/tools-golang/pull/230)
- Add external reference category `OTHER` by
[@&#8203;mcombuechen](https://togithub.com/mcombuechen) in
[https://github.com/spdx/tools-golang/pull/229](https://togithub.com/spdx/tools-golang/pull/229)
- Remove empty packageVerificationCode in 2.2 JSON by
[@&#8203;kzantow](https://togithub.com/kzantow) in
[https://github.com/spdx/tools-golang/pull/223](https://togithub.com/spdx/tools-golang/pull/223)

##### New Contributors

- [@&#8203;mcombuechen](https://togithub.com/mcombuechen) made their
first contribution in
[https://github.com/spdx/tools-golang/pull/229](https://togithub.com/spdx/tools-golang/pull/229)

**Full Changelog**:
spdx/tools-golang@v0.5.3...v0.5.4

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 6am on monday" in timezone
Australia/Sydney, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/google/osv-scanner).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjMwMS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->
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.

3 participants