Skip to content

Commit 8c90f43

Browse files
authored
Merge branch 'main' into drop-11250
2 parents ea1ed63 + 4f35015 commit 8c90f43

File tree

95 files changed

+1353
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1353
-107
lines changed

specification/DigitalOcean-public.v2.yaml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,12 @@ tags:
365365
policies based on these metrics. The Monitoring API can help you gain insight into how your apps are performing
366366
and consuming resources.
367367
368+
- name: Partner Network Connect
369+
description: |-
370+
Partner Network Connect lets you establish high-bandwidth, low-latency
371+
network connections directly between DigitalOcean VPC networks and other
372+
public cloud providers or on-premises datacenters.
373+
368374
- name: Project Resources
369375
description: |-
370376
Project Resources are resources that can be grouped into your projects.
@@ -404,12 +410,6 @@ tags:
404410
`already_assigned` | The resource was already assigned.
405411
`service_down` | There was a problem retrieving or assigning a resource. Please try again.
406412
407-
- name: Partner Network Connect
408-
description: |-
409-
Partner Network Connect lets you establish high-bandwidth, low-latency
410-
network connections directly between DigitalOcean VPC networks and other
411-
public cloud providers or on-premises datacenters.
412-
413413
- name: Projects
414414
description: |-
415415
Projects allow you to organize your resources into groups that fit the way
@@ -478,6 +478,18 @@ tags:
478478
An action object is returned. These objects hold the current status of the
479479
requested action.
480480
481+
- name: "[Public Preview] BYOIP Prefixes"
482+
description: |-
483+
Bring your own IP (BYOIP) lets you provision your own IPv4 network prefixes
484+
to your account, then assign those IPs to your DigitalOcean resources.
485+
BYOIP supports the following features:
486+
* IPv4 addresses
487+
* Network sizes of anywhere from `/24` (256 addresses) to `/18` (16,384 addresses)
488+
* Same API and management interface as our existing reserved IPs feature
489+
* Assignable to Droplets only
490+
491+
BYOIP is currently in Public Preview.
492+
481493
- name: Sizes
482494
description: |-
483495
The sizes objects represent different packages of hardware resources that
@@ -1815,6 +1827,22 @@ paths:
18151827
post:
18161828
$ref: "resources/reserved_ipv6/reservedIPv6Actions_post.yml"
18171829

1830+
/v2/byoip_prefixes:
1831+
post:
1832+
$ref: "resources/byoip_prefixes/byoip_prefixes_create.yml"
1833+
get:
1834+
$ref: "resources/byoip_prefixes/byoip_prefixes_list.yml"
1835+
1836+
/v2/byoip_prefixes/{byoip_prefix_uuid}:
1837+
get:
1838+
$ref: "resources/byoip_prefixes/byoip_prefixes_get.yml"
1839+
delete:
1840+
$ref: "resources/byoip_prefixes/byoip_prefixes_delete.yml"
1841+
1842+
/v2/byoip_prefixes/{byoip_prefix_uuid}/ips:
1843+
get:
1844+
$ref: "resources/byoip_prefixes/byoip_prefix_list_resources.yml"
1845+
18181846
/v2/sizes:
18191847
get:
18201848
$ref: "resources/sizes/sizes_list.yml"

specification/resources/account/models/account.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ type: object
22

33
properties:
44
droplet_limit:
5-
description: The total number of Droplets current user or team may have active at one time.
5+
description: |
6+
The total number of Droplets current user or team may have active at one time.
7+
<br><br>Requires `droplet:read` scope.
68
type: integer
79
example: 25
810

911
floating_ip_limit:
10-
description: The total number of Floating IPs the current user or team may have.
12+
description: |
13+
The total number of Floating IPs the current user or team may have.
14+
<br><br>Requires `reserved_ip:read` scope.
1115
type: integer
1216
example: 5
1317

specification/resources/apps/models/app.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ properties:
6161
type: string
6262
example: 88b72d1a-b78a-4d9f-9090-b53c4399073f
6363
title: The ID of the project the app is assigned to. This will be empty if there is a lookup failure.
64+
description: Requires `project:read` scope.
6465
region:
6566
$ref: apps_region.yml
6667
spec:

specification/resources/apps/models/apps_create_app_request.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ properties:
33
$ref: app_spec.yml
44
project_id:
55
type: string
6-
description: The ID of the project the app should be assigned to. If omitted, it will be assigned to your default project.
6+
description: |
7+
The ID of the project the app should be assigned to. If omitted, it will be assigned to your default project.
8+
<br><br>Requires `project:update` scope.
79
required:
810
- spec
911
type: object

