Skip to content

Latest commit

 

History

History
118 lines (82 loc) · 7.53 KB

CONTRIBUTING.md

File metadata and controls

118 lines (82 loc) · 7.53 KB
Raw

Contributing to Otoroshi

These guidelines apply to all Otoroshi projects living in the the MAIF/otoroshi repository.

These guidelines are meant to be a living document that should be changed and adapted as needed. We encourage changes that make it easier to achieve our goals in an efficient way.

Codebase

  • docker: contains various Dockerfiles
  • docs: contains the Otoroshi website, avoid modification as its generated
  • manual: the otoroshi user manual that will be generated with Paradox
  • otoroshi: the otoroshi server app
  • resources: various static resources
  • scripts: various scripts used by Travis and devs

Workflow

The steps below describe how to get a patch into a main development branch (e.g. master). The steps are exactly the same for everyone involved in the project (be it core team, or first time contributor). We follow the standard GitHub fork & pull approach to pull requests. Just fork the official repo, develop in a branch, and submit a PR!

  1. To avoid duplicated effort, it might be good to check the issue tracker and existing pull requests for existing work.
    • If there is no ticket yet, feel free to create one to discuss the problem and the approach you want to take to solve it.
  2. Fork the project on GitHub. You'll need to create a feature-branch for your work on your fork, as this way you'll be able to submit a pull request against the mainline Otoroshi.
  3. Create a branch on your fork and work on the feature. For example: git checkout -b wip-awesome-new-feature
    • Please make sure to follow the general quality guidelines (specified below) when developing your patch.
    • Please write additional tests covering your feature and adjust existing ones if needed before submitting your pull request.
  4. Once your feature is complete, prepare the commit with a good commit message, for example: Adding canary mode support for services #42 (note the reference to the ticket it aimed to resolve).
  5. If it's a new feature, or a change of behaviour, document it on the Otoroshi docs, remember, an undocumented feature is not a feature.
  6. Now it's finally time to submit the pull request!
    • Please make sure to include a reference to the issue you're solving in the comment for the Pull Request, this will cause the PR to be linked properly with the Issue. Examples of good phrases for this are: "Resolves #1234" or "Refs #1234".
  7. Now both committers and interested people will review your code. This process is to ensure the code we merge is of the best possible quality, and that no silly mistakes slip through. You're expected to follow-up these comments by adding new commits to the same branch. The commit messages of those commits can be more loose, for example: Removed debugging using printline, as they all will be squashed into one commit before merging into the main branch.
    • The community and team are really nice people, so don't be afraid to ask follow up questions if you didn't understand some comment, or would like clarification on how to continue with a given feature. We're here to help, so feel free to ask and discuss any kind of questions you might have during review!
  8. After the review you should fix the issues as needed (pushing a new commit for new review etc.), iterating until the reviewers give their thumbs up–which is signalled usually by a comment saying LGTM, which means "Looks Good To Me".
  9. If the code change needs to be applied to other branches as well (for example a bugfix needing to be backported to a previous version), one of the team will either ask you to submit a PR with the same commit to the old branch, or do this for you.
  10. Once everything is said and done, your pull request gets merged. You've made it!

The TL;DR; of the above very precise workflow version is:

  1. Fork Otoroshi
  2. Hack and test on your feature (on a branch)
  3. Document it
  4. Submit a PR
  5. Keep polishing it until received thumbs up from the core team
  6. Profit!

External dependencies

All the external runtime dependencies for the project, including transitive dependencies, must have an open source license that is equal to, or compatible with, Apache 2.

This must be ensured by manually verifying the license for all the dependencies for the project:

  1. Whenever a committer to the project changes a version of a dependency (including Scala) in the build file.
  2. Whenever a committer to the project adds a new dependency.
  3. Whenever a new release is cut (public or private for a customer).

Which licenses are compatible with Apache 2 are defined in this doc, where you can see that the licenses that are listed under Category A are automatically compatible with Apache 2, while the ones listed under Category B need additional action:

Each license in this category requires some degree of reciprocity; therefore, additional action must be taken in order to minimize the chance that a user of an Apache product will create a derivative work of a reciprocally-licensed portion of an Apache product without being aware of the applicable requirements.

Each project must also create and maintain a list of all dependencies and their licenses, including all their transitive dependencies. This can be done either in the documentation or in the build file next to each dependency.

You must add the dependency and its licence in https://github.com/MAIF/otoroshi/blob/master/licences.md

Documentation

if you add features to Otoroshi, don't forget to modify the user manual, the swagger file

to build the documentation, run the following command at the root of the repository

sh ./scripts/doc.sh

Tests

Every new feature should provide corresponding tests to ensure everything is working and will still working in future releases. To run the tests, just run

sbt test

you can also run the tests using other datastores

TEST_STORE=inmemory sbt test
TEST_STORE=redis sbt test
TEST_STORE=cassandra sbt test

cassandra and redis tests will try to connect to local instance of cassandra and redis running on standard ports.

docker run -d -p 9042:9042 -p 7000:7000 --env CASSANDRA_LISTEN_ADDRESS=127.0.0.1 cassandra:3.11
docker run -d -p 6379:6379 redis:4.0.8 redis-server --appendonly yes

Source style

The whole code of Otoroshi is automatically formatted using

  • prettier
  • rust_fmt
  • scalafmt

before pushing your code, don't forget to run the following command at the root of the repository

sh ./scripts/fmt.sh

Continuous integration

Every commit and PR to Otoroshi is built by Travis. Travis will also check your pull request to prevent merging code that does not build.