2015-04-11 17:04:09 +02:00
|
|
|
Contributing
|
|
|
|
============
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
|
2015-04-11 17:04:09 +02:00
|
|
|
Sending pull requests
|
|
|
|
---------------------
|
|
|
|
Do you want to contribute to the bootstrap-vz project? Nice! Here is the basic workflow:
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* Read the `development guidelines <#development-guidelines>`__
|
|
|
|
* Fork this repository.
|
|
|
|
* Make any changes you want/need.
|
|
|
|
* Check the coding style of your changes using `tox <http://tox.readthedocs.org/>`__ by running `tox -e flake8`
|
2015-04-11 17:04:09 +02:00
|
|
|
and fix any warnings that may appear.
|
2015-04-12 14:32:47 +02:00
|
|
|
This check will be repeated by `Travis CI <https://travis-ci.org/andsens/bootstrap-vz>`__
|
2015-04-11 17:04:09 +02:00
|
|
|
once you send a pull request, so it's better if you check this beforehand.
|
2015-04-19 14:38:05 +02:00
|
|
|
* If the change is significant (e.g. a new plugin, manifest setting or security fix)
|
2015-04-19 13:05:58 +02:00
|
|
|
add your name and contribution to the `changelog <CHANGELOG.rst>`__.
|
2015-04-19 14:38:05 +02:00
|
|
|
* Commit your changes.
|
|
|
|
* Squash the commits if needed. For instance, it is fine if you have multiple commits describing atomic units
|
2015-04-11 17:04:09 +02:00
|
|
|
of work, but there's no reason to have many little commits just because of corrected typos.
|
2015-04-19 14:38:05 +02:00
|
|
|
* Push to your fork, preferably on a topic branch.
|
2015-04-11 17:04:09 +02:00
|
|
|
|
|
|
|
From here on there are two paths to consider:
|
|
|
|
|
|
|
|
If your patch is a new feature, e.g.: plugin, provider, etc. then:
|
|
|
|
|
|
|
|
* Send a pull request to the `development` branch. It will be merged into the `master` branch when we can make
|
|
|
|
sure that the code is stable.
|
|
|
|
|
|
|
|
If it is a bug/security fix:
|
|
|
|
|
|
|
|
* Send a pull request to the `master` branch.
|
|
|
|
|
|
|
|
Please try to be very descriptive about your changes when you write a pull request, stating what it does, why
|
|
|
|
it is needed, which use cases this change covers etc.
|
|
|
|
You may be asked to rebase your work on the current branch state, so it can be merged cleanly.
|
|
|
|
If you push a new commit to your pull request you will have to add a new comment to the PR,
|
|
|
|
provided that you want us notified. Github will otherwise not send a notification.
|
|
|
|
|
|
|
|
Be aware that your modifications need to be properly documented and pushed to the `gh-pages` branch, if they
|
|
|
|
concern anything done on `master`. Otherwise, they should be sent to the `gh-pages-dev`.
|
|
|
|
|
|
|
|
Happy hacking! :-)
|
|
|
|
|
2014-05-10 16:42:35 +02:00
|
|
|
|
2014-05-10 16:22:32 +02:00
|
|
|
Development guidelines
|
2015-04-11 17:04:09 +02:00
|
|
|
----------------------
|
|
|
|
|
2014-05-10 16:22:32 +02:00
|
|
|
The following guidelines should serve as general advice when
|
|
|
|
developing providers or plugins for bootstrap-vz. Keep in mind that
|
|
|
|
these guidelines are not rules , they are advice on how to better add
|
|
|
|
value to the bootstrap-vz codebase.
|
|
|
|
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **The manifest should always fully describe the resulting image. The
|
2014-05-10 16:22:32 +02:00
|
|
|
outcome of a bootstrapping process should never depend on settings
|
|
|
|
specified elsewhere.**
|
|
|
|
|
|
|
|
This allows others to easily reproduce any
|
|
|
|
setup other people are running and makes it possible to share
|
|
|
|
manifests. `The official debian EC2 images <https:/aws.amazon.com/marketplace/seller-
|
2015-04-12 14:32:47 +02:00
|
|
|
profile?id=890be55d-32d8-4bc8-9042-2b4fd83064d5>`__
|
2014-05-10 16:22:32 +02:00
|
|
|
for example can be reproduced using the manifests available
|
|
|
|
in the manifest directory of bootstrap-vz.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **The bootstrapper should always be able to run fully unattended.**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
For end users, this guideline minimizes the risk of errors. Any
|
|
|
|
required input would also be in direct conflict with the previous
|
|
|
|
guideline that the manifest should always fully describe the resulting
|
|
|
|
image.
|
|
|
|
|
|
|
|
Additionally developers may have to run the bootstrap
|
|
|
|
process multiple times though, any prompts in the middle of that
|
|
|
|
process may significantly slow down the development speed.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **The bootstrapper should only need as much setup as the manifest
|
2014-05-10 16:22:32 +02:00
|
|
|
requires.**
|
|
|
|
|
|
|
|
Having to shuffle specific paths on the host into place
|
|
|
|
(e.g. ``/target`` has to be created manually) to get the bootstrapper
|
|
|
|
running is going to increase the rate of errors made by users.
|
|
|
|
Aim for minimal setup.
|
|
|
|
|
|
|
|
Exceptions are of course things such as the path to
|
|
|
|
the VirtualBox Guest Additions ISO or tools like ``parted`` that
|
|
|
|
need to be installed on the host.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **Roll complexity into which tasks are added to the tasklist.**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
If a ``run()`` function checks whether it should do any work or simply be
|
|
|
|
skipped, consider doing that check in ``resolve_tasks()`` instead and
|
|
|
|
avoid adding that task alltogether. This allows people looking at the
|
|
|
|
tasklist in the logfile to determine what work has been performed. If
|
|
|
|
a task says it will modify a file but then bails , a developer may get
|
|
|
|
confused when looking at that file after bootstrapping. He could
|
|
|
|
conclude that the file has either been overwritten or that the
|
|
|
|
search & replace does not work correctly.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **Control flow should be directed from the task graph.**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
Avoid creating complicated ``run()`` functions. If necessary, split up
|
|
|
|
a function into two semantically separate tasks.
|
|
|
|
|
|
|
|
This allows other tasks to interleave with the control-flow and add extended
|
|
|
|
functionality (e.g. because volume creation and mounting are two
|
|
|
|
separate tasks, `the prebootstrapped plugin
|
2015-04-19 13:05:58 +02:00
|
|
|
<bootstrapvz/plugins/prebootstrapped>`__
|
2014-05-10 16:22:32 +02:00
|
|
|
can replace the volume creation task with a task of its own that
|
|
|
|
creates a volume from a snapshot instead, but still reuse the mount task).
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **Task classes should be treated as decorated run() functions, they
|
2014-05-10 16:22:32 +02:00
|
|
|
should not have any state**
|
|
|
|
|
|
|
|
Thats what the BootstrapInformation object is for.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **Only add stuff to the BootstrapInformation object when really necessary.**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
This is mainly to avoid clutter.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **Use a json-schema to check for allowed settings**
|
2014-05-10 16:22:32 +02:00
|
|
|
The json-schema may be verbose but it keeps the bulk of check work outside the
|
|
|
|
python code, which is a big plus when it comes to readability. This of
|
|
|
|
course only applies bas long as the checks are simple. You can of
|
|
|
|
course fall back to doing the check in python when that solution is
|
|
|
|
considerably less complex.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **When invoking external programs, use long options whenever possible**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
This makes the commands a lot easier to understand, since
|
|
|
|
the option names usually hint at what they do.
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* **When invoking external programs, don't use full paths, rely on ``$PATH``**
|
2014-05-10 16:22:32 +02:00
|
|
|
|
|
|
|
This increases robustness when executable locations change.
|
|
|
|
Example: Use ``log_call(['wget', ...])`` instead of ``log_call(['/usr/bin/wget', ...])``.
|
|
|
|
|
|
|
|
|
|
|
|
Coding style
|
|
|
|
------------
|
|
|
|
bootstrap-vz is coded to comply closely with the PEP8 style
|
|
|
|
guidelines. There however a few exceptions:
|
|
|
|
|
2015-04-19 14:38:05 +02:00
|
|
|
* Max line length is 110 chars, not 80.
|
|
|
|
* Multiple assignments may be aligned with spaces so that the = match
|
2014-05-10 16:22:32 +02:00
|
|
|
vertically.
|
2015-04-19 14:38:05 +02:00
|
|
|
* Ignore ``E101``: Indent with tabs and align with spaces
|
|
|
|
* Ignore ``E221 & E241``: Alignment of assignments
|
|
|
|
* Ignore ``E501``: The max line length is not 80 characters
|
|
|
|
* Ignore ``W191``: Indent with tabs not spaces
|
2014-05-10 16:22:32 +02:00
|
|
|
|
2014-05-10 20:34:25 +02:00
|
|
|
The codebase can be checked for any violations quite easily, since those rules are already specified in the
|
2015-04-12 14:32:47 +02:00
|
|
|
`tox <http://tox.readthedocs.org/>`__ configuration file.
|
2014-05-10 16:22:32 +02:00
|
|
|
::
|
2014-05-10 16:56:12 +02:00
|
|
|
|
2014-05-10 20:34:25 +02:00
|
|
|
tox -e flake8
|
2015-04-19 14:38:05 +02:00
|
|
|
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
-------------
|
|
|
|
When developing a provider or plugin, make sure to update/create the README.rst
|
|
|
|
located in provider/plugin folder.
|
|
|
|
Any links to other rst files should be relative and work, when viewed on github.
|
|
|
|
For information on `how to build the documentation <docs#building>`_ and how
|
|
|
|
the various parts fit together,
|
|
|
|
refer to `the documentation about the documentation <docs>`__ :-)
|