specification/resources/autoscale_pools/models/autoscale_pool_droplet_template.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,25 @@ properties:
4343
type: string
4444
example:
4545
- "88:66:90:d2:68:d5:b5:85:e3:26:26:11:31:57:e6:f8"
46-
description: The SSH keys to be installed on the Droplets in the autoscale pool. You can either specify the key ID or the fingerprint.
46+
description: |
47+
The SSH keys to be installed on the Droplets in the autoscale pool. You can either specify the key ID or the fingerprint.
48+
Requires `ssh_key:read` scope.
4749
4850
tags:
4951
type: array
5052
items:
5153
type: string
5254
example:
5355
- my-tag
54-
description: The tags to apply to each of the Droplets in the autoscale pool.
56+
description: |
57+
The tags to apply to each of the Droplets in the autoscale pool.
58+
Requires `tag:read` scope.
5559
5660
vpc_uuid:
5761
type: string
58-
description: The VPC where the Droplets in the autoscale pool will be created. The VPC must be in the region where you want to create the Droplets.
62+
description: |
63+
The VPC where the Droplets in the autoscale pool will be created. The VPC must be in the region where you want to create the Droplets.
64+
Requires `vpc:read` scope.
5965
example: 760e09ef-dc84-11e8-981e-3cfdfeaae000
6066

6167
with_droplet_agent:
@@ -65,7 +71,9 @@ properties:
6571

6672
project_id:
6773
type: string
68-
description: The project that the Droplets in the autoscale pool will belong to.
74+
description: |
75+
The project that the Droplets in the autoscale pool will belong to.
76+
Requires `project:read` scope.
6977
example: 746c6152-2fa2-11ed-92d3-27aaa54e4988
7078

7179
ipv6:

