/Automerge

Used to automatically merge terraform dependencies pull requests in github that have no differences.

Primary LanguagePythonMIT LicenseMIT

Lint & tests Docker Build

Automerge for GitHub and Atlantis

Used to automatically merge terraform dependencies pull requests in GitHub that result in no differences.

Tools like dependabot or renovate can create a lot of pull requests if you have different providers or modules in your terraform code. Most of the time these changes result in no terraform differences and can be merged automatically without any intervention.

Automerge does exactly this: Checks every PR that has a title that matches a specific string, plans it and if the terraform plan results in No changes it approves and merges the PR.

It works along with the atlantis tool.

Dependencies

Automerge (for now) works only with github repos and atlantis, so you need to have a working Atlantis installation to use it.

Configuration

{
  "access_token" : "token",
  "filters" : [
    "^\\[DEPENDENCIES\\] Update Terraform",
    "^\\[DEPENDABOT\\]",
    "^\\[Dependabot\\]"
  ],
  "github_user" : "AlessioCasco",
  "owner" : "my_company",
  "repos" : [
    "terraform-vault",
    "terraform-aws"
  ]
}
  • access_token: Token (classic) from GitHub that needs to have the following Scopes:
    • Full control of private repositories.
  • filters: Regex that Automerge uses to filter the pull requests it has to consider.
    • This is usually what you set in the prefix option for dependabot or the equivalent commitMessagePrefix option for renovate.
    • Be aware that you you need to escape the backslashes in the JSON string to properly represent the regular expressions, see the configuration section for an example.
  • github_user: Github user that owns the access_token.
  • owner: Owner of the repos where we want to check the pull requests.
  • repos: list of repo names that you want to check pull requests from (note that they all need to be under the same owner).
    • ie https://github.com/Owner/repo/

GitHub Config

Branch protection

If you Require status checks from Atlantis to pass before merging on your Branch protection rules, make sure that the atlantis ones are set to atlantis/plan only. Automerge will never apply anything (for now) so having an atlantis/apply check set as required will break the ability for automerge to merge pull requests. This because automerge does not bypass branch protections. Before merging any pull request it waits that all checks are green.

Codeowners

Since the GitHub user leveraged by Automerge has to be able to comment, approve and merge pull requests, depending on your GitHub configs it may be required to add such a user in the codeowners file and also as writer for the repository.

Usage

Options

options:
  -h, --help            show this help message and exit
  --config_file CONFIG_FILE
                        JSON file holding the GitHub access token, default is .config.json
  --approve_all         Approves all PRs that match the filters in the config

Python

Create a config file (by default it should be placed in ./config.json) And run the following:

# Install dependencies
pip3 install -r requirements.txt
# Run it
python3 main.py

Docker

docker run -d -v ./config.json:/app/config.json --name automerge alessiocasco/automerge:latest

Helm

Move to /charts/automerge, tune your values.yaml file and run:

helm install -f values.yaml automerge -n <your_namespace> .

Usage

This tool is intended to run as a k8s cronjob during the night; every ~15 minutes for a couple of hours so it can close as many pull requests as possible. Something like:

*/20 3-5 * * *

What it does at every run:

  • Gets all pull requests from every repo listed in the config
  • Filters out the ones that don't have the prexif set in the config
    • If the pull request is new and has no comments:
      • Syncs the branch with master if needed, waits for all the checks to pass and finally writes atlantis plan as a comment into the pull request
    • If the pull request is planned and has no diffs:
      • Approves the pull request and merges it
    • If the pull request is planned and has diffs:
      • Writes comment This PR will be ignored by automerge into the pull request, unlocks it and sets an automerge_ignore label.
      • All future runs of Automerge will ignore this pull request (see Options to force this)
    • If the pull request was planned but had errors:
      • Automerge will try to plan it again
    • If the pull request was planned by no projects were actually planned (Usually happens when the pull request bumps something in a module and Atlantis )
      • Automerge sets the following label automerge_no_project and ignores it.

Ignored pull requests and labels:

Automerge ignores all pull requests having terraform differences or that result in no projects being planned. It marks the first ones with a automerge_ignore label and the others with automerge_no_project, so you can filter by label with the following GitHub query is:open label:automerge_ignore for example and take action.

Know issues:

  • Automerge does not work really well with repos that have Atlantis set to automatic plan every time there is a change in the code. This conflicts with the syncing from master + the atlantis plan comments and may end up with errors shown in the comments.
    • We may add a parameter to the config where we define the behaviour of automerge for specific repos.
      • ie: instead of syncing from master and comment, we can only sync
  • Doesn't have a --force option
  • Atlantis doesn't have an API to unlock pull requests, so we can't unlock everything before starting automerge, this may result in automerge being unable to plan specific pull requests until the lock is manually released. A solution may be to intercept the message, unlock it and plan it on the next run.