Preserve YAML inline comments through encrypt/edit roundtrip#2131
Merged
felixfontein merged 4 commits intoApr 17, 2026
Conversation
felixfontein
changed the title
felixfontein
reviewed
Apr 7, 2026
Contributor
felixfontein
left a comment
felixfontein
left a comment
There was a problem hiding this comment.
Please note that you need to sign-off your commit, otherwise this cannot be merged.
Add Inline flag to Comment struct, set during YAML parsing when a comment originates from a LineComment property. During write-back, inline comments are restored as LineComment on the correct node instead of being collapsed into HeadComment on the next node. Fixes getsops#2130 Signed-off-by: Kevin Nowald <kevin@nowald.dev>
Signed-off-by: Kevin Nowald <kevin@nowald.dev>
knowald
force-pushed
the
fix/yaml-inline-comment-roundtrip
branch
from
de8d425 to
2fd2adc
Compare
Signed-off-by: Kevin Nowald <kevin@nowald.dev>
Contributor
Author
Done, all commits are signed off now. Thanks for the heads up. |
felixfontein
approved these changes
Apr 14, 2026
Contributor
|
@knowald thanks for your contribution! |
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
May 11, 2026
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [getsops/sops](https://github.com/getsops/sops) | minor | `v3.12.2` → `v3.13.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>getsops/sops (getsops/sops)</summary> ### [`v3.13.0`](https://github.com/getsops/sops/releases/tag/v3.13.0) [Compare Source](getsops/sops@v3.12.2...v3.13.0) #### Installation To install `sops`, download one of the pre-built binaries provided for your platform from the artifacts attached to this release. For instance, if you are using Linux on an AMD64 architecture: ```shell # Download the binary curl -LO https://github.com/getsops/sops/releases/download/v3.13.0/sops-v3.13.0.linux.amd64 # Move the binary in to your PATH mv sops-v3.13.0.linux.amd64 /usr/local/bin/sops # Make the binary executable chmod +x /usr/local/bin/sops ``` ##### Verify checksums file signature The checksums file provided within the artifacts attached to this release is signed using [Cosign](https://docs.sigstore.dev/cosign/overview/) with GitHub OIDC. To validate the signature of this file, run the following commands: ```shell # Download the checksums file, certificate and signature curl -LO https://github.com/getsops/sops/releases/download/v3.13.0/sops-v3.13.0.checksums.txt curl -LO https://github.com/getsops/sops/releases/download/v3.13.0/sops-v3.13.0.checksums.sigstore.json # Verify the checksums file cosign verify-blob sops-v3.13.0.checksums.txt \ --bundle sops-v3.13.0.checksums.sigstore.json \ --certificate-identity-regexp=https://github.com/getsops \ --certificate-oidc-issuer=https://token.actions.githubusercontent.com ``` ##### Verify binary integrity To verify the integrity of the downloaded binary, you can utilize the checksums file after having validated its signature: ```shell # Verify the binary using the checksums file sha256sum -c sops-v3.13.0.checksums.txt --ignore-missing ``` ##### Verify artifact provenance The [SLSA provenance](https://slsa.dev/provenance/v0.2) of the binaries, packages, and SBOMs can be found within the artifacts associated with this release. It is presented through an [in-toto](https://in-toto.io/) link metadata file named `sops-v3.13.0.intoto.jsonl`. To verify the provenance of an artifact, you can utilize the [`slsa-verifier`](https://github.com/slsa-framework/slsa-verifier#artifacts) tool: ```shell # Download the metadata file curl -LO https://github.com/getsops/sops/releases/download/v3.13.0/sops-v3.13.0.intoto.jsonl # Verify the provenance of the artifact slsa-verifier verify-artifact <artifact> \ --provenance-path sops-v3.13.0.intoto.jsonl \ --source-uri github.com/getsops/sops \ --source-tag v3.13.0 ``` #### Container Images The `sops` binaries are also available as container images, based on Debian (slim) and Alpine Linux. The Debian-based container images include any dependencies which may be required to make use of certain key services, such as GnuPG, AWS KMS, Azure Key Vault, and Google Cloud KMS. The Alpine-based container images are smaller in size, but do not include these dependencies. These container images are available for the following architectures: `linux/amd64` and `linux/arm64`. ##### GitHub Container Registry - `ghcr.io/getsops/sops:v3.13.0` - `ghcr.io/getsops/sops:v3.13.0-alpine` ##### Quay.io - `quay.io/getsops/sops:v3.13.0` - `quay.io/getsops/sops:v3.13.0-alpine` ##### Verify container image signature The container images are signed using [Cosign](https://docs.sigstore.dev/cosign/overview/) with GitHub OIDC. To validate the signature of an image, run the following command: ```shell cosign verify ghcr.io/getsops/sops:v3.13.0 \ --certificate-identity-regexp=https://github.com/getsops \ --certificate-oidc-issuer=https://token.actions.githubusercontent.com \ -o text ``` ##### Verify container image provenance The container images include [SLSA provenance](https://slsa.dev/provenance/v0.2) attestations. For more information around the verification of this, please refer to the [`slsa-verifier` documentation](https://github.com/slsa-framework/slsa-verifier#containers). #### Software Bill of Materials The Software Bill of Materials (SBOM) for each binary is accessible within the artifacts enclosed with this release. It is presented as an [SPDX](https://spdx.dev/) JSON file, formatted as `<binary>.spdx.sbom.json`. #### What's Changed - build(deps): Bump google.golang.org/grpc from 1.79.1 to 1.79.3 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2110](getsops/sops#2110) - build(deps): Bump the ci group with 3 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2117](getsops/sops#2117) - build(deps): Bump the ci group with 3 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2126](getsops/sops#2126) - build(deps): Bump github.com/go-jose/go-jose/v4 from 4.1.3 to 4.1.4 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2133](getsops/sops#2133) - build(deps): Bump docker/login-action from 4.0.0 to 4.1.0 in the ci group by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2139](getsops/sops#2139) - Improve error message for top-level arrays by [@​kushal9897](https://github.com/kushal9897) in [#​2138](getsops/sops#2138) - build(deps): Bump github.com/aws/aws-sdk-go-v2/service/s3 from 1.96.0 to 1.97.3 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2142](getsops/sops#2142) - docs: add get key permission requirement for Azure Key Vault when version is omitted by [@​Hanashiko](https://github.com/Hanashiko) in [#​2122](getsops/sops#2122) - build(deps): Bump actions/upload-artifact from 7.0.0 to 7.0.1 in the ci group by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2149](getsops/sops#2149) - Use prefixed and truncated key hash instead of location as GPG agent cache key by [@​felixfontein](https://github.com/felixfontein) in [#​2145](getsops/sops#2145) - Drop support for Go 1.24 by [@​felixfontein](https://github.com/felixfontein) in [#​2141](getsops/sops#2141) - build(deps): Bump go.opentelemetry.io/otel/sdk from 1.40.0 to 1.43.0 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2146](getsops/sops#2146) - build(deps): Bump the go group across 1 directory with 21 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2144](getsops/sops#2144) - Add SOPS\_GCP\_KMS\_ENDPOINT and SOPS\_GCP\_KMS\_UNIVERSE\_DOMAIN env vars by [@​DnR-iData](https://github.com/DnR-iData) in [#​2114](getsops/sops#2114) - Preserve YAML inline comments through encrypt/edit roundtrip by [@​knowald](https://github.com/knowald) in [#​2131](getsops/sops#2131) - Update release for cosign v3 by [@​sabre1041](https://github.com/sabre1041) in [#​2082](getsops/sops#2082) - build(deps): Bump the ci group with 3 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2151](getsops/sops#2151) - build(deps): Bump the go group with 12 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2152](getsops/sops#2152) - Update broken link in README by [@​manute](https://github.com/manute) in [#​2153](getsops/sops#2153) - sops exec-file: make sure to set GID to correct value instead of UID by [@​felixfontein](https://github.com/felixfontein) in [#​2154](getsops/sops#2154) - sops exec-file: improve error handling, reject non-local paths in `--filename` by [@​felixfontein](https://github.com/felixfontein) in [#​2155](getsops/sops#2155) - Obtain `--indent` global flag value and pass it to store configs by [@​skirino](https://github.com/skirino) in [#​2156](getsops/sops#2156) - build(deps): Bump the go group with 3 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2159](getsops/sops#2159) - build(deps): Bump goreleaser/goreleaser-action from 7.1.0 to 7.2.1 in the ci group by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2158](getsops/sops#2158) - Update all Go dependencies with 'go get -t -u ./...' by [@​felixfontein](https://github.com/felixfontein) in [#​2165](getsops/sops#2165) - Allow to have space-separated keys in SOPS\_AGE\_KEY by [@​felixfontein](https://github.com/felixfontein) in [#​2086](getsops/sops#2086) - HC Vault: add allowlist support for acceptable HC Vault URLs by [@​felixfontein](https://github.com/felixfontein) in [#​2164](getsops/sops#2164) - build(deps): Bump the go group with 5 updates by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2171](getsops/sops#2171) - build(deps): Bump github/codeql-action from 4.35.2 to 4.35.3 in the ci group by [@​dependabot](https://github.com/dependabot)\[bot] in [#​2173](getsops/sops#2173) - Use mapstructure to (de-)serialize internal metadata; move metadata processing from specific stores to general place by [@​felixfontein](https://github.com/felixfontein) in [#​2120](getsops/sops#2120) - Release 3.13.0 by [@​felixfontein](https://github.com/felixfontein) in [#​2176](getsops/sops#2176) #### New Contributors - [@​kushal9897](https://github.com/kushal9897) made their first contribution in [#​2138](getsops/sops#2138) - [@​Hanashiko](https://github.com/Hanashiko) made their first contribution in [#​2122](getsops/sops#2122) - [@​DnR-iData](https://github.com/DnR-iData) made their first contribution in [#​2114](getsops/sops#2114) - [@​knowald](https://github.com/knowald) made their first contribution in [#​2131](getsops/sops#2131) - [@​manute](https://github.com/manute) made their first contribution in [#​2153](getsops/sops#2153) - [@​skirino](https://github.com/skirino) made their first contribution in [#​2156](getsops/sops#2156) **Full Changelog**: <getsops/sops@v3.12.2...v3.13.0> </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xNjkuNCIsInVwZGF0ZWRJblZlciI6IjQzLjE2OS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiLCJhdXRvbWF0aW9uOmJvdC1hdXRob3JlZCIsImRlcGVuZGVuY3ktdHlwZTo6bWlub3IiXX0=-->
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add Inline flag to Comment struct, set during YAML parsing when a comment originates from a LineComment property. During write-back, inline comments are restored as LineComment on the correct node instead of being collapsed into HeadComment on the next node.
Fixes #2130