Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a2a86ef
Added crypt options
avara1986 Feb 16, 2020
0d062f8
Fix pylint and flake8
avara1986 Feb 16, 2020
7b05354
No cover to no testable conditions
avara1986 Feb 16, 2020
c57648d
Merge remote-tracking branch 'origin/master' into feature/added_crypt…
avara1986 Feb 16, 2020
26a8b95
No cover to no testable conditions
avara1986 Feb 16, 2020
8d869c4
Merge branch 'master' into feature/added_crypt_options
avara1986 Feb 17, 2020
9114af6
Removed encrypted var after decrypted
avara1986 Feb 17, 2020
09e17c0
Fix, send path to ConfFile from Microservice class to set path from code
avara1986 Feb 17, 2020
30fa3fb
Updated pipfile
avara1986 Feb 17, 2020
19745f7
Fix unused import
avara1986 Feb 17, 2020
115a4a1
Merge branch 'master' into feature/added_crypt_options
avara1986 Feb 17, 2020
2a6cc48
Updated dependencies
avara1986 Feb 17, 2020
0a0e815
Changed SHA2576 to SHA512_256
avara1986 Feb 17, 2020
15cdc73
Updated docs
avara1986 Feb 17, 2020
3107bf8
Fix example
avara1986 Feb 17, 2020
3d38c76
Fix docs and update examples
avara1986 Feb 18, 2020
eee1243
Fix issue #88
avara1986 Feb 18, 2020
3cea656
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
f25730e
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
405640b
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
22cad3e
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
d219041
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
98da3a0
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
8b08e2e
Update docs/encrypt_decryt_configuration.md
avara1986 Feb 19, 2020
cc7fc78
Fix typo
Feb 19, 2020
f2522a4
Fix typo
Feb 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ python-json-logger = ">=0.1.10"
pyyaml = ">=5.1.2"
anyconfig = ">=0.9.8"
swagger-ui-bundle = ">=0.0.2"
connexion = {extras = ["swagger-ui"],version = "==2.4.0"}
connexion = {extras = ["swagger-ui"],version = "==2.6.0"}
jaeger-client = "==4.3.0"
flask-opentracing = "*"
opentracing = ">=2.1"
opentracing-instrumentation = "==3.2.1"
prometheus_client = ">=0.7.1"
cryptography = "*"

[dev-packages]
requests-mock = "*"
coverage = "==4.5.4"
coverage = "==5.0.3"
pytest = "*"
pytest-cov = "*"
pylint = "*"
Expand All @@ -27,7 +28,7 @@ tox = "*"
bandit = "*"
mkdocs = "*"
mkdocs-material = "*"
lightstep = "==4.3.0"
lightstep = "==4.4.3"

[requires]
python_version = "3.6"
Expand Down
157 changes: 111 additions & 46 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![Requirements Status](https://requires.io/github/python-microservices/pyms/requirements.svg?branch=master)](https://requires.io/github/python-microservices/pyms/requirements/?branch=master)
[![Total alerts](https://img.shields.io/lgtm/alerts/g/python-microservices/pyms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/python-microservices/pyms/alerts/)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/python-microservices/pyms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/python-microservices/pyms/context:python)
[![Documentation Status](https://readthedocs.org/projects/py-ms/badge/?version=latest)](https://py-ms.readthedocs.io/en/latest/?badge=latest)
[![Gitter](https://img.shields.io/gitter/room/DAVFoundation/DAV-Contributors.svg)](https://gitter.im/python-microservices/pyms)


Expand Down
5 changes: 3 additions & 2 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

**CONFIGMAP_FILE**: The path to the configuration file. By default, PyMS search the configuration file in your
actual folder with the name "config.yml"
**CONFIGMAP_SERVICE**: the name of the keyword that define the block of key-value of [Flask Configuration Handling](http://flask.pocoo.org/docs/1.0/config/)
and your own configuration (see the next section to more info)
**KEY_FILE**: The path to the key file to decrypt your configuration. By default, PyMS search the configuration file in your
actual folder with the name "key.key"

## Create configuration
Each microservice needs a config file in yaml or json format to work with it. This configuration contains
the Flask settings of your project and the [Services](services.md). With this way to create configuration files, we
solve two problems of the [12 Factor apps](https://12factor.net/):

- Store config out of the code
- Dev/prod parity: the configuration could be injected and not depends of our code, for example, Kubernetes configmaps

Expand Down
Loading