This bot is meant to help with backporting merge requests to branches other than 'master'. It is built using server application framework Chalice hosted on AWS Lambda and receives notifications using Gitlab's Webhooks.

Note : This is a alpha quality software and is under active development. Please use it at your own risk.

This bot is not specific to any project and (minus some bugs) can be run for any project on Gitlab.com. In future, I am planning to add support for non-Gitlab.com instances of Gitlab and Github too, but there is not ETA. If you'd like to help, please feel free to send in a pull request.

If you are not familiar with Chalice, I recommend that you look through its documentation to make sure you understand what are you doing. You need to setup AWS credentials on your local machine to be able to deploy to AWS Lambda using Chalice.

Then, go ahead and clone this repo:

$ git clone https://github.com/maxking/mailmania-bot.git

Create a new configuration file at mailmania-bot/.chalice/config.json:

{
  "version": "2.0",
        "app_name": "mailmania",
        "environment_variables": {"<project_name>_GL_TOKEN": "<secret-token>",
                                  "GITLAB_TOKEN": "<gitlab-access-token>",
                                  "BACKPORT_DESTINATION": "<backport-branch>",
                                  "ADMIN_EMAIL": "[email protected]"},
        "stages": {
                "dev": {
                        "api_gateway_stage": "api"
                }
        }
}

The environment variables in above configuration are meant to pass credentials to the Lambda Function as environment variables:

• <project_name>_GL_TOKEN : This is a secret token you set in Gitlab when creating the Webhook to make sure your bot doesn't serve random web requests from un-intended users. Please replace <project_name> with the name of your project without the namespace. So for https://gitlab.com/maxking/mailman you will set MAILMAN_GL_TOKEN.

• GITLAB_TOKEN: This is the personal access token for your Gitlab User which has enough permissions to create branches in the project that webhook in set for. Merge requests will be created by this user.

• BACKPORT_DESTINATION: For now, this bot can only backport to a single branch whose name is set as the value of this environment variable. Merge Requests with label "backport-candidate" only are processed by this bot.

• ADMIN_EMAIL: In case anything goes wrong, an email will be sent to this email address with error trace. Currently, this doesn't work properly.

• DEFAULT_FROM_EMAIL: The From address to send emails from.

Deployment step for this bot:

1. Create a virtual environment using Python 3.6:

   $ virtualenv -p python3.6 aws-chalice
   $ aws-chalice/bin/activate

2. Install chalice and dependencies in your virtual environment:

   $ pip install chalice
   $ pip install -r requirements.txt

3. Deploy to AWS lambda:

   $ chalice deploy

   The above command should create appropriate policies for AWS IAM (for Lambda Function), AWS SES (to send emails), AWS API Gateway, setup API gateway endpoints for your project and push your packaged virtual environment to AWS Lambda.

   The above command will also give you endpoint where your bot will listen for requests. You will need this in next step to setup the Gitlab's Webhook.

   Note: Sometimes, you may get Module 'gitlab' not found or similar errors for dependencies. Please de-activate and re-activate your virtualenv to fix this. I am not sure about the exact reason for this problem.

I recommend reading Chalice's Quickstart and documentation for more detailed instructions.

Now, you need to add a webhook in your Gitlab project to send a POST to the URL you received in the previous step after running chalice deploy command.

You will also need a long random token which you added in the configuration above to make sure only requests from Gitlab project are processed by the Bot. Add this token under "Secret Token" in add web hook form.

Check only "Merge Request events" in the list of events.

Finally, save your webhook.

This is the steps bot does to create a backported merge request:

1. Create a new branch with BACKPORT_DESTINATION branch as the reference.
2. Cherry-pick all the commits from the MR being backported.
3. Create a new MR from this new branch to the BACKPORT_DESTINATION branch.

Contributions and questions are welcome. Please create a issue on the Github project.

This project is Licensed under Apache License 2.0. Please see the LICENSE file for full license text.