Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config file support #64

Merged
merged 5 commits into from Oct 29, 2019
Merged

Conversation

AndresCidoncha
Copy link
Contributor

I simply add the option of using a YAML file for configuring the service. Configurations loaded from file have the highest priority over others methods (cli params, env variables).

My idea is made multiples PR for achieving the multiple bucket configuration feature.

@coveralls
Copy link

coveralls commented Sep 20, 2019

Coverage Status

Coverage increased (+0.1%) to 21.015% when pulling 3f11e99 on AndresCidoncha:config_file_support into c9152a9 on camptocamp:master.

@fivehorizons
Copy link

Baller pull request. Let me look at what you have done.

@fivehorizons
Copy link

@andrescidooncha did you include the TF0.12 enablement?

@AndresCidoncha
Copy link
Contributor Author

I'd check out this branch from master.

Do you mean these changes? #62

@raphink
Copy link
Contributor

raphink commented Oct 23, 2019

@AndresCidoncha thanks for these changes. There's quite a few (good) things in here, and I would rather not squash everything together. Do you think you could squash these into a couple of well-defined feature commits?

@AndresCidoncha
Copy link
Contributor Author

Sure! I'll do ASAP

@raphink
Copy link
Contributor

raphink commented Oct 23, 2019

@AndresCidoncha Note I just merged #62 (finally!) so you'll need to rebase (incl switching to go modules)

@AndresCidoncha
Copy link
Contributor Author

AndresCidoncha commented Oct 25, 2019

@raphink I merged your changes and I also fixed the problem with golint in make test!

@raphink
Copy link
Contributor

raphink commented Oct 29, 2019

@AndresCidoncha thanks. There seems to be conflicts still, can you check?

@AndresCidoncha
Copy link
Contributor Author

@raphink I can't see the conflicts 😕 The change list seems to be ok, and GitHub say: This branch has no conflicts with the base branch

@raphink
Copy link
Contributor

raphink commented Oct 29, 2019

Weird…

Screenshot from 2019-10-29 15-21-01

@AndresCidoncha
Copy link
Contributor Author

Yep, really weird:
image
Can you see the conflicting files in your end so I can try to fix it?

@falcon47
Copy link

Maybe is due to trying to rebase instead of merge? As we don't have permission to merge, maybe github is showing the checks to merge, not rebase.

@raphink
Copy link
Contributor

raphink commented Oct 29, 2019

Ah right, merging is possible, just not rebasing.

@AndresCidoncha
Copy link
Contributor Author

@raphink You tell me rebase and I merge your changes. My bad. I'll have to fix it 😢

feat: Add base_url as config parameter

refactor: Move S3/DynamoDB configs in AWS Config block

doc: add example configuration file

fix: fix auth module tests

fix: remove debug print
* Now it's more readable
* Also add test for SetBasePath method
* Fix dependent tests
Avoid dependencies and executable in git

Add vendor/ and terraboard to .gitignore
* Move Port to Web param group
* Add ENV option to Port
* Remove default value from config-file

doc: Update readme

* Add parameters to README

Add LoadConfigFromYaml tests
* db_port as uint16
* remove parameter from LoadConfigFromYaml method

refactor: Use config.DBConfig as parameter in db.Init

Sync interval configuration

doc: Update README for sync-interval config
* Use sync-interval in retry sleep too
@raphink raphink merged commit 445d68f into camptocamp:master Oct 29, 2019
@AndresCidoncha AndresCidoncha deleted the config_file_support branch October 29, 2019 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants