refactor: remove yq dependency #386
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thesayyn
commented
Oct 4, 2023
thesayyn
commented
Oct 4, 2023
|
bazel-lib 2.0 is out: https://github.com/aspect-build/bazel-lib/releases/tag/v2.0.0 |
thesayyn
commented
Nov 21, 2023
|
Hey all, Is this PR ready to be merged ?. Thanks. |
|
This is now ready to land in 2.x |
alexeagle
approved these changes
Apr 25, 2024
thesayyn
added a commit
that referenced
this pull request
May 30, 2024
seh
reviewed
Jun 20, 2024
| local platform=$("${JQ}" -c '{"os": .os, "architecture": .architecture, "variant": .variant, "os.version": .["os.version"], "os.features": .["os.features"]} | with_entries(select( .value != null ))' "${image_path}/blobs/${config_blob_path}") | ||
| "${JQ}" --argjson platform "${platform}" \ | ||
| --argjson manifest "${manifest}" \ | ||
| '.manifests |= [$manifest + {"platform": $platform}]'\ |
There was a problem hiding this comment.
Per discussion in the "docker" channel of the "Bazel" Slack workspace, this attempt to append to the "manifests" field doesn't work as intended.
Instead, I think we need the following, as suggested in jq's documentation on Complex assignments:
'.manifests |= . + [$manifest + {"platform": $platform}]'\There was a problem hiding this comment.
Please see #633 for a proposed correction.
seh
added a commit
to seh/rules_oci
that referenced
this pull request
Jun 20, 2024
In the recent bazel-contrib#386, when we replaced use of the "yq" tool with the "jq" tool, we translated the "oci_image_index" rule's accumulation of image manifests incorrectly, such that we lose all but the last index that we add to the index. In "jq", the "update-assignment" operator (|=) does not append to an array supplied as its left-hand context value automatically. Instead, one must use a "complex assignment", mentioning the context value explicitly together with the addition operator.
seh
added a commit
to seh/rules_oci
that referenced
this pull request
Jun 20, 2024
In the recent bazel-contrib#386, when we replaced use of the "yq" tool with the "jq" tool, we translated the "oci_image_index" rule's accumulation of image manifests incorrectly, such that we lose all but the last index that we add to the index. In "jq", the "update-assignment" operator (|=) does not append to an array supplied as its left-hand context value automatically. Instead, one must use a "complex assignment", mentioning the context value explicitly together with the addition operator.
seh
added a commit
to seh/rules_oci
that referenced
this pull request
Jun 25, 2024
In the recent bazel-contrib#386, when we replaced use of the "yq" tool with the "jq" tool, we translated the "oci_image_index" rule's accumulation of image manifests incorrectly, such that we lose all but the last index that we add to the index. In "jq", the "update-assignment" operator (|=) does not append to an array supplied as its left-hand context value automatically. Instead, one must use a "complex assignment", mentioning the context value explicitly together with the addition operator.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #384. blocked on bazel-lib 2.0