Multi level pfx path #189
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,7 @@ public class VaultConfig implements Serializable { | |
| private SslConfig sslConfig; | ||
| private Integer openTimeout; | ||
| private Integer readTimeout; | ||
| private int prefixPathDepth = 1; | ||
| private int maxRetries; | ||
| private int retryIntervalMilliseconds; | ||
| private Integer globalEngineVersion; | ||
|
|
@@ -207,6 +208,57 @@ public VaultConfig readTimeout(final Integer readTimeout) { | |
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * <p>Set the "path depth" of the prefix path. Normally this is just | ||
| * 1, to correspond to one path element in the prefix path. To use | ||
| * a longer prefix path, set this value | ||
| * | ||
| * @param prefixPathDepth integer number of path elements in the prefix path | ||
| */ | ||
| public VaultConfig prefixPathDepth(int pathLength) { | ||
|
There was a problem hiding this comment. Maybe rename this method |
||
| if (pathLength < 1) { | ||
| throw new IllegalArgumentException("pathLength must be > 1"); | ||
|
|
||
| } | ||
|
|
||
| this.prefixPathDepth = pathLength; | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * <p>Set the "path depth" of the prefix path, by explicitly specifying | ||
| * the prefix path, e.g., "foo/bar/blah" would set the prefix path depth | ||
| * to 3. | ||
| * | ||
| * @param prefixPath string prefix path, with or without initial or | ||
| * final forward slashes | ||
| */ | ||
| public VaultConfig prefixPath(String prefixPath) { | ||
|
There was a problem hiding this comment. I suggest |
||
| int orig = 0; | ||
| int pos; | ||
| int countElements = 0; | ||
| int pathLen = prefixPath.length(); | ||
|
|
||
| if (pathLen == 0) { | ||
| throw new IllegalArgumentException("can't use an empty path"); | ||
| } | ||
|
|
||
| while ((orig < pathLen) && | ||
|
There was a problem hiding this comment. You could maybe simply call |
||
| ((pos = prefixPath.indexOf('/',orig)) >= 0)) { | ||
| countElements++; | ||
| orig = pos+1; | ||
| } | ||
|
|
||
| if (prefixPath.charAt(0) == '/') { | ||
| countElements--; | ||
| } | ||
| if (prefixPath.charAt(pathLen-1) == '/') { | ||
| countElements--; | ||
| } | ||
|
|
||
| return prefixPathDepth(countElements+1); | ||
| } | ||
|
|
||
| /** | ||
| * <p>Sets the maximum number of times that an API operation will retry upon failure.</p> | ||
| * | ||
|
|
@@ -245,6 +297,8 @@ void setEngineVersion(final Integer engineVersion) { | |
| this.globalEngineVersion = engineVersion; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * <p>This is the terminating method in the builder pattern. The method that validates all of the fields that | ||
| * has been set already, uses environment variables when available to populate any unset fields, and returns | ||
|
|
@@ -330,5 +384,8 @@ public String getNameSpace() { | |
| return nameSpace; | ||
| } | ||
|
|
||
| public int getPrefixPathDepth() { | ||
| return prefixPathDepth; | ||
| } | ||
| } | ||
|
|
||
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
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
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
This is a great explanation, but it should probably be moved below in this
README.mdMaybe as a sub-section of Key Value Secret Engine Config
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Definitely agree with this. The placement of this text here is pretty bizarre, and future people reading the README will have no context of which PR/change this paragraph is talking about.
I'll re-work this myself, post-merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I intended for you to move it to release notes once a release number had been assigned.