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 duplicate shorthand relationships for opposite case #220

Merged
merged 1 commit into from Jun 6, 2023

Conversation

lumjjb
Copy link
Collaborator

@lumjjb lumjjb commented Jun 6, 2023

Really fix #208 :). We forgot to check for the opposite relationships (e.g. CONTAINS_BY and CONTAINED_BY are both considered the same and a new CONTAINS relationship shouldn't be added by shorthand field)

Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Copy link
Collaborator

@kzantow kzantow left a comment

Choose a reason for hiding this comment

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

LGTM

@lumjjb lumjjb merged commit e861b35 into main Jun 6, 2023
5 checks passed
another-rex pushed a commit to google/osv-scanner that referenced this pull request Jun 14, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/BurntSushi/toml](https://togithub.com/BurntSushi/toml) |
require | patch | `v1.3.0` -> `v1.3.2` |
| [github.com/spdx/tools-golang](https://togithub.com/spdx/tools-golang)
| require | patch | `v0.5.1` -> `v0.5.2` |
| [github.com/urfave/cli/v2](https://togithub.com/urfave/cli) | require
| patch | `v2.25.5` -> `v2.25.6` |
| golang.org/x/mod | require | minor | `v0.10.0` -> `v0.11.0` |
| golang.org/x/sync | require | minor | `v0.2.0` -> `v0.3.0` |
| golang.org/x/term | require | minor | `v0.8.0` -> `v0.9.0` |

---

### Release Notes

<details>
<summary>BurntSushi/toml</summary>

### [`v1.3.2`](https://togithub.com/BurntSushi/toml/releases/tag/v1.3.2)

[Compare
Source](https://togithub.com/BurntSushi/toml/compare/v1.3.1...v1.3.2)

Fix reading `BURNTSUSHI_TOML_110` again 😅 The fix for 1.3.1 caused a
race issue with multiple decodes being run in parallel.

### [`v1.3.1`](https://togithub.com/BurntSushi/toml/releases/tag/v1.3.1)

[Compare
Source](https://togithub.com/BurntSushi/toml/compare/v1.3.0...v1.3.1)

This fixes two small bugs:

- The `BURNTSUSHI_TOML_110` environment variable would be checked on
package import, rather than Decode().

This meant that setting `os.Setenv("BURNTSUSHI_TOML_110", "")` had no
effect, as it happens after the import.

- Fix order of `Meta.Keys()` for inline tables (this has been an issue
since support for inline tables was added).

</details>

<details>
<summary>spdx/tools-golang</summary>

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

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

#### What's Changed

- fix duplicate shorthand relationships for opposite case by
[@&#8203;lumjjb](https://togithub.com/lumjjb) in
[spdx/tools-golang#220

**Full Changelog**:
spdx/tools-golang@v0.5.1...v0.5.2

</details>

<details>
<summary>urfave/cli</summary>

### [`v2.25.6`](https://togithub.com/urfave/cli/releases/tag/v2.25.6)

[Compare
Source](https://togithub.com/urfave/cli/compare/v2.25.5...v2.25.6)

##### What's Changed

- Fix:(issue\_1668) Add test case for sub command of sub command
completion by [@&#8203;dearchap](https://togithub.com/dearchap) in
[urfave/cli#1747
- Update dependencies for v2 by
[@&#8203;meatballhat](https://togithub.com/meatballhat) in
[urfave/cli#1749
- Document slice flags as part of examples (v2) by
[@&#8203;carhartl](https://togithub.com/carhartl) in
[urfave/cli#1751

**Full Changelog**:
urfave/cli@v2.25.5...v2.25.6

</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://app.renovatebot.com/dashboard#github/google/osv-scanner).

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

Check for duplicates when unmarshaling shortcut fields
2 participants