Add initial support for docker secrets #5
Conversation
This file contains hidden or 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
pmendelski
reviewed
Nov 4, 2017
lib/resolve/secrets.js
Outdated
|
|
||
| const fs = require('fs'), | ||
| path = require('path'), | ||
| SECRETS_DIR = '/run/secrets', |
There was a problem hiding this comment.
It would be nice to make it more generic. Make a parameter out of this value.
There was a problem hiding this comment.
Is not possible, docker always search for secrets in this path.
lib/resolve/secrets.js
Outdated
| SECRETS_DIR = '/run/secrets', | ||
| output = {}; | ||
|
|
||
| if (fs.existsSync(SECRETS_DIR)) { |
There was a problem hiding this comment.
It would be nice to wrap it in a function. This way it would be easier to test.
test/configs/config-a1.json
Outdated
| @@ -1,5 +1,5 @@ | |||
| { | |||
| "a1": "a1", | |||
| "a2": "a1", | |||
| "env-var": "%{CONFIG_LOADER_TEST_VAR_A}" | |||
| "env-var": "%{CONFIG_LOADER_TEST_VAR_A}" | |||
There was a problem hiding this comment.
There is sth wrong with whitespaces
README.md
Outdated
|
|
||
| /tmp/config.json: | ||
| ``` javascript | ||
| { docks1: "%{DOCKER_SECRET1}", docks2: "%{DOCKER_SECRET2|def}" } |
There was a problem hiding this comment.
there should be probably '#' instead of '%' in this example ;)
README.md
Outdated
| @@ -225,7 +245,8 @@ All json files are loaded using [JSON5](https://www.npmjs.com/package/json5) lib | |||
| - **optional** - (String/Array, default: []) list of configuration paths that are optional. If any configuration path is not resolved and is not optional it's treated as empty file and no exception is raised. | |||
| - **basedir** - (String/Array, default: []) base directory (or directories) used for searching configuration files. Mind that `basedir` has lower priority than a configuration directory, process basedir, and absolute paths. | |||
| - **replaceEnv** - (Boolean/String, default: false, constraint: A string value must be different than `replaceLocal`) if specified enables environment variable replacement. Expected string value e.g. `%` that will be used to replace all occurrences of `%{...}` with environment variables. You can use default values like: %{a.b.c|some-default-value}. | |||
| - **replaceLocal** - (Boolean/String, default: '@', constraint: A string value must be different than `replaceEnv`) if specified enables configuration variable replacement. Expected string value e.g. `@` that will be used to replace all occurrences of `@{...}` with configuration variables. You can use default values like: @{a.b.c|some-default-value}. | |||
| - **replaceDockerSecret** - (Boolean/String, default: false, constraint: A string value must be different than `replaceLocal` and `replaceEnv`) if specified enables docker secret file replacement. Expected string value e.g. `#` that will be used to replace all occurrences of `#{...}` with docker secret file content. You can use default values like: #{DOCKER_SECRET|some-default-value}. | |||
There was a problem hiding this comment.
A link to a doc explaining docker secrets would be handy
|
|
||
| module.exports = function(config, opts) { | ||
| opts = opts || {}; | ||
| config = override(opts.override, config, process.env); | ||
| config = replaceEnvVariables(config, opts.replaceEnv, opts); | ||
| config = replaceLocalVariables(config, opts.replaceLocal, opts); | ||
| config = replaceDockerSecrets(config, opts.replaceDockerSecret, opts); |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Initial work to add support for docker secrets.