Allow set "json value" to be a string. #468
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
Adds back support for string values in --set, while retaining support for yaml multidoc that caused this bug. Fixes #461
|
@autrilla I'd like to add a functional regression test for this, but am having some trouble with the value assertion. Am basically copying https://github.com/mozilla/sops/blob/master/functional-tests/src/lib.rs#L196-L228 and then changing the let output = Command::new(SOPS_BINARY_PATH)
.arg("--set")
.arg(r#"["a"] "aaa""#)But am having trouble with how to unwrap/assert that |
Codecov Report
@@ Coverage Diff @@
## develop #468 +/- ##
========================================
Coverage 36.38% 36.38%
========================================
Files 20 20
Lines 2718 2718
========================================
Hits 989 989
Misses 1640 1640
Partials 89 89Continue to review full report at Codecov.
|
|
I've added the functional test for you |
autrilla
force-pushed
the
ajvb/allow-string-in-set
branch
from
b44a6ab to
775274b
Compare
|
@autrilla Oh awesome, thank you! |
autrilla
approved these changes
May 25, 2019
ajvb
added a commit
that referenced
this pull request
Jun 11, 2019
* 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)
ajvb
added a commit
that referenced
this pull request
Sep 11, 2019
* 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)
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.
Adds back support for string values in --set, while retaining support
for yaml multidoc that caused this bug.
Fixes #461