Skip to content

Commit 8c6577d

Browse files
authored
👽️ Update to Bitbucket Server 9.2 (#15)
* 👽️ Update to Bitbucket Server 9.2 * 👽️ Upgrade Bitbucket Cloud
1 parent c0678bb commit 8c6577d

File tree

5 files changed

+4645
-3589
lines changed

5 files changed

+4645
-3589
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"preopenapi-typescript:cloud": "curl --output ./src/cloud/openapi/swagger.v3.json https://dac-static.atlassian.com/cloud/bitbucket/swagger.v3.json",
4545
"openapi-typescript:cloud": "openapi-typescript ./src/cloud/openapi/swagger.v3.json --output ./src/cloud/openapi/openapi-typescript.ts --immutable --empty-objects-unknown --alphabetize --root-types",
4646
"postopenapi-typescript:cloud": "ts-autofix ./src/cloud/openapi && pnpm run lint:fix",
47-
"preopenapi-typescript:server": "curl --output ./src/server/openapi/swagger.v3.json https://dac-static.atlassian.com/server/bitbucket/9.1.swagger.v3.json",
47+
"preopenapi-typescript:server": "curl --output ./src/server/openapi/swagger.v3.json https://dac-static.atlassian.com/server/bitbucket/9.2.swagger.v3.json",
4848
"openapi-typescript:server": "openapi-typescript ./src/server/openapi/swagger.v3.json --output ./src/server/openapi/openapi-typescript.ts --immutable --empty-objects-unknown --alphabetize --root-types",
4949
"postopenapi-typescript:server": "ts-autofix ./src/server/openapi && pnpm run lint:fix"
5050
},

src/cloud/openapi/openapi-typescript.ts

