Skip to content

fix: preserve YAML inline comments through encrypt/edit roundtrip - #1

Open
knowald wants to merge 35 commits into
mainfrom
fix/yaml-inline-comment-roundtrip
Open

fix: preserve YAML inline comments through encrypt/edit roundtrip#1
knowald wants to merge 35 commits into
mainfrom
fix/yaml-inline-comment-roundtrip

Conversation

@knowald

@knowald knowald commented Apr 1, 2026

Copy link
Copy Markdown
Owner

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

DnR-iData and others added 14 commits March 20, 2026 10:49
@DnR-iData
feat(gcpkms): add SOPS_GCP_KMS_ENDPOINT and SOPS_GCP_KMS_UNIVERSE_DOM…
fc89e01 
…AIN env vars

Allow overriding the GCP KMS endpoint and universe domain via environment
variables. This enables use of sovereign cloud environments that expose a
GCP-compatible KMS API at a non-standard endpoint (e.g. S3NS/Thales TPC
with cloudkms.s3nsapis.fr).

Signed-off-by: David RIBEIRO <dr@devops.works>
@DnR-iData
Merge branch 'main' into feat/gcpkms-sovereign-cloud-endpoint
6aeb1d3
@DnR-iData
fix(gcpkms): address review comments on sovereign cloud KMS support
fd62dc3 
- Use else if to make SOPS_GCP_KMS_ENDPOINT precedence over
  SOPS_GCP_KMS_UNIVERSE_DOMAIN explicit in code
- Use RST note directive in README.rst
- Verify env var options are applied by asserting on
  client.Connection().Target() in tests

Signed-off-by: David RIBEIRO <dr@devops.works>
@DnR-iData
Merge branch 'main' into feat/gcpkms-sovereign-cloud-endpoint
b05e745
@dependabot
build(deps): Bump github.com/go-jose/go-jose/v4 from 4.1.3 to 4.1.4
3385fd1 
Bumps [github.com/go-jose/go-jose/v4](https://github.com/go-jose/go-jose) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/go-jose/go-jose/releases)
- [Commits](go-jose/go-jose@v4.1.3...v4.1.4)

---
updated-dependencies:
- dependency-name: github.com/go-jose/go-jose/v4
  dependency-version: 4.1.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@felixfontein
Merge pull request getsops#2133 from getsops/dependabot/go_modules/gi…
44985cc 
…thub.com/go-jose/go-jose/v4-4.1.4

build(deps): Bump github.com/go-jose/go-jose/v4 from 4.1.3 to 4.1.4
@kushal9897
fix(json): improve error message for top-level arrays (fixes getsops…
06ed2f8 
…#1974)

Signed-off-by: Kushal Agrawal <153362678+kushal9897@users.noreply.github.com>
@dependabot
build(deps): Bump docker/login-action in the ci group
4e95416 
Bumps the ci group with 1 update: [docker/login-action](https://github.com/docker/login-action).


Updates `docker/login-action` from 4.0.0 to 4.1.0
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@b45d80f...4907a6d)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
@felixfontein
Merge pull request getsops#2139 from getsops/dependabot/github_action…
649bda9 
…s/ci-cb5fd4910d

build(deps): Bump docker/login-action from 4.0.0 to 4.1.0 in the ci group
@kushal9897
Merge branch 'main' into fix/json-array-error-message
cdae5fa
@kushal9897
docs: move JSON top-level array note to appropriate section
7ec9470 
Signed-off-by: Kushal Agrawal <153362678+kushal9897@users.noreply.github.com>
@felixfontein
Merge pull request getsops#2138 from kushal9897/fix/json-array-error-…
f082bec 
…message

Improve error message for top-level arrays
@knowald
fix: preserve YAML inline comments through encrypt/edit roundtrip
42f75be 
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>
@knowald
test: add nested inline comment roundtrip test
2fd2adc 
Signed-off-by: Kevin Nowald <kevin@nowald.dev>
@knowald
knowald force-pushed the fix/yaml-inline-comment-roundtrip branch from de8d425 to 2fd2adc Compare April 7, 2026 15:42
knowald and others added 15 commits April 7, 2026 17:54
@knowald
fix: preserve trailing inline comments in YAML emit when no items follow
eddc3ca 
Signed-off-by: Kevin Nowald <kevin@nowald.dev>
@dependabot
build(deps): Bump github.com/aws/aws-sdk-go-v2/service/s3
004424b 
Bumps [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2) from 1.96.0 to 1.97.3.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/s3/v1.96.0...service/s3/v1.97.3)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/service/s3
  dependency-version: 1.97.3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@felixfontein
Merge pull request getsops#2142 from getsops/dependabot/go_modules/gi…
619e477 
…thub.com/aws/aws-sdk-go-v2/service/s3-1.97.3

build(deps): Bump github.com/aws/aws-sdk-go-v2/service/s3 from 1.96.0 to 1.97.3
@Hanashiko
docs: add get key permission requirement for Azure Key Vault when ver…
b1a1e34 
…sion is omitted

Signed-off-by: Hanashiko <hlichisper@gmail.com>
@felixfontein
Add newline.
fc82485 
Signed-off-by: Felix Fontein <felix@fontein.de>
@felixfontein
Merge branch 'main' into main
7fb2601
@felixfontein
Merge pull request getsops#2122 from Hanashiko/main
f11139e 
docs: add get key permission requirement for Azure Key Vault when version is omitted
@DnR-iData
Merge branch 'main' into feat/gcpkms-sovereign-cloud-endpoint
8047d28
@dependabot
build(deps): Bump actions/upload-artifact in the ci group
3d85044 
Bumps the ci group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@bbbca2d...043fb46)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
@felixfontein
Merge pull request getsops#2149 from getsops/dependabot/github_action…
1d35dfc 
…s/ci-4684ddd577

