@atlassian-dc-mcp/bitbucket 0.28.0 → 0.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/README.md +53 -1
- package/build/__tests__/bitbucket-service.test.js +25 -1
- package/build/__tests__/bitbucket-service.test.js.map +1 -1
- package/build/__tests__/bitbucket-token-optimization.test.js +11 -0
- package/build/__tests__/bitbucket-token-optimization.test.js.map +1 -1
- package/build/__tests__/merge-gateway.test.d.ts +2 -0
- package/build/__tests__/merge-gateway.test.d.ts.map +1 -0
- package/build/__tests__/merge-gateway.test.js +98 -0
- package/build/__tests__/merge-gateway.test.js.map +1 -0
- package/build/__tests__/pr-comment-mapper.test.js +91 -11
- package/build/__tests__/pr-comment-mapper.test.js.map +1 -1
- package/build/__tests__/pr-merge.test.d.ts +2 -0
- package/build/__tests__/pr-merge.test.d.ts.map +1 -0
- package/build/__tests__/pr-merge.test.js +166 -0
- package/build/__tests__/pr-merge.test.js.map +1 -0
- package/build/bitbucket-response-mapper.d.ts +10 -0
- package/build/bitbucket-response-mapper.d.ts.map +1 -1
- package/build/bitbucket-response-mapper.js +16 -0
- package/build/bitbucket-response-mapper.js.map +1 -1
- package/build/bitbucket-service.d.ts +53 -9
- package/build/bitbucket-service.d.ts.map +1 -1
- package/build/bitbucket-service.js +70 -15
- package/build/bitbucket-service.js.map +1 -1
- package/build/index.js +30 -4
- package/build/index.js.map +1 -1
- package/build/merge-gateway.d.ts +34 -0
- package/build/merge-gateway.d.ts.map +1 -0
- package/build/merge-gateway.js +86 -0
- package/build/merge-gateway.js.map +1 -0
- package/build/pr-comment-mapper.d.ts +3 -0
- package/build/pr-comment-mapper.d.ts.map +1 -1
- package/build/pr-comment-mapper.js +8 -3
- package/build/pr-comment-mapper.js.map +1 -1
- package/build/pr-merge.d.ts +23 -0
- package/build/pr-merge.d.ts.map +1 -0
- package/build/pr-merge.js +59 -0
- package/build/pr-merge.js.map +1 -0
- package/package.json +3 -3
- package/src/__tests__/bitbucket-service.test.ts +78 -1
- package/src/__tests__/bitbucket-token-optimization.test.ts +11 -0
- package/src/__tests__/merge-gateway.test.ts +119 -0
- package/src/__tests__/pr-comment-mapper.test.ts +95 -11
- package/src/__tests__/pr-merge.test.ts +206 -0
- package/src/bitbucket-response-mapper.ts +27 -0
- package/src/bitbucket-service.ts +75 -14
- package/src/index.ts +45 -6
- package/src/merge-gateway.ts +132 -0
- package/src/pr-comment-mapper.ts +11 -3
- package/src/pr-merge.ts +94 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { assertRepoMergeAllowed, assertTargetRefMergeAllowed, resolveMergeGateway, } from '../merge-gateway.js';
|
|
2
|
+
const silentWarn = () => undefined;
|
|
3
|
+
describe('resolveMergeGateway', () => {
|
|
4
|
+
it('is disabled by default', () => {
|
|
5
|
+
const gateway = resolveMergeGateway({ env: {}, warn: silentWarn });
|
|
6
|
+
expect(gateway.enabled).toBe(false);
|
|
7
|
+
expect(gateway.repos).toEqual([]);
|
|
8
|
+
});
|
|
9
|
+
it('stays disabled when enabled without any repository', () => {
|
|
10
|
+
const gateway = resolveMergeGateway({ env: { BITBUCKET_MERGE_ENABLED: 'true' }, warn: silentWarn });
|
|
11
|
+
expect(gateway.enabled).toBe(false);
|
|
12
|
+
});
|
|
13
|
+
it('stays disabled when every configured repository entry is malformed', () => {
|
|
14
|
+
const gateway = resolveMergeGateway({
|
|
15
|
+
env: { BITBUCKET_MERGE_ENABLED: 'true', BITBUCKET_MERGE_ALLOWED_REPOS: 'demo, PROJ/a/b, */*' },
|
|
16
|
+
warn: silentWarn,
|
|
17
|
+
});
|
|
18
|
+
expect(gateway.enabled).toBe(false);
|
|
19
|
+
});
|
|
20
|
+
it('normalizes repository entries and de-duplicates them', () => {
|
|
21
|
+
const gateway = resolveMergeGateway({
|
|
22
|
+
env: {
|
|
23
|
+
BITBUCKET_MERGE_ENABLED: 'yes',
|
|
24
|
+
BITBUCKET_MERGE_ALLOWED_REPOS: 'proj/Demo, PROJ/demo; OTHER/*',
|
|
25
|
+
},
|
|
26
|
+
warn: silentWarn,
|
|
27
|
+
});
|
|
28
|
+
expect(gateway.enabled).toBe(true);
|
|
29
|
+
expect(gateway.repos).toEqual(['PROJ/demo', 'OTHER/*']);
|
|
30
|
+
expect(gateway.targetRefs).toEqual([]);
|
|
31
|
+
});
|
|
32
|
+
it('expands bare branch names into fully-qualified target refs', () => {
|
|
33
|
+
const gateway = resolveMergeGateway({
|
|
34
|
+
env: {
|
|
35
|
+
BITBUCKET_MERGE_ENABLED: '1',
|
|
36
|
+
BITBUCKET_MERGE_ALLOWED_REPOS: 'PROJ/demo',
|
|
37
|
+
BITBUCKET_MERGE_ALLOWED_TARGET_REFS: 'develop, refs/heads/release/*',
|
|
38
|
+
},
|
|
39
|
+
warn: silentWarn,
|
|
40
|
+
});
|
|
41
|
+
expect(gateway.targetRefs).toEqual(['refs/heads/develop', 'refs/heads/release/*']);
|
|
42
|
+
});
|
|
43
|
+
it('warns about ignored entries and about being enabled with no valid repository', () => {
|
|
44
|
+
const warnings = [];
|
|
45
|
+
resolveMergeGateway({
|
|
46
|
+
env: { BITBUCKET_MERGE_ENABLED: 'true', BITBUCKET_MERGE_ALLOWED_REPOS: 'demo' },
|
|
47
|
+
warn: message => warnings.push(message),
|
|
48
|
+
});
|
|
49
|
+
expect(warnings).toHaveLength(2);
|
|
50
|
+
expect(warnings[0]).toContain('"demo"');
|
|
51
|
+
expect(warnings[1]).toContain('stay disabled');
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
describe('assertRepoMergeAllowed', () => {
|
|
55
|
+
const gateway = resolveMergeGateway({
|
|
56
|
+
env: { BITBUCKET_MERGE_ENABLED: 'true', BITBUCKET_MERGE_ALLOWED_REPOS: 'PROJ/demo, OTHER/*' },
|
|
57
|
+
warn: silentWarn,
|
|
58
|
+
});
|
|
59
|
+
it('refuses everything when merging is disabled', () => {
|
|
60
|
+
expect(() => assertRepoMergeAllowed({ enabled: false, repos: [], targetRefs: [] }, 'PROJ', 'demo'))
|
|
61
|
+
.toThrow(/disabled on this server/);
|
|
62
|
+
});
|
|
63
|
+
it('allows an exact repository regardless of the casing used by the caller', () => {
|
|
64
|
+
expect(() => assertRepoMergeAllowed(gateway, 'proj', 'DEMO')).not.toThrow();
|
|
65
|
+
});
|
|
66
|
+
it('allows any repository in a wildcard project', () => {
|
|
67
|
+
expect(() => assertRepoMergeAllowed(gateway, 'OTHER', 'anything')).not.toThrow();
|
|
68
|
+
});
|
|
69
|
+
it('refuses a repository outside the allowed list', () => {
|
|
70
|
+
expect(() => assertRepoMergeAllowed(gateway, 'PROJ', 'other-repo')).toThrow(/not allowed in PROJ\/other-repo/);
|
|
71
|
+
});
|
|
72
|
+
it('does not treat a wildcard project as a prefix of another project', () => {
|
|
73
|
+
expect(() => assertRepoMergeAllowed(gateway, 'OTHERS', 'demo')).toThrow(/not allowed/);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
describe('assertTargetRefMergeAllowed', () => {
|
|
77
|
+
const unrestricted = { enabled: true, repos: ['PROJ/demo'], targetRefs: [] };
|
|
78
|
+
const restricted = {
|
|
79
|
+
enabled: true,
|
|
80
|
+
repos: ['PROJ/demo'],
|
|
81
|
+
targetRefs: ['refs/heads/develop', 'refs/heads/release/*'],
|
|
82
|
+
};
|
|
83
|
+
it('allows any ref when no target-ref restriction is configured', () => {
|
|
84
|
+
expect(() => assertTargetRefMergeAllowed(unrestricted, 'refs/heads/master')).not.toThrow();
|
|
85
|
+
expect(() => assertTargetRefMergeAllowed(unrestricted, undefined)).not.toThrow();
|
|
86
|
+
});
|
|
87
|
+
it('allows an exact and a wildcard target ref', () => {
|
|
88
|
+
expect(() => assertTargetRefMergeAllowed(restricted, 'refs/heads/develop')).not.toThrow();
|
|
89
|
+
expect(() => assertTargetRefMergeAllowed(restricted, 'refs/heads/release/1.2')).not.toThrow();
|
|
90
|
+
});
|
|
91
|
+
it('refuses a target ref outside the allowed list', () => {
|
|
92
|
+
expect(() => assertTargetRefMergeAllowed(restricted, 'refs/heads/master')).toThrow(/refs\/heads\/master is not allowed/);
|
|
93
|
+
});
|
|
94
|
+
it('refuses when the target ref is unknown but restrictions apply', () => {
|
|
95
|
+
expect(() => assertTargetRefMergeAllowed(restricted, undefined)).toThrow(/Could not determine the target branch/);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
//# sourceMappingURL=merge-gateway.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-gateway.test.js","sourceRoot":"","sources":["../../src/__tests__/merge-gateway.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,8 @@ describe('PR Comment Mapper', () => {
|
|
|
100
100
|
},
|
|
101
101
|
comments: [],
|
|
102
102
|
threadResolved: false,
|
|
103
|
-
state: "OPEN"
|
|
103
|
+
state: "OPEN",
|
|
104
|
+
severity: "NORMAL"
|
|
104
105
|
}
|
|
105
106
|
},
|
|
106
107
|
{
|
|
@@ -120,11 +121,79 @@ describe('PR Comment Mapper', () => {
|
|
|
120
121
|
displayName: "User B"
|
|
121
122
|
},
|
|
122
123
|
commentCount: 1,
|
|
123
|
-
unresolvedCount: 1
|
|
124
|
+
unresolvedCount: 1,
|
|
125
|
+
blockerCount: 0,
|
|
126
|
+
unresolvedBlockerCount: 0
|
|
124
127
|
}
|
|
125
128
|
};
|
|
126
129
|
expect(result).toEqual(expectedResult);
|
|
127
130
|
});
|
|
131
|
+
it('should expose BLOCKER severity so tasks are distinguishable from normal comments', () => {
|
|
132
|
+
const blockerResponse = {
|
|
133
|
+
...validPRResponse,
|
|
134
|
+
values: [
|
|
135
|
+
{
|
|
136
|
+
id: 1001,
|
|
137
|
+
createdDate: 1600000000000,
|
|
138
|
+
user: createUser('reviewer1', 106, 'Reviewer One'),
|
|
139
|
+
action: 'COMMENTED',
|
|
140
|
+
commentAction: 'ADDED',
|
|
141
|
+
comment: createComment({
|
|
142
|
+
id: 2010,
|
|
143
|
+
text: 'Blocking: fix this',
|
|
144
|
+
severity: 'BLOCKER',
|
|
145
|
+
comments: [
|
|
146
|
+
createComment({
|
|
147
|
+
id: 2011,
|
|
148
|
+
text: 'Reply keeps its own severity',
|
|
149
|
+
anchor: undefined,
|
|
150
|
+
severity: 'NORMAL'
|
|
151
|
+
})
|
|
152
|
+
]
|
|
153
|
+
})
|
|
154
|
+
}
|
|
155
|
+
]
|
|
156
|
+
};
|
|
157
|
+
const result = simplifyBitbucketPRComments(blockerResponse);
|
|
158
|
+
expect(result.activities[0].comment?.severity).toBe('BLOCKER');
|
|
159
|
+
expect(result.activities[0].comment?.comments[0].severity).toBe('NORMAL');
|
|
160
|
+
});
|
|
161
|
+
it('should count blockers and unresolved blockers by task state in the summary', () => {
|
|
162
|
+
const blockerResponse = {
|
|
163
|
+
...validPRResponse,
|
|
164
|
+
values: [
|
|
165
|
+
openedActivity,
|
|
166
|
+
{
|
|
167
|
+
id: 1010,
|
|
168
|
+
createdDate: 1600000003000,
|
|
169
|
+
user: createUser('reviewer1', 106, 'Reviewer One'),
|
|
170
|
+
action: 'COMMENTED',
|
|
171
|
+
commentAction: 'ADDED',
|
|
172
|
+
comment: createComment({ id: 2020, text: 'Unresolved task', severity: 'BLOCKER', state: 'OPEN' })
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
id: 1011,
|
|
176
|
+
createdDate: 1600000004000,
|
|
177
|
+
user: createUser('reviewer1', 106, 'Reviewer One'),
|
|
178
|
+
action: 'COMMENTED',
|
|
179
|
+
commentAction: 'ADDED',
|
|
180
|
+
comment: createComment({ id: 2021, text: 'Ticked task', severity: 'BLOCKER', state: 'RESOLVED' })
|
|
181
|
+
},
|
|
182
|
+
{
|
|
183
|
+
id: 1012,
|
|
184
|
+
createdDate: 1600000005000,
|
|
185
|
+
user: createUser('reviewer1', 106, 'Reviewer One'),
|
|
186
|
+
action: 'COMMENTED',
|
|
187
|
+
commentAction: 'ADDED',
|
|
188
|
+
comment: createComment({ id: 2022, text: 'Just a note', severity: 'NORMAL', state: 'OPEN' })
|
|
189
|
+
}
|
|
190
|
+
]
|
|
191
|
+
};
|
|
192
|
+
const result = simplifyBitbucketPRComments(blockerResponse);
|
|
193
|
+
expect(result.summary.commentCount).toBe(3);
|
|
194
|
+
expect(result.summary.blockerCount).toBe(2);
|
|
195
|
+
expect(result.summary.unresolvedBlockerCount).toBe(1);
|
|
196
|
+
});
|
|
128
197
|
it('should preserve nested replies recursively', () => {
|
|
129
198
|
const threadedResponse = {
|
|
130
199
|
...validPRResponse,
|
|
@@ -177,11 +246,13 @@ describe('PR Comment Mapper', () => {
|
|
|
177
246
|
createdDate: 1600000000000,
|
|
178
247
|
comments: [],
|
|
179
248
|
threadResolved: false,
|
|
180
|
-
state: "OPEN"
|
|
249
|
+
state: "OPEN",
|
|
250
|
+
severity: "NORMAL"
|
|
181
251
|
}
|
|
182
252
|
],
|
|
183
253
|
threadResolved: false,
|
|
184
|
-
state: "OPEN"
|
|
254
|
+
state: "OPEN",
|
|
255
|
+
severity: "NORMAL"
|
|
185
256
|
}
|
|
186
257
|
]);
|
|
187
258
|
});
|
|
@@ -248,7 +319,8 @@ describe('PR Comment Mapper', () => {
|
|
|
248
319
|
},
|
|
249
320
|
comments: [],
|
|
250
321
|
threadResolved: false,
|
|
251
|
-
state: 'OPEN'
|
|
322
|
+
state: 'OPEN',
|
|
323
|
+
severity: 'NORMAL'
|
|
252
324
|
}
|
|
253
325
|
}
|
|
254
326
|
]);
|
|
@@ -306,11 +378,13 @@ describe('PR Comment Mapper', () => {
|
|
|
306
378
|
createdDate: 1600000000000,
|
|
307
379
|
comments: [],
|
|
308
380
|
threadResolved: true,
|
|
309
|
-
state: 'OPEN'
|
|
381
|
+
state: 'OPEN',
|
|
382
|
+
severity: 'NORMAL'
|
|
310
383
|
}
|
|
311
384
|
],
|
|
312
385
|
threadResolved: true,
|
|
313
|
-
state: 'OPEN'
|
|
386
|
+
state: 'OPEN',
|
|
387
|
+
severity: 'NORMAL'
|
|
314
388
|
});
|
|
315
389
|
expect(getCommentSummary(resolvedThreadResponse, { includeResolved: true })).toEqual([
|
|
316
390
|
'User A on config.yml:6: Resolved thread root'
|
|
@@ -351,7 +425,8 @@ describe('PR Comment Mapper', () => {
|
|
|
351
425
|
createdDate: 1600000000000,
|
|
352
426
|
comments: [],
|
|
353
427
|
threadResolved: false,
|
|
354
|
-
state: "OPEN"
|
|
428
|
+
state: "OPEN",
|
|
429
|
+
severity: "NORMAL"
|
|
355
430
|
}
|
|
356
431
|
]);
|
|
357
432
|
});
|
|
@@ -392,7 +467,8 @@ describe('PR Comment Mapper', () => {
|
|
|
392
467
|
createdDate: 1600000000000,
|
|
393
468
|
comments: [],
|
|
394
469
|
threadResolved: false,
|
|
395
|
-
state: "OPEN"
|
|
470
|
+
state: "OPEN",
|
|
471
|
+
severity: "NORMAL"
|
|
396
472
|
}
|
|
397
473
|
]);
|
|
398
474
|
expect(() => formatToolResponse(result)).not.toThrow();
|
|
@@ -407,7 +483,9 @@ describe('PR Comment Mapper', () => {
|
|
|
407
483
|
summary: {
|
|
408
484
|
totalActivities: 0,
|
|
409
485
|
commentCount: 0,
|
|
410
|
-
unresolvedCount: 0
|
|
486
|
+
unresolvedCount: 0,
|
|
487
|
+
blockerCount: 0,
|
|
488
|
+
unresolvedBlockerCount: 0
|
|
411
489
|
}
|
|
412
490
|
};
|
|
413
491
|
expect(result).toEqual(expectedResult);
|
|
@@ -427,7 +505,9 @@ describe('PR Comment Mapper', () => {
|
|
|
427
505
|
summary: {
|
|
428
506
|
totalActivities: 0,
|
|
429
507
|
commentCount: 0,
|
|
430
|
-
unresolvedCount: 0
|
|
508
|
+
unresolvedCount: 0,
|
|
509
|
+
blockerCount: 0,
|
|
510
|
+
unresolvedBlockerCount: 0
|
|
431
511
|
}
|
|
432
512
|
};
|
|
433
513
|
expect(result).toEqual(expectedResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pr-comment-mapper.test.js","sourceRoot":"","sources":["../../src/__tests__/pr-comment-mapper.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pr-comment-mapper.test.js","sourceRoot":"","sources":["../../src/__tests__/pr-comment-mapper.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pr-merge.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/pr-merge.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
import { PullRequestsService } from '../bitbucket-client/index.js';
|
|
2
|
+
import { fetchMergeability, mergePullRequest } from '../pr-merge.js';
|
|
3
|
+
jest.mock('../bitbucket-client/index.js', () => ({
|
|
4
|
+
PullRequestsService: {
|
|
5
|
+
canMerge: jest.fn(),
|
|
6
|
+
merge: jest.fn(),
|
|
7
|
+
get3: jest.fn(),
|
|
8
|
+
},
|
|
9
|
+
OpenAPI: { BASE: '', TOKEN: '', VERSION: '' },
|
|
10
|
+
}));
|
|
11
|
+
const canMerge = PullRequestsService.canMerge;
|
|
12
|
+
const merge = PullRequestsService.merge;
|
|
13
|
+
const getPullRequest = PullRequestsService.get3;
|
|
14
|
+
const OPEN_GATEWAY = { enabled: true, repos: ['PROJ/demo'], targetRefs: [] };
|
|
15
|
+
const CLEAN = { canMerge: true, conflicted: false, outcome: 'CLEAN', vetoes: [] };
|
|
16
|
+
const MERGED_PR = {
|
|
17
|
+
id: 42,
|
|
18
|
+
version: 3,
|
|
19
|
+
title: 'Add merge tool',
|
|
20
|
+
state: 'MERGED',
|
|
21
|
+
fromRef: { id: 'refs/heads/feature' },
|
|
22
|
+
toRef: { id: 'refs/heads/develop' },
|
|
23
|
+
reviewers: [],
|
|
24
|
+
};
|
|
25
|
+
const baseParams = {
|
|
26
|
+
projectKey: 'PROJ',
|
|
27
|
+
repositorySlug: 'demo',
|
|
28
|
+
pullRequestId: '42',
|
|
29
|
+
version: 2,
|
|
30
|
+
};
|
|
31
|
+
describe('fetchMergeability', () => {
|
|
32
|
+
beforeEach(() => jest.clearAllMocks());
|
|
33
|
+
it('shapes vetoes into summary/detail pairs', async () => {
|
|
34
|
+
canMerge.mockResolvedValue({
|
|
35
|
+
canMerge: false,
|
|
36
|
+
conflicted: false,
|
|
37
|
+
outcome: 'VETOED',
|
|
38
|
+
vetoes: [{ summaryMessage: 'Not enough approvals', detailedMessage: '2 required, 1 given' }],
|
|
39
|
+
});
|
|
40
|
+
const result = await fetchMergeability('PROJ', 'demo', '42');
|
|
41
|
+
expect(canMerge).toHaveBeenCalledWith('PROJ', '42', 'demo');
|
|
42
|
+
expect(result.data).toEqual({
|
|
43
|
+
canMerge: false,
|
|
44
|
+
conflicted: false,
|
|
45
|
+
outcome: 'VETOED',
|
|
46
|
+
vetoes: [{ summary: 'Not enough approvals', detail: '2 required, 1 given' }],
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
it('reports API failures without shaping', async () => {
|
|
50
|
+
canMerge.mockRejectedValue(new Error('boom'));
|
|
51
|
+
const result = await fetchMergeability('PROJ', 'demo', '42');
|
|
52
|
+
expect(result.success).toBe(false);
|
|
53
|
+
expect(result.error).toBe('boom');
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
describe('mergePullRequest', () => {
|
|
57
|
+
beforeEach(() => jest.clearAllMocks());
|
|
58
|
+
it('merges with the version as an optimistic lock and returns a compact ack', async () => {
|
|
59
|
+
canMerge.mockResolvedValue(CLEAN);
|
|
60
|
+
merge.mockResolvedValue(MERGED_PR);
|
|
61
|
+
const result = await mergePullRequest({ ...baseParams, gateway: OPEN_GATEWAY });
|
|
62
|
+
expect(merge).toHaveBeenCalledWith('PROJ', '42', 'demo', '2', { version: 2 });
|
|
63
|
+
expect(result.success).toBe(true);
|
|
64
|
+
expect(result.data).toEqual({
|
|
65
|
+
id: 42,
|
|
66
|
+
version: 3,
|
|
67
|
+
title: 'Add merge tool',
|
|
68
|
+
state: 'MERGED',
|
|
69
|
+
fromRefId: 'refs/heads/feature',
|
|
70
|
+
toRefId: 'refs/heads/develop',
|
|
71
|
+
reviewerCount: 0,
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
it('passes the strategy and message through, and can return the full payload', async () => {
|
|
75
|
+
canMerge.mockResolvedValue(CLEAN);
|
|
76
|
+
merge.mockResolvedValue(MERGED_PR);
|
|
77
|
+
const result = await mergePullRequest({
|
|
78
|
+
...baseParams,
|
|
79
|
+
gateway: OPEN_GATEWAY,
|
|
80
|
+
strategyId: 'squash',
|
|
81
|
+
message: 'Squashed',
|
|
82
|
+
output: 'full',
|
|
83
|
+
});
|
|
84
|
+
expect(merge).toHaveBeenCalledWith('PROJ', '42', 'demo', '2', {
|
|
85
|
+
version: 2,
|
|
86
|
+
strategyId: 'squash',
|
|
87
|
+
message: 'Squashed',
|
|
88
|
+
});
|
|
89
|
+
expect(result.data).toBe(MERGED_PR);
|
|
90
|
+
});
|
|
91
|
+
it('refuses without any request when merging is disabled', async () => {
|
|
92
|
+
const result = await mergePullRequest({
|
|
93
|
+
...baseParams,
|
|
94
|
+
gateway: { enabled: false, repos: [], targetRefs: [] },
|
|
95
|
+
});
|
|
96
|
+
expect(result.success).toBe(false);
|
|
97
|
+
expect(result.error).toMatch(/disabled on this server/);
|
|
98
|
+
expect(canMerge).not.toHaveBeenCalled();
|
|
99
|
+
expect(merge).not.toHaveBeenCalled();
|
|
100
|
+
});
|
|
101
|
+
it('refuses a repository outside the allowed list without any request', async () => {
|
|
102
|
+
const result = await mergePullRequest({
|
|
103
|
+
...baseParams,
|
|
104
|
+
repositorySlug: 'other-repo',
|
|
105
|
+
gateway: OPEN_GATEWAY,
|
|
106
|
+
});
|
|
107
|
+
expect(result.success).toBe(false);
|
|
108
|
+
expect(result.error).toMatch(/not allowed in PROJ\/other-repo/);
|
|
109
|
+
expect(merge).not.toHaveBeenCalled();
|
|
110
|
+
});
|
|
111
|
+
it('refuses a target branch outside the allowed refs and never merges', async () => {
|
|
112
|
+
getPullRequest.mockResolvedValue({ toRef: { id: 'refs/heads/master' } });
|
|
113
|
+
const result = await mergePullRequest({
|
|
114
|
+
...baseParams,
|
|
115
|
+
gateway: { enabled: true, repos: ['PROJ/demo'], targetRefs: ['refs/heads/develop'] },
|
|
116
|
+
});
|
|
117
|
+
expect(result.success).toBe(false);
|
|
118
|
+
expect(result.error).toMatch(/refs\/heads\/master is not allowed/);
|
|
119
|
+
expect(canMerge).not.toHaveBeenCalled();
|
|
120
|
+
expect(merge).not.toHaveBeenCalled();
|
|
121
|
+
});
|
|
122
|
+
it('merges when the pull request targets an allowed branch', async () => {
|
|
123
|
+
getPullRequest.mockResolvedValue({ toRef: { id: 'refs/heads/release/1.2' } });
|
|
124
|
+
canMerge.mockResolvedValue(CLEAN);
|
|
125
|
+
merge.mockResolvedValue(MERGED_PR);
|
|
126
|
+
const result = await mergePullRequest({
|
|
127
|
+
...baseParams,
|
|
128
|
+
gateway: { enabled: true, repos: ['PROJ/demo'], targetRefs: ['refs/heads/release/*'] },
|
|
129
|
+
});
|
|
130
|
+
expect(result.success).toBe(true);
|
|
131
|
+
expect(merge).toHaveBeenCalled();
|
|
132
|
+
});
|
|
133
|
+
it('does not fetch the pull request when target branches are unrestricted', async () => {
|
|
134
|
+
canMerge.mockResolvedValue(CLEAN);
|
|
135
|
+
merge.mockResolvedValue(MERGED_PR);
|
|
136
|
+
await mergePullRequest({ ...baseParams, gateway: OPEN_GATEWAY });
|
|
137
|
+
expect(getPullRequest).not.toHaveBeenCalled();
|
|
138
|
+
});
|
|
139
|
+
it('refuses a conflicted pull request before issuing the merge', async () => {
|
|
140
|
+
canMerge.mockResolvedValue({ canMerge: false, conflicted: true, outcome: 'CONFLICTED', vetoes: [] });
|
|
141
|
+
const result = await mergePullRequest({ ...baseParams, gateway: OPEN_GATEWAY });
|
|
142
|
+
expect(result.success).toBe(false);
|
|
143
|
+
expect(result.error).toMatch(/has conflicts/);
|
|
144
|
+
expect(merge).not.toHaveBeenCalled();
|
|
145
|
+
});
|
|
146
|
+
it('refuses a vetoed pull request and reports the veto reasons', async () => {
|
|
147
|
+
canMerge.mockResolvedValue({
|
|
148
|
+
canMerge: false,
|
|
149
|
+
conflicted: false,
|
|
150
|
+
vetoes: [{ summaryMessage: 'Unresolved tasks', detailedMessage: '1 open task' }],
|
|
151
|
+
});
|
|
152
|
+
const result = await mergePullRequest({ ...baseParams, gateway: OPEN_GATEWAY });
|
|
153
|
+
expect(result.success).toBe(false);
|
|
154
|
+
expect(result.error).toMatch(/merge check vetoed the merge\. Unresolved tasks — 1 open task/);
|
|
155
|
+
expect(merge).not.toHaveBeenCalled();
|
|
156
|
+
});
|
|
157
|
+
it('surfaces a server-side merge failure such as a stale version', async () => {
|
|
158
|
+
canMerge.mockResolvedValue(CLEAN);
|
|
159
|
+
merge.mockRejectedValue({ status: 409, statusText: 'Conflict', body: { errors: [{ message: 'stale' }] } });
|
|
160
|
+
const result = await mergePullRequest({ ...baseParams, gateway: OPEN_GATEWAY });
|
|
161
|
+
expect(result.success).toBe(false);
|
|
162
|
+
expect(result.error).toBe('Error merging pull request: 409 Conflict');
|
|
163
|
+
expect(result.details).toEqual({ errors: [{ message: 'stale' }] });
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
//# sourceMappingURL=pr-merge.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pr-merge.test.js","sourceRoot":"","sources":["../../src/__tests__/pr-merge.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,15 @@ export type BitbucketMutationOutputMode = 'ack' | 'full';
|
|
|
4
4
|
export declare function shapePullRequestCommentsResponse(response: BitbucketPRApiResponse, output?: BitbucketOutputMode, options?: PullRequestCommentOptions): Record<string, any>;
|
|
5
5
|
export declare function shapePullRequestChangesResponse(response: any, output?: BitbucketOutputMode): Record<string, any>;
|
|
6
6
|
export declare function shapePullRequestAck(pullRequest: any): Record<string, any>;
|
|
7
|
+
export interface MergeVeto {
|
|
8
|
+
summary?: string;
|
|
9
|
+
detail?: string;
|
|
10
|
+
}
|
|
11
|
+
export declare function shapeMergeability(mergeability: any): {
|
|
12
|
+
canMerge: boolean;
|
|
13
|
+
conflicted: boolean;
|
|
14
|
+
outcome?: string;
|
|
15
|
+
vetoes: MergeVeto[];
|
|
16
|
+
};
|
|
7
17
|
export declare function shapePullRequestCommentAck(comment: any): Record<string, any>;
|
|
8
18
|
//# sourceMappingURL=bitbucket-response-mapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket-response-mapper.d.ts","sourceRoot":"","sources":["../src/bitbucket-response-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAGtB,KAAK,yBAAyB,EAE/B,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,2BAA2B,GAAG,KAAK,GAAG,MAAM,CAAC;AAoBzD,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,sBAAsB,EAChC,MAAM,GAAE,mBAA+B,EACvC,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"bitbucket-response-mapper.d.ts","sourceRoot":"","sources":["../src/bitbucket-response-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAGtB,KAAK,yBAAyB,EAE/B,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,2BAA2B,GAAG,KAAK,GAAG,MAAM,CAAC;AAoBzD,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,sBAAsB,EAChC,MAAM,GAAE,mBAA+B,EACvC,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAyBrB;AAED,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAE,mBAA+B,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA2B3H;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAYzE;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,GAAG,GAAG;IACpD,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,CAWA;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA0B5E"}
|
|
@@ -31,6 +31,8 @@ export function shapePullRequestCommentsResponse(response, output = 'compact', o
|
|
|
31
31
|
totalActivities: Array.isArray(filteredResponse.values) ? filteredResponse.values.length : 0,
|
|
32
32
|
commentCount: getCommentSummary(filteredResponse, options).length,
|
|
33
33
|
unresolvedCount: 0,
|
|
34
|
+
blockerCount: 0,
|
|
35
|
+
unresolvedBlockerCount: 0,
|
|
34
36
|
},
|
|
35
37
|
items: getCommentSummary(filteredResponse, options),
|
|
36
38
|
};
|
|
@@ -74,12 +76,26 @@ export function shapePullRequestAck(pullRequest) {
|
|
|
74
76
|
...(link ? { link } : {}),
|
|
75
77
|
};
|
|
76
78
|
}
|
|
79
|
+
export function shapeMergeability(mergeability) {
|
|
80
|
+
const vetoes = Array.isArray(mergeability?.vetoes) ? mergeability.vetoes : [];
|
|
81
|
+
return {
|
|
82
|
+
canMerge: mergeability?.canMerge === true,
|
|
83
|
+
conflicted: mergeability?.conflicted === true,
|
|
84
|
+
...(typeof mergeability?.outcome === 'string' ? { outcome: mergeability.outcome } : {}),
|
|
85
|
+
vetoes: vetoes.map((veto) => ({
|
|
86
|
+
...(typeof veto?.summaryMessage === 'string' ? { summary: veto.summaryMessage } : {}),
|
|
87
|
+
...(typeof veto?.detailedMessage === 'string' ? { detail: veto.detailedMessage } : {}),
|
|
88
|
+
})),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
77
91
|
export function shapePullRequestCommentAck(comment) {
|
|
78
92
|
const link = getLink(comment?.links);
|
|
79
93
|
return {
|
|
80
94
|
...(comment?.id !== undefined ? { id: comment.id } : {}),
|
|
81
95
|
...(comment?.parent?.id !== undefined ? { parentId: comment.parent.id } : {}),
|
|
82
96
|
...(typeof comment?.state === 'string' ? { state: comment.state } : {}),
|
|
97
|
+
...(typeof comment?.threadResolved === 'boolean' ? { threadResolved: comment.threadResolved } : {}),
|
|
98
|
+
...(typeof comment?.severity === 'string' ? { severity: comment.severity } : {}),
|
|
83
99
|
pending: comment?.state === 'PENDING',
|
|
84
100
|
...(typeof comment?.anchor?.path === 'string'
|
|
85
101
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitbucket-response-mapper.js","sourceRoot":"","sources":["../src/bitbucket-response-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EACzB,iBAAiB,EAEjB,2BAA2B,EAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAKvF,SAAS,OAAO,CAAC,KAAU;IACzB,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC;IAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,EAAE,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,IAAI,KAAK,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,QAAgC,EAChC,SAA8B,SAAS,EACvC,UAAqC,EAAE;IAEvC,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,MAAM,OAAO,GAAG,2BAA2B,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACvE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,IAAI,IAAI;QAClG,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;YAC1B,CAAC,CAAC,OAAO,CAAC,OAAO;YACjB,CAAC,CAAC;gBACE,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5F,YAAY,EAAE,iBAAiB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,MAAM;gBACjE,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"bitbucket-response-mapper.js","sourceRoot":"","sources":["../src/bitbucket-response-mapper.ts"],"names":[],"mappings":"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"}
|