+32-1
Original file line numberDiff line numberDiff line change
@@ -10368,6 +10368,11 @@ export interface paths {
1036810368
headers: Readonly<Record<string, unknown>>
1036910369
content?: never
1037010370
}
10371+
/** @description Unable to merge because one of the refs involved changed while attempting to merge */
10372+
readonly 409: {
10373+
headers: Readonly<Record<string, unknown>>
10374+
content?: never
10375+
}
1037110376
/** @description If the merge took too long and timed out.
1037210377
* In this case the caller should retry the request later */
1037310378
readonly 555: {
@@ -10491,6 +10496,11 @@ export interface paths {
1049110496
headers: Readonly<Record<string, unknown>>
1049210497
content?: never
1049310498
}
10499+
/** @description Unable to merge because one of the refs involved changed while attempting to merge */
10500+
readonly 409: {
10501+
headers: Readonly<Record<string, unknown>>
10502+
content?: never
10503+
}
1049410504
}
1049510505
}
1049610506
readonly put?: never
@@ -18949,6 +18959,9 @@ export interface components {
1894918959
readonly merge_strategies?: readonly (
1895018960
| "fast_forward"
1895118961
| "merge_commit"
18962+
| "rebase_fast_forward"
18963+
| "rebase_merge"
18964+
| "squash_fast_forward"
1895218965
| "squash"
1895318966
)[]
1895418967
})
@@ -22044,6 +22057,9 @@ export interface components {
2204422057
readonly merge_strategies?: readonly (
2204522058
| "fast_forward"
2204622059
| "merge_commit"
22060+
| "rebase_fast_forward"
22061+
| "rebase_merge"
22062+
| "squash_fast_forward"
2204722063
| "squash"
2204822064
)[]
2204922065
readonly name?: string
@@ -22066,7 +22082,13 @@ export interface components {
2206622082
* @default merge_commit
2206722083
* @enum {string}
2206822084
*/
22069-
readonly merge_strategy?: "fast_forward" | "merge_commit" | "squash"
22085+
readonly merge_strategy?:
22086+
| "fast_forward"
22087+
| "merge_commit"
22088+
| "rebase_fast_forward"
22089+
| "rebase_merge"
22090+
| "squash_fast_forward"
22091+
| "squash"
2207022092
/** @description The commit message that will be used on the resulting commit. Note that the size of the message is limited to 128 KiB. */
2207122093
readonly message?: string
2207222094
readonly type: string
@@ -22826,6 +22848,15 @@ export interface components {
2282622848
(Readonly<Record<string, unknown>> & {
2282722849
/** Format: date-time */
2282822850
readonly created_on?: string
22851+
/**
22852+
* @description Controls the rules for forking repositories within this workspace.
22853+
*
22854+
* * **allow_forks**: unrestricted forking
22855+
* * **internal_only**: prevents forking of private repositories outside the workspace or to public repositories
22856+
*
22857+
* @enum {string}
22858+
*/
22859+
readonly forking_mode?: "allow_forks" | "internal_only"
2282922860
/** @description Indicates whether the workspace enforces private content, or whether it allows public content. */
2283022861
readonly is_privacy_enforced?: boolean
2283122862
/** @description Indicates whether the workspace is publicly accessible, or whether it is

src/cloud/openapi/swagger.v3.json

+44-6
Original file line numberDiff line numberDiff line change
@@ -14571,6 +14571,9 @@
1457114571
"202": {
1457214572
"description": "In the Location header, the URL to poll for the pull request merge status"
1457314573
},
14574+
"409": {
14575+
"description": "Unable to merge because one of the refs involved changed while attempting to merge"
14576+
},
1457414577
"555": {
1457514578
"description": "If the merge took too long and timed out.\nIn this case the caller should retry the request later",
1457614579
"content": {
@@ -14668,6 +14671,9 @@
1466814671
},
1466914672
"403": {
1467014673
"description": "The user making the request does not have permission to the repo and is different from the user who queued the task"
14674+
},
14675+
"409": {
14676+
"description": "Unable to merge because one of the refs involved changed while attempting to merge"
1467114677
}
1467214678
},
1467314679
"security": [
@@ -15821,7 +15827,10 @@
1582115827
"merge_strategies": [
1582215828
"merge_commit",
1582315829
"squash",
15824-
"fast_forward"
15830+
"fast_forward",
15831+
"squash_fast_forward",
15832+
"rebase_fast_forward",
15833+
"rebase_merge"
1582515834
],
1582615835
"type": "branch",
1582715836
"target": {
@@ -16133,7 +16142,10 @@
1613316142
"merge_strategies": [
1613416143
"merge_commit",
1613516144
"squash",
16136-
"fast_forward"
16145+
"fast_forward",
16146+
"squash_fast_forward",
16147+
"rebase_fast_forward",
16148+
"rebase_merge"
1613716149
],
1613816150
"type": "branch",
1613916151
"target": {
@@ -24659,7 +24671,7 @@
2465924671
"description": "A workspace is where you create repositories, collaborate on\nyour code, and organize different streams of work in your Bitbucket\nCloud account. Workspaces replace the use of teams and users in API\ncalls.\n"
2466024672
}
2466124673
],
24662-
"x-revision": "33b035ea9108",
24674+
"x-revision": "6e8ad69baf7f",
2466324675
"x-atlassian-narrative": {
2466424676
"documents": [
2466524677
{
@@ -29978,7 +29990,14 @@
2997829990
"merge_strategy": {
2997929991
"type": "string",
2998029992
"description": "The merge strategy that will be used to merge the pull request.",
29981-
"enum": ["merge_commit", "squash", "fast_forward"],
29993+
"enum": [
29994+
"merge_commit",
29995+
"squash",
29996+
"fast_forward",
29997+
"squash_fast_forward",
29998+
"rebase_fast_forward",
29999+
"rebase_merge"
30000+
],
2998230001
"default": "merge_commit"
2998330002
}
2998430003
},
@@ -30004,7 +30023,14 @@
3000430023
"description": "Available merge strategies, when this endpoint is the destination of the pull request.",
3000530024
"items": {
3000630025
"type": "string",
30007-
"enum": ["merge_commit", "squash", "fast_forward"]
30026+
"enum": [
30027+
"merge_commit",
30028+
"squash",
30029+
"fast_forward",
30030+
"squash_fast_forward",
30031+
"rebase_fast_forward",
30032+
"rebase_merge"
30033+
]
3000830034
}
3000930035
},
3001030036
"default_merge_strategy": {
@@ -31914,6 +31940,11 @@
3191431940
"type": "boolean",
3191531941
"description": "Indicates whether the workspace enforces private content, or whether it allows public content."
3191631942
},
31943+
"forking_mode": {
31944+
"type": "string",
31945+
"description": "Controls the rules for forking repositories within this workspace.\n\n* **allow_forks**: unrestricted forking\n* **internal_only**: prevents forking of private repositories outside the workspace or to public repositories\n",
31946+
"enum": ["allow_forks", "internal_only"]
31947+
},
3191731948
"created_on": {
3191831949
"type": "string",
3191931950
"format": "date-time"
@@ -32362,7 +32393,14 @@
3236232393
"description": "Available merge strategies for pull requests targeting this branch.",
3236332394
"items": {
3236432395
"type": "string",
32365-
"enum": ["merge_commit", "squash", "fast_forward"]
32396+
"enum": [
32397+
"merge_commit",
32398+
"squash",
32399+
"fast_forward",
32400+
"squash_fast_forward",
32401+
"rebase_fast_forward",
32402+
"rebase_merge"
32403+
]
3236632404
}
3236732405
},
3236832406
"default_merge_strategy": {

0 commit comments

Comments
 (0)