build(deps): Bump actions/upload-artifact from 7.0.0 to 7.0.1 in the ci group
@felixfontein
Use prefixed and truncated key hash instead of location as GPG agent …
1ff1d5f 
…cache key.

Signed-off-by: Felix Fontein <felix@fontein.de>
@felixfontein
Merge pull request getsops#2145 from felixfontein/age-gpgagent-2
ecec2aa 
Use prefixed and truncated key hash instead of location as GPG agent cache key
@felixfontein
Drop support for Go 1.24.
bcb8df2 
Signed-off-by: Felix Fontein <felix@fontein.de>
@felixfontein
Merge pull request getsops#2141 from felixfontein/drop-go24
a64209f 
Drop support for Go 1.24
@dependabot
build(deps): Bump go.opentelemetry.io/otel/sdk from 1.40.0 to 1.43.0
8cc7126 
Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.40.0 to 1.43.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-go@v1.40.0...v1.43.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-version: 1.43.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
felixfontein and others added 6 commits April 16, 2026 22:20
@felixfontein
Merge pull request getsops#2146 from getsops/dependabot/go_modules/go…
702eee9 
….opentelemetry.io/otel/sdk-1.43.0

build(deps): Bump go.opentelemetry.io/otel/sdk from 1.40.0 to 1.43.0
@dependabot
build(deps): Bump the go group across 1 directory with 21 updates
309ee29 
Bumps the go group with 11 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [cloud.google.com/go/kms](https://github.com/googleapis/google-cloud-go) | `1.26.0` | `1.27.0` |
| [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) | `1.60.0` | `1.62.0` |
| [github.com/ProtonMail/go-crypto](https://github.com/ProtonMail/go-crypto) | `1.3.0` | `1.4.1` |
| [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.32.9` | `1.32.14` |
| [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2) | `1.22.2` | `1.22.13` |
| [github.com/aws/aws-sdk-go-v2/service/kms](https://github.com/aws/aws-sdk-go-v2) | `1.50.0` | `1.50.4` |
| [github.com/fatih/color](https://github.com/fatih/color) | `1.18.0` | `1.19.0` |
| [github.com/hashicorp/vault/api](https://github.com/hashicorp/vault) | `1.22.0` | `1.23.0` |
| [github.com/huaweicloud/huaweicloud-sdk-go-v3](https://github.com/huaweicloud/huaweicloud-sdk-go-v3) | `0.1.187` | `0.1.191` |
| [github.com/lib/pq](https://github.com/lib/pq) | `1.11.2` | `1.12.3` |
| [google.golang.org/grpc](https://github.com/grpc/grpc-go) | `1.79.3` | `1.80.0` |



Updates `cloud.google.com/go/kms` from 1.26.0 to 1.27.0
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md)
- [Commits](googleapis/google-cloud-go@kms/v1.26.0...dlp/v1.27.0)

Updates `cloud.google.com/go/storage` from 1.60.0 to 1.62.0
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@spanner/v1.60.0...spanner/v1.62.0)

Updates `github.com/ProtonMail/go-crypto` from 1.3.0 to 1.4.1
- [Release notes](https://github.com/ProtonMail/go-crypto/releases)
- [Commits](ProtonMail/go-crypto@v1.3.0...v1.4.1)

Updates `github.com/aws/aws-sdk-go-v2/config` from 1.32.9 to 1.32.14
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.32.9...config/v1.32.14)

Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.19.9 to 1.19.14
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/m2/v1.19.9...credentials/v1.19.14)

Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.22.2 to 1.22.13
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@v1.22.2...service/signer/v1.22.13)

Updates `github.com/aws/aws-sdk-go-v2/service/kms` from 1.50.0 to 1.50.4
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/s3/v1.50.0...service/ssm/v1.50.4)

Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.97.3 to 1.99.0
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/s3/v1.97.3...service/s3/v1.99.0)

Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.41.6 to 1.41.10
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/sts/v1.41.6...service/ecs/v1.41.10)

Updates `github.com/fatih/color` from 1.18.0 to 1.19.0
- [Release notes](https://github.com/fatih/color/releases)
- [Commits](fatih/color@v1.18.0...v1.19.0)

Updates `github.com/hashicorp/vault/api` from 1.22.0 to 1.23.0
- [Release notes](https://github.com/hashicorp/vault/releases)
- [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG-v1.10-v1.15.md)
- [Commits](hashicorp/vault@api/v1.22.0...api/v1.23.0)

Updates `github.com/huaweicloud/huaweicloud-sdk-go-v3` from 0.1.187 to 0.1.191
- [Release notes](https://github.com/huaweicloud/huaweicloud-sdk-go-v3/releases)
- [Changelog](https://github.com/huaweicloud/huaweicloud-sdk-go-v3/blob/master/CHANGELOG.md)
- [Commits](huaweicloud/huaweicloud-sdk-go-v3@v0.1.187...v0.1.191)

Updates `github.com/lib/pq` from 1.11.2 to 1.12.3
- [Release notes](https://github.com/lib/pq/releases)
- [Changelog](https://github.com/lib/pq/blob/master/CHANGELOG.md)
- [Commits](lib/pq@v1.11.2...v1.12.3)

Updates `golang.org/x/crypto` from 0.48.0 to 0.49.0
- [Commits](golang/crypto@v0.48.0...v0.49.0)

Updates `golang.org/x/net` from 0.50.0 to 0.52.0
- [Commits](golang/net@v0.50.0...v0.52.0)

Updates `golang.org/x/oauth2` from 0.35.0 to 0.36.0
- [Commits](golang/oauth2@v0.35.0...v0.36.0)

Updates `golang.org/x/sys` from 0.41.0 to 0.42.0
- [Commits](golang/sys@v0.41.0...v0.42.0)

Updates `golang.org/x/term` from 0.40.0 to 0.41.0
- [Commits](golang/term@v0.40.0...v0.41.0)

Updates `google.golang.org/api` from 0.267.0 to 0.273.1
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.267.0...v0.273.1)

Updates `google.golang.org/genproto/googleapis/rpc` from 0.0.0-20260203192932-546029d2fa20 to 0.0.0-20260401001100-f93e5f3e9f0f
- [Commits](https://github.com/googleapis/go-genproto/commits)

Updates `google.golang.org/grpc` from 1.79.3 to 1.80.0
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.79.3...v1.80.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/kms
  dependency-version: 1.27.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: cloud.google.com/go/storage
  dependency-version: 1.62.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/ProtonMail/go-crypto
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-version: 1.32.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/credentials
  dependency-version: 1.19.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager
  dependency-version: 1.22.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/kms
  dependency-version: 1.50.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/s3
  dependency-version: 1.99.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/sts
  dependency-version: 1.41.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/fatih/color
  dependency-version: 1.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/hashicorp/vault/api
  dependency-version: 1.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/huaweicloud/huaweicloud-sdk-go-v3
  dependency-version: 0.1.191
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/lib/pq
  dependency-version: 1.12.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/crypto
  dependency-version: 0.49.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/net
  dependency-version: 0.52.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/oauth2
  dependency-version: 0.36.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/sys
  dependency-version: 0.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/term
  dependency-version: 0.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: google.golang.org/api
  dependency-version: 0.273.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: google.golang.org/genproto/googleapis/rpc
  dependency-version: 0.0.0-20260401001100-f93e5f3e9f0f
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: google.golang.org/grpc
  dependency-version: 1.80.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
@felixfontein
Merge pull request getsops#2144 from getsops/dependabot/go_modules/go…
a5a8706 
…-f931dca820

build(deps): Bump the go group across 1 directory with 21 updates
@DnR-iData
Merge branch 'main' into feat/gcpkms-sovereign-cloud-endpoint
306d98d
@felixfontein
Merge pull request getsops#2114 from Tiime-Software/feat/gcpkms-sover…
b4107fe 
…eign-cloud-endpoint

Add SOPS_GCP_KMS_ENDPOINT and SOPS_GCP_KMS_UNIVERSE_DOMAIN env vars
@felixfontein
Merge branch 'main' into fix/yaml-inline-comment-roundtrip
d85d6d3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

YAML store converts inline comments to preceding-line comments on encrypt/edit roundtrip

5 participants

@knowald @DnR-iData @felixfontein @kushal9897 @Hanashiko