actions/git-backporting
1
0
Fork 0
mirror of https://github.com/kiegroup/git-backporting.git synced 2025-04-24 20:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: moved to @kiegroup organization

Browse source 
Starting from v4 the package/project has been moved under @kiegroup
organization.
This commit is contained in:
Andrea Lamparelli 2023-07-06 12:34:01 +02:00
parent 1343ba5ec0
commit 7575463881
11 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
CHANGELOG.md
View file

@ -1,58 +1,58 @@
# Changelog # Changelog
## [3.1.1](https://github.com/lampajr/backporting/compare/v3.1.0...v3.1.1) (2023-07-06) ## [3.1.1](https://github.com/kiegroup/git-backporting/compare/v3.1.0...v3.1.1) (2023-07-06)
## [3.1.0](https://github.com/lampajr/backporting/compare/v3.0.0...v3.1.0) (2023-07-05) ## [3.1.0](https://github.com/kiegroup/git-backporting/compare/v3.0.0...v3.1.0) (2023-07-05)
### Features ### Features
* config file as option ([#42](https://github.com/lampajr/backporting/issues/42)) ([5ead31f](https://github.com/lampajr/backporting/commit/5ead31f606b585ecdf7ed2e9de8ebd841b935898)) * config file as option ([#42](https://github.com/kiegroup/git-backporting/issues/42)) ([5ead31f](https://github.com/kiegroup/git-backporting/commit/5ead31f606b585ecdf7ed2e9de8ebd841b935898))
## [3.0.0](https://github.com/lampajr/backporting/compare/v2.2.1...v3.0.0) (2023-07-01) ## [3.0.0](https://github.com/kiegroup/git-backporting/compare/v2.2.1...v3.0.0) (2023-07-01)
### Features ### Features
* integrate tool with gitlab service ([#39](https://github.com/lampajr/backporting/issues/39)) ([107f5e5](https://github.com/lampajr/backporting/commit/107f5e52d663157145aa14f6cf7fa4d6704cb844)) * integrate tool with gitlab service ([#39](https://github.com/kiegroup/git-backporting/issues/39)) ([107f5e5](https://github.com/kiegroup/git-backporting/commit/107f5e52d663157145aa14f6cf7fa4d6704cb844))
### Bug Fixes ### Bug Fixes
* removed 'powered by..' pr body suffix ([6869bec](https://github.com/lampajr/backporting/commit/6869becb3e5979b24f6fe29bf38141e15c1bdc66)) * removed 'powered by..' pr body suffix ([6869bec](https://github.com/kiegroup/git-backporting/commit/6869becb3e5979b24f6fe29bf38141e15c1bdc66))
## [2.2.1](https://github.com/lampajr/backporting/compare/v2.2.0...v2.2.1) (2023-06-27) ## [2.2.1](https://github.com/kiegroup/git-backporting/compare/v2.2.0...v2.2.1) (2023-06-27)
### Bug Fixes ### Bug Fixes
* fix gha no-inherit-reviewers input ([8b586cc](https://github.com/lampajr/backporting/commit/8b586ccdfe0e6b90ed41ea8a5eecdbc24893fe25)) * fix gha no-inherit-reviewers input ([8b586cc](https://github.com/kiegroup/git-backporting/commit/8b586ccdfe0e6b90ed41ea8a5eecdbc24893fe25))
## [2.2.0](https://github.com/lampajr/backporting/compare/v2.1.0...v2.2.0) (2023-06-22) ## [2.2.0](https://github.com/kiegroup/git-backporting/compare/v2.1.0...v2.2.0) (2023-06-22)
### Features ### Features
* override backporting pr fields ([#38](https://github.com/lampajr/backporting/issues/38)) ([a32e8cd](https://github.com/lampajr/backporting/commit/a32e8cd34c757358668fe8f88f6d1733d3fa8391)) * override backporting pr fields ([#38](https://github.com/kiegroup/git-backporting/issues/38)) ([a32e8cd](https://github.com/kiegroup/git-backporting/commit/a32e8cd34c757358668fe8f88f6d1733d3fa8391))
## [2.1.0](https://github.com/lampajr/backporting/compare/v2.0.1...v2.1.0) (2023-06-20) ## [2.1.0](https://github.com/kiegroup/git-backporting/compare/v2.0.1...v2.1.0) (2023-06-20)
### Features ### Features
* **issue-17:** override backporting pr data ([#29](https://github.com/lampajr/backporting/issues/29)) ([941beda](https://github.com/lampajr/backporting/commit/941beda208e4a8c1577bd4d39299fbbfbf569c06)) * **issue-17:** override backporting pr data ([#29](https://github.com/kiegroup/git-backporting/issues/29)) ([941beda](https://github.com/kiegroup/git-backporting/commit/941beda208e4a8c1577bd4d39299fbbfbf569c06))
### Bug Fixes ### Bug Fixes
* gha input parser ([95b35aa](https://github.com/lampajr/backporting/commit/95b35aa4efb86e2bc4990d920feec1ec5c4eb8e4)) * gha input parser ([95b35aa](https://github.com/kiegroup/git-backporting/commit/95b35aa4efb86e2bc4990d920feec1ec5c4eb8e4))
## [2.0.1](https://github.com/lampajr/backporting/compare/v2.0.0...v2.0.1) (2023-01-05) ## [2.0.1](https://github.com/kiegroup/git-backporting/compare/v2.0.0...v2.0.1) (2023-01-05)
## [2.0.0](https://github.com/lampajr/backporting/compare/v1.0.0...v2.0.0) (2023-01-05) ## [2.0.0](https://github.com/kiegroup/git-backporting/compare/v1.0.0...v2.0.0) (2023-01-05)
### Features ### Features
* backport still open pull requests ([b3936e0](https://github.com/lampajr/backporting/commit/b3936e019a19976281c5e2582904264e974b8b42)) * backport still open pull requests ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
* pull request backporting ([b3936e0](https://github.com/lampajr/backporting/commit/b3936e019a19976281c5e2582904264e974b8b42)) * pull request backporting ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))

24
README.md
View file

@ -5,17 +5,17 @@
</h1> </h1>
<p align="center"> <p align="center">
<a href="https://github.com/lampajr/backporting"> <a href="https://github.com/kiegroup/git-backporting">
<img alt="ci checks status" src="https://github.com/lampajr/backporting/actions/workflows/ci.yml/badge.svg"> <img alt="ci checks status" src="https://github.com/kiegroup/git-backporting/actions/workflows/ci.yml/badge.svg">
</a> </a>
<a href="https://badge.fury.io/js/@lampajr%2Fbper"> <a href="https://badge.fury.io/js/@kie%2Fbper">
<img alt="npm version" src="https://badge.fury.io/js/@lampajr%2Fbper.svg"> <img alt="npm version" src="https://badge.fury.io/js/@kie%2Fbper.svg">
</a> </a>
</p> </p>
--- ---
## :tada: BPER v3 is out!! You can backport Gitlab merge requests now :tada: ## :bangbang: Starting from v4 bper has been moved under @kiegroup organization :bangbang:
--- ---
@ -47,9 +47,11 @@ Therefore this tools is for anybody who is working on projects where they have t
This tool is released on the [public npm registry](https://www.npmjs.com/), therefore it can be easily installed using `npm`: This tool is released on the [public npm registry](https://www.npmjs.com/), therefore it can be easily installed using `npm`:
```bash ```bash
$ npm install -g @lampajr/bper $ npm install -g @kie/bper
``` ```
> **NOTE**: if you want to download version 3 or older you must use the older scope `@lampajr` instead of `@kie`.
Then you just have to choose the pull request (or merge request on *Gitlab*) that you would like to backport and the target branch and the simply run the following command: Then you just have to choose the pull request (or merge request on *Gitlab*) that you would like to backport and the target branch and the simply run the following command:
```bash ```bash
@ -58,7 +60,7 @@ $ bper -tb <branch> -pr <pull-request-url> -a <git-token>
A real example could be the following one: A real example could be the following one:
```bash ```bash
$ bper -tb develop -pr https://github.com/lampajr/backporting-example/pull/47 -a ***** $ bper -tb develop -pr https://github.com/kiegroup/git-backporting-example/pull/47 -a *****
``` ```
This is the easiest invocation where you let the tool set / compute most of the backported pull request data. Obviously most of that data can be overridden with appropriate tool options, more details can be found in the [inputs](#inputs) section. This is the easiest invocation where you let the tool set / compute most of the backported pull request data. Obviously most of that data can be overridden with appropriate tool options, more details can be found in the [inputs](#inputs) section.
@ -77,7 +79,7 @@ This tool comes with some inputs that allow users to override the default behavi
| Version | -V, --version | - | Current version of the tool | | | Version | -V, --version | - | Current version of the tool | |
| Help | -h, --help | - | Display the help message | | | Help | -h, --help | - | Display the help message | |
| Target Branch | -tb, --target-branch | N | Branch where the changes must be backported to | | | Target Branch | -tb, --target-branch | N | Branch where the changes must be backported to | |
| Pull Request | -pr, --pull-request | N | Original pull request url, the one that must be backported, e.g., https://github.com/lampajr/backporting/pull/1 | | | Pull Request | -pr, --pull-request | N | Original pull request url, the one that must be backported, e.g., https://github.com/kiegroup/git-backporting/pull/1 | |
| Configuration File | -cf, --config-file | N | Configuration file, in JSON format, containing all options to be overridded, note that if provided all other CLI options will be ignored | | | Configuration File | -cf, --config-file | N | Configuration file, in JSON format, containing all options to be overridded, note that if provided all other CLI options will be ignored | |
| Auth | -a, --auth | N | `GITHUB_TOKEN`, `GITLAB_TOKEN` or a `repo` scoped [Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) | "" | | Auth | -a, --auth | N | `GITHUB_TOKEN`, `GITLAB_TOKEN` or a `repo` scoped [Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) | "" |
| Folder | -f, --folder | N | Local folder full name of the repository that will be checked out, e.g., /tmp/folder | {cwd}/bp | | Folder | -f, --folder | N | Local folder full name of the repository that will be checked out, e.g., /tmp/folder | {cwd}/bp |
@ -147,7 +149,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Backporting - name: Backporting
uses: lampajr/backporting@main uses: kiegroup/git-backporting@main
with: with:
target-branch: ${{ inputs.targetBranch }} target-branch: ${{ inputs.targetBranch }}
pull-request: ${{ inputs.pullRequest }} pull-request: ${{ inputs.pullRequest }}
@ -186,7 +188,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Backporting - name: Backporting
uses: lampajr/backporting@main uses: kiegroup/git-backporting@main
with: with:
target-branch: v1 target-branch: v1
pull-request: ${{ github.event.pull_request.url }} pull-request: ${{ github.event.pull_request.url }}
@ -247,7 +249,7 @@ Every change must be submitted through a *GitHub* pull request (PR). Backporting
> **Note**: this project follows [git-conventional-commits](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13) standards, thanks to the [commit-msg hook](./.husky/commit-msg) you are not allowed to use commits that do not follow those standards. > **Note**: this project follows [git-conventional-commits](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13) standards, thanks to the [commit-msg hook](./.husky/commit-msg) you are not allowed to use commits that do not follow those standards.
1. Fork it (https://github.com/lampajr/backporting). 1. Fork it (https://github.com/kiegroup/git-backporting).
2. Create your feature branch: (git checkout -b feature). 2. Create your feature branch: (git checkout -b feature).

2
action.yml
View file

@ -2,7 +2,7 @@ name: "Backporting GitHub Action"
description: "GitHub action providing an automated way to backport pull requests from one branch to another" description: "GitHub action providing an automated way to backport pull requests from one branch to another"
inputs: inputs:
pull-request: pull-request:
description: "URL of the pull request to backport, e.g., https://github.com/lampajr/backporting/pull/1" description: "URL of the pull request to backport, e.g., https://github.com/kiegroup/git-backporting/pull/1"
required: false required: false
target-branch: target-branch:
description: "Branch where the pull request must be backported to" description: "Branch where the pull request must be backported to"

14
dist/cli/index.js vendored
View file

@ -145,7 +145,7 @@ class CLIArgsParser extends args_parser_1.default {
.version(package_json_1.version) .version(package_json_1.version)
.description(package_json_1.description) .description(package_json_1.description)
.option("-tb, --target-branch <branch>", "branch where changes must be backported to.") .option("-tb, --target-branch <branch>", "branch where changes must be backported to.")
.option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/lampajr/backporting/pull/1.") .option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/kiegroup/git-backporting/pull/1.")
.option("-d, --dry-run", "if enabled the tool does not create any pull request nor push anything remotely") .option("-d, --dry-run", "if enabled the tool does not create any pull request nor push anything remotely")
.option("-a, --auth <auth>", "git service authentication string, e.g., github token.") .option("-a, --auth <auth>", "git service authentication string, e.g., github token.")
.option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'.") .option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'.")
@ -342,7 +342,7 @@ class GitCLIService {
} }
/** /**
* Update the provided remote URL by adding the auth token if not empty * Update the provided remote URL by adding the auth token if not empty
* @param remoteURL remote link, e.g., https://github.com/lampajr/backporting-example.git * @param remoteURL remote link, e.g., https://github.com/kiegroup/git-backporting-example.git
*/ */
remoteWithAuth(remoteURL) { remoteWithAuth(remoteURL) {
if (this.auth && this.gitData.user) { if (this.auth && this.gitData.user) {
@ -737,7 +737,7 @@ class OctokitFactory {
OctokitFactory.logger.info("Creating octokit instance."); OctokitFactory.logger.info("Creating octokit instance.");
OctokitFactory.octokit = new rest_1.Octokit({ OctokitFactory.octokit = new rest_1.Octokit({
auth: token, auth: token,
userAgent: "lampajr/backporting", userAgent: "kiegroup/git-backporting",
baseUrl: apiUrl baseUrl: apiUrl
}); });
} }
@ -771,7 +771,7 @@ class GitLabClient {
baseURL: this.apiUrl, baseURL: this.apiUrl,
headers: { headers: {
Authorization: token ? `Bearer ${token}` : "", Authorization: token ? `Bearer ${token}` : "",
"User-Agent": "lampajr/backporting", "User-Agent": "kiegroup/git-backporting",
}, },
httpsAgent: new https_1.default.Agent({ httpsAgent: new https_1.default.Agent({
rejectUnauthorized rejectUnauthorized
@ -786,7 +786,7 @@ class GitLabClient {
return "noreply@gitlab.com"; return "noreply@gitlab.com";
} }
// READ // READ
// example: <host>/api/v4/projects/alampare%2Fbackporting-example/merge_requests/1 // example: <host>/api/v4/projects/<namespace>%2Fbackporting-example/merge_requests/1
async getPullRequest(namespace, repo, mrNumber) { async getPullRequest(namespace, repo, mrNumber) {
const projectId = this.getProjectId(namespace, repo); const projectId = this.getProjectId(namespace, repo);
const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`); const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`);
@ -876,7 +876,7 @@ class GitLabClient {
} }
/** /**
* Extract repository namespace, project and mr number from the merge request url * Extract repository namespace, project and mr number from the merge request url
* example: <host>/alampare/backporting-example/-/merge_requests/1 * example: <host>/<namespace>/backporting-example/-/merge_requests/1
* note: "-/" could be omitted * note: "-/" could be omitted
* @param mrUrl merge request url * @param mrUrl merge request url
* @returns {{owner: string, project: string}} * @returns {{owner: string, project: string}}
@ -23331,7 +23331,7 @@ module.exports = axios;
/***/ ((module) => { /***/ ((module) => {
"use strict"; "use strict";
module.exports = JSON.parse('{"name":"@lampajr/bper","version":"3.1.1","description":"BPer is a tool to execute automatic git backporting.","author":"","license":"MIT","private":false,"main":"./dist/gha/index.js","bin":{"bper":"./dist/cli/index.js"},"files":["dist/cli/index.js"],"scripts":{"prepare":"husky install","clean":"rm -rf ./build ./dist","compile":"tsc -p tsconfig.json && tsc-alias -p tsconfig.json","package":"npm run package:cli && npm run package:gha","package:cli":"ncc build ./build/src/bin/cli.js -o dist/cli","package:gha":"ncc build ./build/src/bin/gha.js -o dist/gha","build":"npm run clean && npm run compile && npm run package","test":"jest","test:report":"npm test -- --coverage --testResultsProcessor=jest-sonar-reporter","lint":"eslint . --ext .ts","lint:fix":"npm run lint -- --fix","ts-node":"ts-node","postversion":"npm run build && git add dist && rm -rf build","release":"release-it","release:branch":"git checkout -b release/$(release-it --release-version) main","release:prepare":"release-it --no-npm.publish --no-github.release --no-git.push --no-git.tag --no-git.requireUpstream","release:prepare:all":"npm run release:branch && npm run release:prepare"},"repository":{"type":"git","url":"git+https://github.com/lampajr/backporting.git"},"keywords":["backporting","pull-requests","github-action","cherry-pick"],"bugs":{"url":"https://github.com/lampajr/backporting/issues"},"homepage":"https://github.com/lampajr/backporting#readme","devDependencies":{"@commitlint/cli":"^17.4.0","@commitlint/config-conventional":"^17.4.0","@gitbeaker/rest":"^39.1.0","@kie/mock-github":"^1.1.0","@release-it/conventional-changelog":"^5.1.1","@types/fs-extra":"^9.0.13","@types/jest":"^29.2.4","@types/node":"^18.11.17","@typescript-eslint/eslint-plugin":"^5.47.0","@typescript-eslint/parser":"^5.47.0","@vercel/ncc":"^0.36.0","eslint":"^8.30.0","husky":"^8.0.2","jest":"^29.0.0","jest-sonar-reporter":"^2.0.0","release-it":"^15.6.0","semver":"^7.3.8","ts-jest":"^29.0.0","ts-node":"^10.8.1","tsc-alias":"^1.8.2","tsconfig-paths":"^4.1.0","typescript":"^4.9.3","@octokit/webhooks-types":"^6.8.0"},"dependencies":{"@actions/core":"^1.10.0","@octokit/rest":"^18.12.0","axios":"^1.4.0","commander":"^9.3.0","fs-extra":"^11.1.0","https":"^1.0.0","simple-git":"^3.15.1"}}'); module.exports = JSON.parse('{"name":"@kie/bper","version":"3.1.1","description":"BPer is a tool to execute automatic git backporting.","author":"","license":"MIT","private":false,"main":"./dist/gha/index.js","bin":{"bper":"./dist/cli/index.js"},"files":["dist/cli/index.js"],"scripts":{"prepare":"husky install","clean":"rm -rf ./build ./dist","compile":"tsc -p tsconfig.json && tsc-alias -p tsconfig.json","package":"npm run package:cli && npm run package:gha","package:cli":"ncc build ./build/src/bin/cli.js -o dist/cli","package:gha":"ncc build ./build/src/bin/gha.js -o dist/gha","build":"npm run clean && npm run compile && npm run package","test":"jest","test:report":"npm test -- --coverage --testResultsProcessor=jest-sonar-reporter","lint":"eslint . --ext .ts","lint:fix":"npm run lint -- --fix","ts-node":"ts-node","postversion":"npm run build && git add dist && rm -rf build","release":"release-it","release:branch":"git checkout -b release/$(release-it --release-version) main","release:prepare":"release-it --no-npm.publish --no-github.release --no-git.push --no-git.tag --no-git.requireUpstream","release:prepare:all":"npm run release:branch && npm run release:prepare"},"repository":{"type":"git","url":"git+https://github.com/kiegroup/git-backporting.git"},"keywords":["backporting","pull-requests","github-action","cherry-pick"],"bugs":{"url":"https://github.com/kiegroup/git-backporting/issues"},"homepage":"https://github.com/kiegroup/git-backporting#readme","devDependencies":{"@commitlint/cli":"^17.4.0","@commitlint/config-conventional":"^17.4.0","@gitbeaker/rest":"^39.1.0","@kie/mock-github":"^1.1.0","@release-it/conventional-changelog":"^5.1.1","@types/fs-extra":"^9.0.13","@types/jest":"^29.2.4","@types/node":"^18.11.17","@typescript-eslint/eslint-plugin":"^5.47.0","@typescript-eslint/parser":"^5.47.0","@vercel/ncc":"^0.36.0","eslint":"^8.30.0","husky":"^8.0.2","jest":"^29.0.0","jest-sonar-reporter":"^2.0.0","release-it":"^15.6.0","semver":"^7.3.8","ts-jest":"^29.0.0","ts-node":"^10.8.1","tsc-alias":"^1.8.2","tsconfig-paths":"^4.1.0","typescript":"^4.9.3","@octokit/webhooks-types":"^6.8.0"},"dependencies":{"@actions/core":"^1.10.0","@octokit/rest":"^18.12.0","axios":"^1.4.0","commander":"^9.3.0","fs-extra":"^11.1.0","https":"^1.0.0","simple-git":"^3.15.1"}}');
/***/ }), /***/ }),

10
dist/gha/index.js vendored
View file

@ -331,7 +331,7 @@ class GitCLIService {
} }
/** /**
* Update the provided remote URL by adding the auth token if not empty * Update the provided remote URL by adding the auth token if not empty
* @param remoteURL remote link, e.g., https://github.com/lampajr/backporting-example.git * @param remoteURL remote link, e.g., https://github.com/kiegroup/git-backporting-example.git
*/ */
remoteWithAuth(remoteURL) { remoteWithAuth(remoteURL) {
if (this.auth && this.gitData.user) { if (this.auth && this.gitData.user) {
@ -726,7 +726,7 @@ class OctokitFactory {
OctokitFactory.logger.info("Creating octokit instance."); OctokitFactory.logger.info("Creating octokit instance.");
OctokitFactory.octokit = new rest_1.Octokit({ OctokitFactory.octokit = new rest_1.Octokit({
auth: token, auth: token,
userAgent: "lampajr/backporting", userAgent: "kiegroup/git-backporting",
baseUrl: apiUrl baseUrl: apiUrl
}); });
} }
@ -760,7 +760,7 @@ class GitLabClient {
baseURL: this.apiUrl, baseURL: this.apiUrl,
headers: { headers: {
Authorization: token ? `Bearer ${token}` : "", Authorization: token ? `Bearer ${token}` : "",
"User-Agent": "lampajr/backporting", "User-Agent": "kiegroup/git-backporting",
}, },
httpsAgent: new https_1.default.Agent({ httpsAgent: new https_1.default.Agent({
rejectUnauthorized rejectUnauthorized
@ -775,7 +775,7 @@ class GitLabClient {
return "noreply@gitlab.com"; return "noreply@gitlab.com";
} }
// READ // READ
// example: <host>/api/v4/projects/alampare%2Fbackporting-example/merge_requests/1 // example: <host>/api/v4/projects/<namespace>%2Fbackporting-example/merge_requests/1
async getPullRequest(namespace, repo, mrNumber) { async getPullRequest(namespace, repo, mrNumber) {
const projectId = this.getProjectId(namespace, repo); const projectId = this.getProjectId(namespace, repo);
const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`); const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`);
@ -865,7 +865,7 @@ class GitLabClient {
} }
/** /**
* Extract repository namespace, project and mr number from the merge request url * Extract repository namespace, project and mr number from the merge request url
* example: <host>/alampare/backporting-example/-/merge_requests/1 * example: <host>/<namespace>/backporting-example/-/merge_requests/1
* note: "-/" could be omitted * note: "-/" could be omitted
* @param mrUrl merge request url * @param mrUrl merge request url
* @returns {{owner: string, project: string}} * @returns {{owner: string, project: string}}

4
package-lock.json generated
View file

@ -1,11 +1,11 @@
{ {
"name": "@lampajr/bper", "name": "@kie/bper",
"version": "3.1.1", "version": "3.1.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@lampajr/bper", "name": "@kie/bper",
"version": "3.1.1", "version": "3.1.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

8
package.json
View file

@ -1,5 +1,5 @@
{ {
"name": "@lampajr/bper", "name": "@kie/bper",
"version": "3.1.1", "version": "3.1.1",
"description": "BPer is a tool to execute automatic git backporting.", "description": "BPer is a tool to execute automatic git backporting.",
"author": "", "author": "",
@ -33,7 +33,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/lampajr/backporting.git" "url": "git+https://github.com/kiegroup/git-backporting.git"
}, },
"keywords": [ "keywords": [
"backporting", "backporting",
@ -42,9 +42,9 @@
"cherry-pick" "cherry-pick"
], ],
"bugs": { "bugs": {
"url": "https://github.com/lampajr/backporting/issues" "url": "https://github.com/kiegroup/git-backporting/issues"
}, },
"homepage": "https://github.com/lampajr/backporting#readme", "homepage": "https://github.com/kiegroup/git-backporting#readme",
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^17.4.0", "@commitlint/cli": "^17.4.0",
"@commitlint/config-conventional": "^17.4.0", "@commitlint/config-conventional": "^17.4.0",

2
src/service/args/cli/cli-args-parser.ts
View file

@ -17,7 +17,7 @@ export default class CLIArgsParser extends ArgsParser {
.version(version) .version(version)
.description(description) .description(description)
.option("-tb, --target-branch <branch>", "branch where changes must be backported to.") .option("-tb, --target-branch <branch>", "branch where changes must be backported to.")
.option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/lampajr/backporting/pull/1.") .option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/kiegroup/git-backporting/pull/1.")
.option("-d, --dry-run", "if enabled the tool does not create any pull request nor push anything remotely") .option("-d, --dry-run", "if enabled the tool does not create any pull request nor push anything remotely")
.option("-a, --auth <auth>", "git service authentication string, e.g., github token.") .option("-a, --auth <auth>", "git service authentication string, e.g., github token.")
.option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'.") .option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'.")

2
src/service/git/git-cli.ts
View file

@ -32,7 +32,7 @@ export default class GitCLIService {
/** /**
* Update the provided remote URL by adding the auth token if not empty * Update the provided remote URL by adding the auth token if not empty
* @param remoteURL remote link, e.g., https://github.com/lampajr/backporting-example.git * @param remoteURL remote link, e.g., https://github.com/kiegroup/git-backporting-example.git
*/ */
private remoteWithAuth(remoteURL: string): string { private remoteWithAuth(remoteURL: string): string {
if (this.auth && this.gitData.user) { if (this.auth && this.gitData.user) {

2
src/service/git/github/octokit-factory.ts
View file

@ -15,7 +15,7 @@ export default class OctokitFactory {
OctokitFactory.logger.info("Creating octokit instance."); OctokitFactory.logger.info("Creating octokit instance.");
OctokitFactory.octokit = new Octokit({ OctokitFactory.octokit = new Octokit({
auth: token, auth: token,
userAgent: "lampajr/backporting", userAgent: "kiegroup/git-backporting",
baseUrl: apiUrl baseUrl: apiUrl
}); });
} }

6
src/service/git/gitlab/gitlab-client.ts
View file

@ -21,7 +21,7 @@ export default class GitLabClient implements GitClient {
baseURL: this.apiUrl, baseURL: this.apiUrl,
headers: { headers: {
Authorization: token ? `Bearer ${token}` : "", Authorization: token ? `Bearer ${token}` : "",
"User-Agent": "lampajr/backporting", "User-Agent": "kiegroup/git-backporting",
}, },
httpsAgent: new https.Agent({ httpsAgent: new https.Agent({
rejectUnauthorized rejectUnauthorized
@ -40,7 +40,7 @@ export default class GitLabClient implements GitClient {
// READ // READ
// example: <host>/api/v4/projects/alampare%2Fbackporting-example/merge_requests/1 // example: <host>/api/v4/projects/<namespace>%2Fbackporting-example/merge_requests/1
async getPullRequest(namespace: string, repo: string, mrNumber: number): Promise<GitPullRequest> { async getPullRequest(namespace: string, repo: string, mrNumber: number): Promise<GitPullRequest> {
const projectId = this.getProjectId(namespace, repo); const projectId = this.getProjectId(namespace, repo);
const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`); const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`);
@ -144,7 +144,7 @@ export default class GitLabClient implements GitClient {
/** /**
* Extract repository namespace, project and mr number from the merge request url * Extract repository namespace, project and mr number from the merge request url
* example: <host>/alampare/backporting-example/-/merge_requests/1 * example: <host>/<namespace>/backporting-example/-/merge_requests/1
* note: "-/" could be omitted * note: "-/" could be omitted
* @param mrUrl merge request url * @param mrUrl merge request url
* @returns {{owner: string, project: string}} * @returns {{owner: string, project: string}}