1
0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00

1017 Commits

Author SHA1 Message Date
AJ Bahnken
647560046f Merge branch 'develop' v3.5.0 2019-11-21 15:12:19 -08:00
AJ Bahnken
8302b6a18c fix go mod path in go build commands 2019-11-21 15:11:58 -08:00
AJ Bahnken
afd073a5be Merge pull request #579 from mozilla/develop
Develop -> Master for 3.5.0
2019-11-21 14:53:27 -08:00
AJ Bahnken
bc4b7478ad prepare 3.5.0 release (#578) 2019-11-21 13:53:50 -08:00
AJ Bahnken
c19d2580c9 Merged master into develop 2019-11-21 12:34:36 -08:00
AJ Bahnken
6a1fe99d06 Run go fmt on project (#577) 2019-11-21 12:10:55 -08:00
AJ Bahnken
8e21de8dbc Upgrade sops to go 1.13 (#566) 2019-11-18 10:06:58 -08:00
Jesse Bye
00ded41207 Update aws-sdk-go to v1.23.13 (#573) 2019-11-15 21:19:34 +01:00
Adrian Utrilla
200322d54f Merge pull request #564 from leitu/corret_readme
correct azure key environment in readme
2019-11-05 23:26:00 +01:00
Lei Tu
18d28678b1 correct azure key environment in readme
code is calling URLS 14a22d7a70/cmd/sops/main.go (L371)
2019-11-06 07:00:00 +09:00
Ivan Malopinsky
6e283a8ee7 Sanitize hostname used for AWS STS role session name (#558)
* Sanitize hostname used for AWS STS role session name

From official docs for --role-session-name (https://docs.aws.amazon.com/cli/latest/reference/sts/assume-role.html):
> The regex used to validate this parameter is a string of characters consisting of upper- and lower-case alphanumeric characters with no spaces. You can also include underscores or any of the following characters: =,.@-

This fixes #441, which occurs when the hostname includes spaces and parentheses

* pr notes: wrap STS role session name regex compilation error
2019-11-01 08:54:07 -07:00
Adrian Utrilla
d98bff6731 Merge pull request #549 from dnozay/pr-548
fix for #548 - handle .ini files in `decrypt.Data`, add other helper
2019-10-26 10:35:36 +02:00
Damien Nozay
4376ac973c add formats 2019-10-22 12:49:09 -07:00
Damien Nozay
559b27c01f mv formats around 2019-10-22 11:52:35 -07:00
Damien Nozay
a03712f086 use enum 2019-10-22 08:14:20 -07:00
Adrian Utrilla
9abdff796f Merge pull request #552 from davidovich/document-updatekeys
document updatekeys command
2019-10-21 20:57:51 +02:00
david
52071713d9 document updatekeys command
Add note about mandatory keys rotation when using --add-* options.
2019-10-21 14:47:59 -04:00
Damien Nozay
a40c6a208f use map 2019-10-17 09:25:09 -07:00
Damien Nozay
dad8100da8 fix for #548 2019-10-16 11:48:43 -07:00
Adrian Utrilla
4b5b7ae308 Merge pull request #544 from PyvesB/stdin-docs
Document how to operate on stdin
2019-10-04 16:32:45 +02:00
PyvesB
c670107d56 Document how to operate on stdin 2019-10-04 14:22:18 +01:00
Omar
5663d276a5 exec-file and exec-env subcommands, take two (#532)
* first pass: add --exec flag

* fix spacing

* subcommand for exec as well as other bits n bobs

--placeholder to pass files to child procs (similar to `find(1)`'s -exec flag)
--background to background processes if you don't need them to be interactive

* break the 2 execs into 2 subcommands

* add a non-fifo option for people who like files instead

* added a setuid flag just in case

* oups, used the wrong functions

* Update README.rst

* typo

* first attempt at separating out windows/unix functionality

* add the caveat about windows

* windows: make sure --no-fifo is being used and warn when it's not

* stray fixes

* switch to logrus, break out the command builder, and remove /tmp/ default
2019-09-24 12:48:31 -07:00
Adrian Utrilla
19cc1bc774 Merge pull request #530 from oskarkook/patch-1
fix --encrypted-regex documentation
2019-09-20 18:16:56 +02:00
Oskar Köök
ddaa00643a fix --encrypted-regex example 2019-09-20 10:01:42 +03:00
AJ Bahnken
14a22d7a70 Merge pull request #526 from mozilla/revert-exec-command
Revert exec command for 3.4.0 release
v3.4.0 3.4.0
2019-09-12 13:52:35 -07:00
AJ Bahnken
5e02dac757 Remove exec-env/exec-file from 3.4.0 changelog 2019-09-12 12:14:05 -07:00
AJ Bahnken
e527e06480 Revert "Add an --exec flag to pass decrypted secrets via environment variables to a child process (#504)"
This reverts commit f103af7237.
2019-09-12 12:13:00 -07:00
AJ Bahnken
14b38164cd Merge pull request #525 from mozilla/develop
Merge typo and release build fix for 3.4.0
2019-09-12 12:00:23 -07:00
AJ Bahnken
e8969afe16 Merge branch 'master' into develop 2019-09-12 11:49:55 -07:00
AJ Bahnken
9b76a76bab Add GO111MODULE=on to release builds 2019-09-12 11:48:35 -07:00
AJ Bahnken
2544b3cdb0 Merge pull request #522 from mozilla/develop-to-master-for-3.4.0
3.4.0 (develop -> master)
2019-09-12 11:29:07 -07:00
Antoine Rondelet
eed77eb4fb Fixed typo related to MACs (#524) 2019-09-11 15:15:55 -07:00
AJ Bahnken
f092864772 remove duplicate functional test 2019-09-11 14:19:15 -07:00
AJ Bahnken
4b36f15b46 Merge branch 'develop' into develop-to-master-for-3.4.0 2019-09-11 14:06:27 -07:00
AJ Bahnken
81a98abab0 Fixed exec env/file in changelog 2019-09-11 14:06:09 -07:00
AJ Bahnken
a04e15a60b Merged develop into off-master branch 2019-09-11 13:57:50 -07:00
AJ Bahnken
045a876841 Bump version and CHANGELOG for 3.4.0 2019-09-11 13:40:01 -07:00
AJ Bahnken
2fed7a5c70 3.3.1 (develop -> master) (#478) (#521)
* Changes to travis config and docs for using develop (#462)

* Fixes integration tests in travis to not run on PR's (they will now
run on merges into `develop` and `master`)
* Change README.rst and CONTRIBUTING.md to reflect the use of `develop`
as the primary development branch

* use golang 1.12 for building sops

* pgp/keysource: Check size of key fingerprint

Make sure the key fingerprint is longer than 16 characters before
slicing it.

Closes #463

* Allow set "json value" to be a string. (#468)

* Allow set "json value" to be a string.

Adds back support for string values in --set, while retaining support
for yaml multidoc that caused this bug.

Fixes #461

* Add functional test for --set'ing strings

* Vendoring update (#472)

It's been around 9 months since our last vendor update. This is also
needed for some new features being worked on for sops workspace.

Additionally, this PR regenerates the kms mocks.

* Remove duplicate sentence from readme (#475)

* 3.3.1 bump and release notes (#477)
2019-09-11 13:37:12 -07:00
Omar
f103af7237 Add an --exec flag to pass decrypted secrets via environment variables to a child process (#504)
* first pass: add --exec flag

* fix spacing

* subcommand for exec as well as other bits n bobs

--placeholder to pass files to child procs (similar to `find(1)`'s -exec flag)
--background to background processes if you don't need them to be interactive

* break the 2 execs into 2 subcommands

* add a non-fifo option for people who like files instead

* added a setuid flag just in case

* oups, used the wrong functions

* Update README.rst

* typo
2019-09-09 13:49:05 -07:00
AJ Bahnken
ebf0705182 vault kv version and mount names in publish config (#513)
Adds support for publishing to vault using KV v1 and a different mount
name (or multiple).
2019-08-30 13:44:04 -07:00
AJ Bahnken
e9b9f7aeef Replace old functional test gpg keys (#512)
Two of the three old keys have expired, so create a new set with no
expiration.
2019-08-30 09:07:00 -07:00
Adrian Utrilla
d505c3e03c Merge pull request #509 from jpriebe/develop
added encrypted-regex option
2019-08-28 11:24:39 +02:00
Jason Priebe
d8db56650a Update README.rst
Co-Authored-By: Adrian Utrilla <adrianutrilla@gmail.com>
2019-08-21 12:10:57 -04:00
Jason Priebe
34be9e9edf got config_test passing 2019-08-15 10:27:15 -04:00
Jason Priebe
d5199e371f added example of encrypted-regex 2019-08-15 08:46:02 -04:00
Jason Priebe
d5f7c886cf corrected a mistake in handling the interaction among unencrypted-suffix, ecnrypted-suffix, and encrypted-regex 2019-08-15 08:31:27 -04:00
Jason Priebe
45076418c7 added encrypted-regex option 2019-08-14 15:39:21 -04:00
Adrian Utrilla
c9e025fc77 Merge pull request #505 from dcreado/develop
fix path handling on edit.go for windows
2019-08-11 20:38:30 +02:00
Domingos Creado
4846c52094 fix path handling on edit.go for windows 2019-08-05 09:59:08 -03:00
Adrian Utrilla
757884b21a Merge pull request #502 from Devin-Holland/feat/azkv-key-group-support
Adding support for azure keyvault to key group config.
2019-08-04 10:18:06 +02:00