Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 100 additions & 2 deletions doc/compiled.json
Original file line number Diff line number Diff line change
Expand Up @@ -5021,6 +5021,20 @@
}
}
},
"202": {
"description": "Accepted",
"headers": {
"X-Rate-Limit-Limit": {
"$ref": "#/components/headers/X-Rate-Limit-Limit"
},
"X-Rate-Limit-Remaining": {
"$ref": "#/components/headers/X-Rate-Limit-Remaining"
},
"X-Rate-Limit-Reset": {
"$ref": "#/components/headers/X-Rate-Limit-Reset"
}
}
},
"204": {
"description": "The resource was deleted successfully.",
"headers": {
Expand Down Expand Up @@ -5080,6 +5094,20 @@
}
}
},
"409": {
"description": "Conflict",
"headers": {
"X-Rate-Limit-Limit": {
"$ref": "#/components/headers/X-Rate-Limit-Limit"
},
"X-Rate-Limit-Remaining": {
"$ref": "#/components/headers/X-Rate-Limit-Remaining"
},
"X-Rate-Limit-Reset": {
"$ref": "#/components/headers/X-Rate-Limit-Reset"
}
}
},
"422": {
"description": "Unprocessable entity",
"content": {
Expand Down Expand Up @@ -18434,7 +18462,7 @@
"/projects/{project_id}/branches/{name}/sync": {
"patch": {
"summary": "Sync a branch",
"description": "Sync an existing branch.\n\n*Note: Only available for branches created with new branching. New branching is currently in private beta*\n",
"description": "Sync an existing branch.\n\n*Note: Only available for branches created with new branching.*\n",
"operationId": "branch/sync",
"tags": [
"Branches"
Expand Down Expand Up @@ -18508,7 +18536,7 @@
"/projects/{project_id}/branches/{name}/compare": {
"get": {
"summary": "Compare branches",
"description": "Compare branch with main branch. \n\n*Note: Comparing a branch may take several minutes depending on the project size.*\n",
"description": "Compare branch with main branch.\n\n*Note: Comparing a branch may take several minutes depending on the project size. Consider using the `POST /compare` endpoint for creating comparison asynchronously.*\n",
"operationId": "branch/compare",
"tags": [
"Branches"
Expand Down Expand Up @@ -18554,6 +18582,10 @@
"404": {
"$ref": "#/components/responses/404"
},
"409": {
"$ref": "#/components/responses/409",
"description": "A comparison is already in progress for this branch."
},
"429": {
"$ref": "#/components/responses/429"
}
Expand All @@ -18569,6 +18601,72 @@
}
],
"x-cli-version": "2.5"
},
"post": {
"summary": "Create comparison (async.)",
"description": "Create a branch comparison asynchronously.\n",
"operationId": "branch/comparison/create",
"tags": [
"Branches"
],
"parameters": [
{
"$ref": "#/components/parameters/X-PhraseApp-OTP"
},
{
"$ref": "#/components/parameters/project_id"
},
{
"$ref": "#/components/parameters/name"
}
],
"responses": {
"202": {
"$ref": "#/components/responses/202"
},
"400": {
"$ref": "#/components/responses/400"
},
"404": {
"$ref": "#/components/responses/404"
},
"409": {
"$ref": "#/components/responses/409",
"description": "An asynchronous comparison is already in progress for this branch."
},
"429": {
"$ref": "#/components/responses/429"
}
},
"x-code-samples": [
{
"lang": "Curl",
"source": "curl \"https://api.phrase.com/v2/projects/:project_id/branches/:name/compare\" \\\n -u USERNAME_OR_ACCESS_TOKEN \\\n -X POST \\\n -d '{\"direction\":\"merge\"}' \\\n -H 'Content-Type: application/json'"
},
{
"lang": "CLI v2",
"source": "phrase branches create_comparison \\\n--project_id <project_id> \\\n--name <name> \\\n--access_token <token>"
}
],
"requestBody": {
"required": true,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this required, considering that the only parameter is optional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not , but the pipeline is failing when this is set to false, I don't remember the exact location of the failure but I can trigger it again. I think that's why we don't have any required: false under requestBody in .yml files (at least I don't see any). I guess we'd need to check this separately 😬

"content": {
"application/json": {
"schema": {
"type": "object",
"title": "branch/create_comparison/parameters",
"properties": {
"direction": {
"description": "direction of comparison, possible values are sync or merge (only for v2 branches)",
"type": "string",
"example": "merge",
"default": "merge"
}
}
}
}
}
}
}
},
"/accounts": {
Expand Down
2 changes: 2 additions & 0 deletions paths.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@
"/projects/{project_id}/branches/{name}/compare":
get:
"$ref": "./paths/branches/compare.yaml"
post:
"$ref": "./paths/branches/create_comparison.yaml"
"/accounts":
get:
"$ref": "./paths/accounts/index.yaml"
Expand Down
9 changes: 6 additions & 3 deletions paths/branches/compare.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
summary: Compare branches
description: |
Compare branch with main branch.
*Note: Comparing a branch may take several minutes depending on the project size.*
Compare branch with main branch.

*Note: Comparing a branch may take several minutes depending on the project size. Consider using the `POST /compare` endpoint for creating comparison asynchronously.*
operationId: branch/compare
tags:
- Branches
Expand Down Expand Up @@ -31,6 +31,9 @@ responses:
"$ref": "../../responses.yaml#/400"
'404':
"$ref": "../../responses.yaml#/404"
'409':
"$ref": "../../responses.yaml#/409"
description: A comparison is already in progress for this branch.
'429':
"$ref": "../../responses.yaml#/429"
x-code-samples:
Expand Down
50 changes: 50 additions & 0 deletions paths/branches/create_comparison.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
summary: Create comparison (async.)
description: |
Create a branch comparison asynchronously.
operationId: branch/comparison/create
tags:
- Branches
parameters:
- "$ref": "../../parameters.yaml#/X-PhraseApp-OTP"
- "$ref": "../../parameters.yaml#/project_id"
- "$ref": "../../parameters.yaml#/name"
responses:
'202':
"$ref": "../../responses.yaml#/202"
'400':
"$ref": "../../responses.yaml#/400"
'404':
"$ref": "../../responses.yaml#/404"
'409':
"$ref": "../../responses.yaml#/409"
description: An asynchronous comparison is already in progress for this branch.
'429':
"$ref": "../../responses.yaml#/429"
x-code-samples:
- lang: Curl
source: |-
curl "https://api.phrase.com/v2/projects/:project_id/branches/:name/compare" \
-u USERNAME_OR_ACCESS_TOKEN \
-X POST \
-d '{"direction":"merge"}' \
-H 'Content-Type: application/json'
- lang: CLI v2
source: |-
phrase branches create_comparison \
--project_id <project_id> \
--name <name> \
--access_token <token>
requestBody:
required: true
content:
application/json:
schema:
type: object
title: branch/create_comparison/parameters
properties:
direction:
description: direction of comparison, possible values are sync or merge (only for v2 branches)
type: string
example: merge
default: merge
2 changes: 1 addition & 1 deletion paths/branches/sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ summary: Sync a branch
description: |
Sync an existing branch.

*Note: Only available for branches created with new branching. New branching is currently in private beta*
*Note: Only available for branches created with new branching.*
operationId: branch/sync
tags:
- Branches
Expand Down
18 changes: 18 additions & 0 deletions responses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
$ref: "./headers.yaml#/X-Rate-Limit-Remaining"
X-Rate-Limit-Reset:
$ref: "./headers.yaml#/X-Rate-Limit-Reset"
202:
description: Accepted
headers:
X-Rate-Limit-Limit:
$ref: "./headers.yaml#/X-Rate-Limit-Limit"
X-Rate-Limit-Remaining:
$ref: "./headers.yaml#/X-Rate-Limit-Remaining"
X-Rate-Limit-Reset:
$ref: "./headers.yaml#/X-Rate-Limit-Reset"
204:
description: The resource was deleted successfully.
headers:
Expand Down Expand Up @@ -54,6 +63,15 @@
$ref: "./headers.yaml#/X-Rate-Limit-Remaining"
X-Rate-Limit-Reset:
$ref: "./headers.yaml#/X-Rate-Limit-Reset"
409:
description: Conflict
headers:
X-Rate-Limit-Limit:
$ref: "./headers.yaml#/X-Rate-Limit-Limit"
X-Rate-Limit-Remaining:
$ref: "./headers.yaml#/X-Rate-Limit-Remaining"
X-Rate-Limit-Reset:
$ref: "./headers.yaml#/X-Rate-Limit-Reset"
422:
description: Unprocessable entity
content:
Expand Down
Loading