specification/resources/billing/responses/invoice.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
description: >-
22
The response will be a JSON object with a key called `invoice_items`.
3-
This will be set to an array of invoice item objects.
3+
This will be set to an array of invoice item objects. All resources will
4+
be shown on invoices, regardless of permissions.
45
56
headers:
67
ratelimit-limit:
@@ -51,4 +52,4 @@ content:
5152
next: https://api.digitalocean.com/v2/customers/my/invoices/22737513-0ea7-4206-8ceb-98a575af7681?page=2&per_page=2
5253
last: https://api.digitalocean.com/v2/customers/my/invoices/22737513-0ea7-4206-8ceb-98a575af7681?page=3&per_page=2
5354
meta:
54-
total: 6
55+
total: 6
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
operationId: byoipPrefixes_list_resources
2+
3+
summary: "List BYOIP Prefix Resources"
4+
5+
description: |
6+
To list resources associated with BYOIP prefixes, send a GET request to `/v2/byoip_prefixes/{byoip_prefix_uuid}/ips`.
7+
8+
A successful response will return a list of resources associated with the specified BYOIP prefix.
9+
10+
tags:
11+
- "[Public Preview] BYOIP Prefixes"
12+
13+
parameters:
14+
- $ref: "parameters.yml#/byoip_prefix"
15+
- $ref: '../../shared/parameters.yml#/per_page'
16+
- $ref: '../../shared/parameters.yml#/page'
17+
18+
responses:
19+
"200":
20+
$ref: "responses/byoip_prefix_list_resources.yml#/byoip_prefix_list_resources"
21+
"401":
22+
$ref: "../../shared/responses/unauthorized.yml"
23+
"404":
24+
$ref: "../../shared/responses/not_found.yml"
25+
"429":
26+
$ref: "../../shared/responses/too_many_requests.yml"
27+
"500":
28+
$ref: "../../shared/responses/server_error.yml"
29+
default:
30+
$ref: "../../shared/responses/unexpected_error.yml"
31+
x-codeSamples:
32+
- $ref: "examples/curl/byoip_prefix_list_resources.yml"
33+
- $ref: "examples/go/byoip_prefix_list_resources.yml"
34+
- $ref: "examples/python/byoip_prefix_list_resources.yml"
35+
security:
36+
- bearer_auth:
37+
- "byoip_prefix:read"
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
operationId: byoipPrefixes_create
2+
3+
summary: "Create a BYOIP Prefix"
4+
5+
description: |
6+
To create a BYOIP prefix, send a POST request to `/v2/byoip_prefixes`.
7+
8+
A successful request will initiate the process of bringing your BYOIP Prefix into your account.
9+
The response will include the details of the created prefix, including its UUID and status.
10+
11+
tags:
12+
- "[Public Preview] BYOIP Prefixes"
13+
14+
requestBody:
15+
required: true
16+
content:
17+
application/json:
18+
schema:
19+
$ref: "models/byoip_prefix_create.yml#/byoip_prefix_create"
20+
21+
responses:
22+
"202":
23+
$ref: "responses/byoip_prefix_create.yml#/byoip_prefix_create"
24+
"401":
25+
$ref: "../../shared/responses/unauthorized.yml"
26+
"422":
27+
$ref: "../../shared/responses/unprocessable_entity.yml"
28+
"429":
29+
$ref: "../../shared/responses/too_many_requests.yml"
30+
"500":
31+
$ref: "../../shared/responses/server_error.yml"
32+
default:
33+
$ref: "../../shared/responses/unexpected_error.yml"
34+
35+
x-codeSamples:
36+
- $ref: "examples/curl/create_byoip_prefix.yml"
37+
- $ref: "examples/go/create_byoip_prefix.yml"
38+
- $ref: "examples/python/create_byoip_prefix.yml"
39+
40+
security:
41+
- bearer_auth:
42+
- "byoip_prefix:create"
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
operationId: byoipPrefixes_delete
2+
3+
summary: "Delete a BYOIP Prefix"
4+
5+
description: |
6+
To delete a BYOIP prefix and remove it from your account, send a DELETE request
7+
to `/v2/byoip_prefixes/{uuid}`.
8+
9+
A successful request will receive a 202 status code with no body in response.
10+
This indicates that the request was accepted and the prefix is being deleted.
11+
12+
tags:
13+
- "[Public Preview] BYOIP Prefixes"
14+
15+
parameters:
16+
- $ref: "parameters.yml#/byoip_prefix"
17+
18+
responses:
19+
"202":
20+
$ref: "../../shared/responses/no_content.yml"
21+
"401":
22+
$ref: "../../shared/responses/unauthorized.yml"
23+
"404":
24+
$ref: "../../shared/responses/not_found.yml"
25+
"422":
26+
$ref: "../../shared/responses/unprocessable_entity.yml"
27+
"429":
28+
$ref: "../../shared/responses/too_many_requests.yml"
29+
"500":
30+
$ref: "../../shared/responses/server_error.yml"
31+
default:
32+
$ref: "../../shared/responses/unexpected_error.yml"
33+
34+
x-codeSamples:
35+
- $ref: "examples/curl/delete_byoip_prefix.yml"
36+
- $ref: "examples/go/delete_byoip_prefix.yml"
37+
- $ref: "examples/python/delete_byoip_prefix.yml"
38+
39+
security:
40+
- bearer_auth:
41+
- "byoip_prefix:delete"
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
operationId: byoipPrefixes_get
2+
3+
summary: "Get a BYOIP Prefix"
4+
5+
description: |
6+
To get a BYOIP prefix, send a GET request to `/v2/byoip_prefixes/{byoip_prefix_uuid}`.
7+
8+
A successful response will return the details of the specified BYOIP prefix.
9+
tags:
10+
- "[Public Preview] BYOIP Prefixes"
11+
12+
parameters:
13+
- $ref: "parameters.yml#/byoip_prefix"
14+
15+
responses:
16+
"200":
17+
$ref: "responses/byoip_prefix_get.yml#/byoip_prefix_get"
18+
"401":
19+
$ref: "../../shared/responses/unauthorized.yml"
20+
"404":
21+
$ref: "../../shared/responses/not_found.yml"
22+
"422":
23+
$ref: "../../shared/responses/unprocessable_entity.yml"
24+
"429":
25+
$ref: "../../shared/responses/too_many_requests.yml"
26+
"500":
27+
$ref: "../../shared/responses/server_error.yml"
28+
default:
29+
$ref: "../../shared/responses/unexpected_error.yml"
30+
31+
x-codeSamples:
32+
- $ref: "examples/curl/get_byoip_prefix.yml"
33+
- $ref: "examples/go/get_byoip_prefix.yml"
34+
- $ref: "examples/python/get_byoip_prefix.yml"
35+
36+
security:
37+
- bearer_auth:
38+
- "byoip_prefix:update"

0 commit comments

Comments
 (0)