Skip to content

Allow decoding of anchorectl json files #3973

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

Merged
merged 6 commits into from
Jun 10, 2025
Merged

Allow decoding of anchorectl json files #3973

merged 6 commits into from
Jun 10, 2025

Conversation

wagoodman
Copy link
Contributor

Anchore enterprise has supported in the past one more additional FileMetadataEntry data shape, however, the syft json decoders do not support this shape. This adjusts the unmarshalers to account for this case.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • I have added unit tests that cover changed behavior
  • I have tested my code in common scenarios and confirmed there are no regressions
  • I have added comments to my code, particularly in hard-to-understand sections

@wagoodman wagoodman added the bug Something isn't working label Jun 6, 2025
@wagoodman wagoodman self-assigned this Jun 6, 2025
kzantow
kzantow previously approved these changes Jun 6, 2025
@wagoodman wagoodman enabled auto-merge (squash) June 9, 2025 15:15
@wagoodman wagoodman disabled auto-merge June 9, 2025 15:15
@wagoodman
Copy link
Contributor Author

We found a couple more differences this morning, I'll be adding those cases to this PR later today

@wagoodman wagoodman marked this pull request as draft June 9, 2025 15:16
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman force-pushed the decode-import-sbom branch from e77a1d6 to a7fe0f0 Compare June 10, 2025 16:53
@wagoodman wagoodman dismissed kzantow’s stale review June 10, 2025 16:54

enough changes have been made to warrant a re-review

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman changed the title Allow decoding of import SBOM file shape Allow decoding of anchorectl json files Jun 10, 2025
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman marked this pull request as ready for review June 10, 2025 18:18
@wagoodman wagoodman enabled auto-merge (squash) June 10, 2025 18:18
Copy link
Contributor

@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 👍

@wagoodman wagoodman merged commit 79b6d5d into main Jun 10, 2025
12 checks passed
@wagoodman wagoodman deleted the decode-import-sbom branch June 10, 2025 19:03
spiffcs added a commit that referenced this pull request Jun 30, 2025
* main:
  chore(deps): update CPE dictionary index (#4021)
  chore(deps): update tools to latest versions (#4016)
  chore(deps): update tools to latest versions (#4012)
  chore(deps): bump github.com/go-viper/mapstructure/v2 (#4014)
  chore(deps): bump sigstore/cosign-installer from 3.8.2 to 3.9.0 (#4015)
  chore(deps): update CPE dictionary index (#4007)
  chore(deps): bump anchore/sbom-action from 0.20.0 to 0.20.1 (#4008)
  chore(deps): bump github.com/google/go-containerregistry (#4009)
  chore(deps): update tools to latest versions (#3992)
  chore(deps): bump github/codeql-action from 3.28.19 to 3.29.0 (#4000)
  fix: provide separate nonroot image (#3998)
  account for non-import shapes (#3997)
  Allow decoding of anchorectl json files (#3973)
  chore(deps): bump github.com/anchore/stereoscope (#3991)

Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants