getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity
1,458 Commits 6 Branches 42 Tags
v3.8.1
Commit Graph

1458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hidde Beydals
b6d3c9700d Merge pull request #1324 from getsops/prep-v3.8.1 
Release v3.8.1
v3.8.1 		2023-10-11 16:58:48 +02:00
Hidde Beydals
6ebee6bcd9 Release v3.8.1 
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
 2023-10-11 09:38:04 +02:00
Hidde Beydals
2c1679e0a4 Merge pull request #1325 from getsops/update-deps 
Update dependencies
 2023-10-11 09:37:53 +02:00
Hidde Beydals
1499d8ed5d Update dependencies 
- github.com/Azure/azure-sdk-for-go/sdk/azidentity to v1.4.0
- github.com/ProtonMail/go-crypto to v0.0.0-20230923063757-afb1ddc0824c
- github.com/google/go-cmp to v0.6.0
- golang.org/x/net to v0.17.0
- google.golang.org/api to v0.146.0
- google.golang.org/genproto/googleapis/rpc to v0.0.0-20231009173412-8bfb1ae86b6c
- google.golang.org/grpc to v1.58.3

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
 2023-10-11 09:07:25 +02:00
Hidde Beydals
76b6ffb19a Merge pull request #1287 from felixfontein/ci 2023-10-11 08:15:59 +02:00
Felix Fontein
eb1f4ec24f Add section in CONTRIBUTING.md on docs changes. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-11 08:02:53 +02:00
Felix Fontein
3697768a81 Add checkdocs, checkrst, and checkmd make targets. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-11 08:02:53 +02:00
Felix Fontein
7b289aa044 Add workflow for rstcheck and mdl. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-11 08:02:53 +02:00
Hidde Beydals
968e9a551b Merge pull request #1320 from felixfontein/docs 
Improve RST and MD files
 2023-10-11 00:06:34 +02:00
Felix Fontein
e156e92034 Change some SOPSs back to sops. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-10 22:41:46 +02:00
Felix Fontein
959b7ed77a Normalize SOPS usages. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-10 07:44:34 +02:00
Felix Fontein
acb3b2fabf Normalize indentation for code blocks and YAML files. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-10 07:17:48 +02:00
Felix Fontein
ce296bacbe Improve MD files (with mdl feedback). 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-10 01:04:32 +02:00
Felix Fontein
0d6c45734d Improve RST files (with rstcheck feedback). 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-10 01:04:32 +02:00
Hidde Beydals
8c89d1481f Merge pull request #1286 from makkes/better-import-error 
Better error reporting for missing gpg binary
 2023-10-10 01:04:01 +02:00
Hidde Beydals
d021b6bf44 pgp: further improve import error format 
Looking more at this, it would actually be great if we would detect
multi-line errors from GnuPG in `Import()`, `Decrypt()` and `Encrypt()`
so that we can slightly improve the formatting of the errors with a
newline seperator before the `gpg: ...\ngpg: ...` output. As this would
likely increase readability.

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
 2023-10-10 00:46:27 +02:00
Max Jonas Werner
d148ddf274 pgp: better error reporting for missing GPG binary 
The error returned by `gpgExec` has just been swallowed. Now it is
stringified and returned together with any output to stderr.

Signed-off-by: Max Jonas Werner <mail@makk.es>
 2023-10-10 00:46:22 +02:00
Hidde Beydals
511046dfaf Merge pull request #1272 from nsantiago2719/main 
Enrich AWS authentication documentation
 2023-10-10 00:15:23 +02:00
Norman Santiago
c6c9ba5f52 docs: document AWS environment variables 
Signed-off-by: Norman Santiago <nsantiago2719@gmail.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Hidde Beydals <hiddeco@users.noreply.github.com>
 2023-10-10 00:07:58 +02:00
Hidde Beydals
e0c73ec548 Merge pull request #1319 from getsops/dependabot/go_modules/go-1299df4a87 
build(deps): Bump the go group with 7 updates
 2023-10-09 15:51:28 +02:00
dependabot[bot]
f6a1cd1b6c build(deps): Bump the go group with 7 updates 
Bumps the go group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [github.com/Azure/azure-sdk-for-go/sdk/azcore](https://github.com/Azure/azure-sdk-for-go) | `1.7.2` | `1.8.0` |
| [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) | `1.21.0` | `1.21.1` |
| [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.18.42` | `1.18.44` |
| [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2) | `1.11.87` | `1.11.89` |
| [github.com/aws/aws-sdk-go-v2/service/kms](https://github.com/aws/aws-sdk-go-v2) | `1.24.5` | `1.24.6` |
| [golang.org/x/net](https://github.com/golang/net) | `0.15.0` | `0.16.0` |
| [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.143.0` | `0.145.0` |


Updates `github.com/Azure/azure-sdk-for-go/sdk/azcore` from 1.7.2 to 1.8.0
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md)
- [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.7.2...sdk/azcore/v1.8.0)

Updates `github.com/aws/aws-sdk-go-v2` from 1.21.0 to 1.21.1
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.21.0...v1.21.1)

Updates `github.com/aws/aws-sdk-go-v2/config` from 1.18.42 to 1.18.44
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.42...config/v1.18.44)

Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.11.87 to 1.11.89
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/feature/s3/manager/v1.11.87...feature/s3/manager/v1.11.89)

Updates `github.com/aws/aws-sdk-go-v2/service/kms` from 1.24.5 to 1.24.6
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/fms/v1.24.5...service/fsx/v1.24.6)

Updates `golang.org/x/net` from 0.15.0 to 0.16.0
- [Commits](https://github.com/golang/net/compare/v0.15.0...v0.16.0)

Updates `google.golang.org/api` from 0.143.0 to 0.145.0
- [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](https://github.com/googleapis/google-api-go-client/compare/v0.143.0...v0.145.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azcore
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  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-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/kms
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-09 09:20:57 +00:00
Hidde Beydals
f12988be01 Merge pull request #1318 from felixfontein/cli-errors 
cmd/sops/main.go: make sure to wrap raw errors with toExitError()
 2023-10-09 09:13:45 +02:00
Felix Fontein
0a9b441181 Make sure to wrap raw errors with toExitError(). 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-09 08:55:16 +02:00
Hidde Beydals
871d10fe2e Merge pull request #1317 from felixfontein/rotate-errors 
Report key rotation errors
 2023-10-09 08:54:53 +02:00
Felix Fontein
71b5795967 Report key rotation errors. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-08 15:31:00 +02:00
Hidde Beydals
0fd3c72f60 Merge pull request #1311 from felixfontein/errors 
Handle errors
 2023-10-03 12:38:47 +02:00
Felix Fontein
dd59dc1096 Check err for nil in tests. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-03 09:41:49 +02:00
Felix Fontein
f668c71545 Defer only after checking err. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-03 09:41:49 +02:00
Felix Fontein
38ec3f7a52 Handle unhandled errors. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-03 09:41:49 +02:00
Felix Fontein
a27e1bddf2 Ignore irrelevant return value (it is always nil). 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-10-03 09:41:49 +02:00
Hidde Beydals
ee1513a1a5 Merge pull request #1304 from alrs/decrypt-err 
decrypt: fix dropped error
 2023-09-30 13:07:01 +02:00
Lars Lehtonen
b6808f83d8 decrypt: fix dropped error 
Signed-off-by: Lars Lehtonen <lars.lehtonen@gmail.com>
 2023-09-30 12:50:44 +02:00
Hidde Beydals
507a6526a3 Merge pull request #1309 from holiman/env_gpg 
pgp: do not require abs path for SopsGpgExecEnv
 2023-09-29 16:10:36 +02:00
Martin Holst Swende
2bba794a96 pgp: do not require abs path for SopsGpgExecEnv 
Signed-off-by: Martin Holst Swende <martin@swende.se>
 2023-09-29 16:01:04 +02:00
Hidde Beydals
53a2bf2757 Merge pull request #1310 from felixfontein/error-order 
pgp: make error the last return value
 2023-09-29 14:01:41 +02:00
Felix Fontein
74c4b124ab Make error the last return value 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-09-29 13:19:49 +02:00
Felix Fontein
da053875a0 Merge pull request #1307 from felixfontein/json-decode 
Handle return values of dec.Token() to improve error messages
 2023-09-29 12:59:19 +02:00
Felix Fontein
72f11997d4 Handle return values of dec.Token() to improve error messages. 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-09-28 22:16:45 +02:00
Hidde Beydals
aa61d03acc Merge pull request #1301 from getsops/dependabot/github_actions/ci-663ed1f0b6 
build(deps): Bump the ci group with 1 update
 2023-09-27 23:36:42 +02:00
Felix Fontein
30736c1cc3 Fix versions in comments 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-09-27 22:23:25 +02:00
dependabot[bot]
be062c6449 build(deps): Bump the ci group with 1 update 
Bumps the ci group with 1 update: [actions/checkout](https://github.com/actions/checkout).

- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](3df4ab11eb...8ade135a41)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-27 10:32:56 +00:00
Hidde Beydals
741923c139 Merge pull request #1306 from getsops/dependabot/go_modules/go-6f7c35363f 2023-09-27 10:58:37 +02:00
dependabot[bot]
5edac8f12e build(deps): Bump the go group with 4 updates 
Bumps the go group with 4 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2), [google.golang.org/api](https://github.com/googleapis/google-api-go-client) and [google.golang.org/grpc](https://github.com/grpc/grpc-go).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.18.39 to 1.18.42
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.39...config/v1.18.42)

Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.11.83 to 1.11.87
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/feature/s3/manager/v1.11.83...feature/s3/manager/v1.11.87)

Updates `google.golang.org/api` from 0.141.0 to 0.143.0
- [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](https://github.com/googleapis/google-api-go-client/compare/v0.141.0...v0.143.0)

Updates `google.golang.org/grpc` from 1.58.1 to 1.58.2
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.58.1...v1.58.2)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  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-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-27 08:18:18 +00:00
Hidde Beydals
d24fe0cd77 Merge pull request #1300 from tozd/fix-unencrypted-regex 2023-09-25 11:40:39 +02:00
Mitar
5f1ca1dd48 Fix descriptions of unencrypted-regex and encrypted-regex flags. 
Signed-off-by: Mitar <mitar.git@tnode.com>
 2023-09-22 11:48:36 +02:00
Felix Fontein
b7da2fca0c Merge pull request #1290 from felixfontein/empty 
Do not crash if an empty YAML file is encrypted
 2023-09-21 08:50:08 +02:00
Felix Fontein
e422158e13 Reject completely empty documents. 
This only affects empty YAML files, since only these can contain zero documents.

Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-09-21 08:41:34 +02:00
Felix Fontein
447221997a Merge pull request #1291 from felixfontein/macos-xdg-config-home 
On macOS, prefer XDG_CONFIG_HOME over os.UserConfigDir()
 2023-09-21 08:41:09 +02:00
Felix Fontein
a27ea2013e On macOS, prefer XDG_CONFIG_HOME over os.UserConfigDir() 
Signed-off-by: Felix Fontein <felix@fontein.de>
 2023-09-21 08:31:46 +02:00
Felix Fontein
80ec1d00d9 Merge pull request #1289 from felixfontein/binary-data-error 
Improve handling of errors when binary store handles bad data
 2023-09-21 08:31:19 +02:00