3.4.0 (develop -> master) #522
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
* 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
Make sure the key fingerprint is longer than 16 characters before slicing it. Closes #463
pgp/keysource: Check size of key fingerprint
* 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
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.
* Implement `sops publish` command Publishes a file to a pre-configured destination (this lives in the sops config file). Additionally, support re-encryption rules that work just like the creation rules. Initial support for S3/GCS. This is a part of the sops-workspace v2.0 project Includes the addition of a new dependency: github.com/googleapis/gax-go/v2 * code review changes; support global --verbose flag * Switch to recreation_rule with full support Reencryption rule is now recreation rule and supports everything that a creation rule does. Now, when you load a config for a file, you load either the creation rule or the destination rule. I'm not sure about this style long term, but it allows for support to be added for the recreation rules without a bigger refactor of how the config file works. * split loadForFileFromBytes into two functions remove branching based on destination rule or not, create one for creation rules and one for destination rules * pretty diff for keygroup updates in sops publish
Fix linting and formatting issues
Address Go Lint messages
* Add vault/api to vendor/ * Adds support for sops publish-ing to Vault * Adds support for publishing secrets (unencrypted) to Vault * Adds a new EmitAsMap for TreeBanches * Adds documentation about sops publish-ing to Vault * Initial integration/functional test for publishing to vault
Return non-zero exit code for invalid CLI flags
Add Azure CLI auth
feat(sops): moved dependency management from govend to go modules
* Remove vendor directory from repo With #498 being merged and making the switch to Go modules, there does not seem to be a need to store this directory within the repo anymore. As well, it will make reviewing dependency updates and viewing the PR's within Github's UI much more manageable. This PR also include adding `vendor/` to `.gitignore` and changing the Makefile so that `make test` will run `make vendor` first. * Switch to using make install in Dockerfile * Remove -mod vendor flag from install and functional-tests * Use proxy.golang.org for go modules within Makefile
Adding support for azure keyvault to key group config.
fix path handling on edit.go for windows
…fix, ecnrypted-suffix, and encrypted-regex
Co-Authored-By: Adrian Utrilla <adrianutrilla@gmail.com>
added encrypted-regex option
Two of the three old keys have expired, so create a new set with no expiration.
Adds support for publishing to vault using KV v1 and a different mount name (or multiple).
…s 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
* 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)
Codecov Report
@@ Coverage Diff @@
## master #522 +/- ##
==========================================
+ Coverage 36.38% 36.46% +0.07%
==========================================
Files 20 20
Lines 2718 2863 +145
==========================================
+ Hits 989 1044 +55
- Misses 1640 1725 +85
- Partials 89 94 +5
Continue to review full report at Codecov.
|
autrilla
approved these changes
Sep 12, 2019
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.
There were some weird merge conflicts, mostly relating to the new go modules / removal of the vendor directory. This branch is based off of master with develop merged in by hand to deal with this.