diff --git a/README.md b/README.md index 6c74bf2..695c6fe 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ -# `gh2jira` - Synchronize GitHub Code Scanning alerts and JIRA issues +# Synchronize GitHub Code Scanning alerts to Jira issues -[GitHub's REST API](https://docs.github.com/en/rest) and [webhooks](https://docs.github.com/en/developers/webhooks-and-events/about-webhooks) give customers the option of exporting alerts to any issue tracker, by allowing users to fetch the data via API endpoints and / or by receiving webhook POST requests to a hosted server. +[GitHub's REST API](https://docs.github.com/en/rest) and [webhooks](https://docs.github.com/en/developers/webhooks-and-events/about-webhooks) give customers the option of exporting alerts to any issue tracker, by allowing users to fetch the data via API endpoints and/or by receiving webhook POST requests to a hosted server. ## This repository -This repository gives a quick illustrative example of how to integrate GitHub Code Scanning with a third-party issue tracker - in this case JIRA. The code is intended as a proof-of-concept, showing the basic operations necessary to handle incoming requests from GitHub. It is not intended for production use. Please feel free to use this as a starting point for your own integration. +This repository gives a quick illustrative example of how to integrate GitHub Code Scanning with Jira. The code is intended as a proof-of-concept, showing the basic operations necessary to handle incoming requests from GitHub. Please feel free to use this as a starting point for your own integration. ## Using the GitHub Action The easiest way to use this tool is via its GitHub Action, which you can add to your workflows. Here is what you need before you can start: * A GitHub repository with Code Scanning enabled and a few alerts. Follow [this guide](https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository) to set up Code Scanning. -* The URL of your JIRA Server instance. -* A [JIRA project](https://confluence.atlassian.com/adminjiraserver/creating-a-project-938846813.html) to store your issues. You will need to provide its `project key` to the action. -* A JIRA Server account (username + password) with the following permissions for the abovementioned project: +* The URL of your Jira Server instance. +* A [Jira project](https://confluence.atlassian.com/adminjiraserver/creating-a-project-938846813.html) to store your issues. You will need to provide its `project key` to the action. +* A Jira Server account (username + password) with the following permissions for the abovementioned project: * `Browse Projects` * `Close Issues` * `Create Issues` * `Delete Issues` * `Edit Issues` * `Transition Issues` -* Depending on where you run your workflow, the JIRA Server instance must be accessible from either the [GitHub.com IP addresses](https://docs.github.com/en/github/authenticating-to-github/about-githubs-ip-addresses) or the address of your GitHub Enterprise Server instance. +* Depending on where you run your workflow, the Jira Server instance must be accessible from either the [GitHub.com IP addresses](https://docs.github.com/en/github/authenticating-to-github/about-githubs-ip-addresses) or the address of your GitHub Enterprise Server instance. Make sure you safely store all credentials as [GitHub Secrets](https://docs.github.com/en/actions/reference/encrypted-secrets). For accessing the Code Scanning alert data, the action uses the [GITHUB_TOKEN](https://docs.github.com/en/actions/reference/authentication-in-a-workflow#using-the-github_token-in-a-workflow) which is automatically created for you, so you don't need to provide it. Finally, set up the following workflow in your repository, e.g. by adding the file `.github/workflows/jira-sync.yml`: ```yaml -name: "Sync with JIRA" +name: "Sync GHAS to Jira" on: schedule: @@ -35,8 +35,8 @@ jobs: test_job: runs-on: ubuntu-latest steps: - - name: Sync with JIRA - uses: github/codescanning-jira-integration@master + - name: Sync alerts to Jira issues + uses: github/ghas-jira-integration@v1 with: jira_url: '' jira_user: '${{ secrets.JIRA_USER }}' @@ -45,7 +45,34 @@ jobs: sync_direction: 'gh2jira' ``` -This action will push any changes (new alerts, alerts deleted, alert states changed) to JIRA, by creating, deleting or changing the state of the corresponding JIRA issues. If you set `sync_direction` to `jira2gh`, it will synchronize the other way. Currently, two-way integration is not yet possible via the action. If you need it, use the CLI's `serve` command (see below). +This action will push any changes (new alerts, alerts deleted, alert states changed) to Jira, by creating, deleting or changing the state of the corresponding Jira issues. There are two sync directions for the field `sync_direction`: + +- `gh2jira` +- `jira2gh` + + +Using `gh2jira` means the alerts will sync from GitHub to Jira. If you set `sync_direction` to `jira2gh`, it will synchronize the other way. +Currently, two-way integration is not yet possible via the action. If you need it, use the CLI's `serve` command (see below). + +#### Other optional features for this Action + +##### Labels +You can also create labels for the Jira issues that are created. By using the example yaml below in your workflow, you can use multiple labels, and spaces will be respected. For example, if you add `red-team, blue team`, the labels would be created 'red-team' and 'blue team'. If this input is updated in the workflow, the existing JIRE issues will also be updated with the same labels. + +```yaml +with: + jira_labels: 'red-team,blue-team,green-team' +``` + +##### Custom transition states (end, reopen) +You can customize the end and reopen states if your Jira workflows don't use the default close/reopen states. + +```yaml +with: + issue_end_state: 'Closed' + issue_reopen_state: 'red-team-followup' +``` + ## Using the CLI's `sync` command @@ -81,7 +108,18 @@ pipenv run ./gh2jira sync \ Note: Instead of the `--gh-token` and `--jira-token` options, you may also set the `GH2JIRA_GH_TOKEN` and `GH2JIRA_JIRA_TOKEN` environment variables. The above command could be invoked via a cronjob every X minutes, to make sure issues and alerts are kept in sync. -Here an example for two-way integration: +#### Other optional features for the CLI + +There is an optional parameter you can use for creating labels in your Jira issues. As previously mentioned, spaces within the double quotes will be respected and saved. Just like the GitHub Actions way, the custom transition states are also optional when using the CLI. + + +```bash +--jira-labels "red-team,blue-team,green-team" +--issue-end-state "Closed" +--issue-reopen-state "blue-team-reopen" +``` + +Here's an example for a two-way integration: ```bash pipenv run ./gh2jira sync \ @@ -97,15 +135,20 @@ pipenv run ./gh2jira sync \ --direction both ``` -In this case the repository's state is stored in a JSON file (which will be created if it doesn't already exist). Alternatively, the state can also be stored in a dedicated JIRA issue via `--state-issue -` (this will automatically generate and update a storage issue within the same JIRA project). If the storage issue should be in a separate JIRA project, you can specify `--state-issue KEY-OF-THE-STORAGE-ISSUE`. +In this case the repository's state is stored in a JSON file (which will be created if it doesn't already exist). Alternatively, the state can also be stored in a dedicated Jira issue via `--state-issue -` (this will automatically generate and update a storage issue within the same Jira project). If the storage issue should be in a separate Jira project, you can specify `--state-issue KEY-OF-THE-STORAGE-ISSUE`. + +## Other CLI sync options + +
+The serve command ## Using the CLI's `serve` command -The following method is the most involved one, but currently the only one which allows two-way integration (i.e. changes to Code Scanning alerts trigger changes to JIRA issues and vice versa). It uses a lightweight `Flask` server to handle incoming JIRA and GitHub webhooks. The server is meant to be an example and not production-ready. +The following method is the most involved one, but currently the only one which allows two-way integration (i.e. changes to Code Scanning alerts trigger changes to Jira issues and vice versa). It uses a lightweight `Flask` server to handle incoming Jira and GitHub webhooks. The server is meant to be an example and not production-ready. In addition to the [usual requirements](#using-the-github-action) you also need: -* A machine with an address that can be reached from GitHub.com or your GitHub Enterprise Server instance and your JIRA Server instance. This machine will run the server. -* Webhooks set up, both, on GitHub and JIRA. On GitHub only repository or organization owners can do so. On JIRA it requires administrator access. +* A machine with an address that can be reached from GitHub.com or your GitHub Enterprise Server instance and your Jira Server instance. This machine will run the server. +* Webhooks set up, both, on GitHub and Jira. On GitHub only repository or organization owners can do so. On Jira, it requires administrator access. * A secret which will be used to verify webhook requests. First, [create a GitHub webhook](https://docs.github.com/en/developers/webhooks-and-events/creating-webhooks) with the following event triggers: @@ -114,7 +157,7 @@ First, [create a GitHub webhook](https://docs.github.com/en/developers/webhooks- This can be either a repository or an organization-wide hook. Set the `Payload URL` to `https:///github`, the `Content type` to `application/json` and insert your webhook `Secret`. Make sure to `Enable SSL verification`. -Second, [register a webhook on JIRA](https://developer.atlassian.com/server/jira/platform/webhooks/#registering-a-webhook). Give your webhook a `Name` and enter the `URL`: `https:///jira?secret_token=`. In the `Events` section specify `All issues` and mark the boxes `created`, `updated` and `deleted`. Click `Save`. +Second, [register a webhook on Jira](https://developer.atlassian.com/server/jira/platform/webhooks/#registering-a-webhook). Give your webhook a `Name` and enter the `URL`: `https:///jira?secret_token=`. In the `Events` section specify `All issues` and mark the boxes `created`, `updated` and `deleted`. Click `Save`. Finally, start the server: @@ -131,7 +174,9 @@ pipenv run ./gh2jira serve \ --direction both ``` -This will enable two-way integration between GitHub and JIRA. Note: Instead of the `--secret` option, you may also set the `GH2JIRA_SECRET` environment variable. +This will enable two-way integration between GitHub and Jira. Note: Instead of the `--secret` option, you may also set the `GH2JIRA_SECRET` environment variable. + +
## Contributing