Skip to content

Commit 67a8ff4

Browse files
committed
brk: Removed deprecated fields and endpoints
1 parent bed9b33 commit 67a8ff4

File tree

2 files changed

+22
-123
lines changed

2 files changed

+22
-123
lines changed

src/data/endpoints/linodes.yaml

Lines changed: 22 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,23 @@ endpoints:
4949
description: The group to assign this Linode. Defaults to "empty".
5050
type: String
5151
limit: 0-50 characters
52-
distribution:
53-
optional: true
54-
description: >
55-
The ID of a Distribution to deploy this Linode with. May not be included
56-
if 'backup_id' or 'image' is sent.
57-
type: String
58-
deprecated: This parameter is deprecated and will be removed before the end of the Beta Period.
59-
You can provide the same inputs to "image" instead. See the changelog for more information.
6052
root_pass:
6153
optional: unless source == "distro"
6254
description: >
63-
The root password to use when sourcing this Linode from a distribution.
64-
<ul><li>root_pass is required if the source provided is a distribution.</li></ul>
55+
The root password to use when sourcing this Linode from an image.
56+
<ul><li>root_pass is required if the source provided is an image.</li></ul>
6557
type: String
6658
authorized_keys:
6759
optional: true
6860
description: >
69-
An array of public SSH keys to be installed into the distribution's
61+
An array of public SSH keys to be installed into the image's
7062
default user's `authorized_keys` file when creating a Linode.
7163
type: Array
7264
stackscript_id:
7365
optional: true
7466
description: >
7567
The stackscript ID to deploy with this disk.
76-
<ul><li>Must provide a distribution. Distribution must be
68+
<ul><li>Must provide an Image. Images must be
7769
one that the stackscript can be deployed to.</li></ul>
7870
type: Integer
7971
stackscript_data:
@@ -86,13 +78,13 @@ endpoints:
8678
optional: true
8779
description: >
8880
The Backup to restore to the newly created
89-
Linode. May not be included if 'distribution' or 'image' is sent.
81+
Linode. May not be included if 'image' is sent.
9082
type: Integer
9183
image:
9284
optional: true
9385
description: >
9486
The gold-master image to use for the newly created Linode. May
95-
not be included if 'distribution' or 'backup_id' is sent. Official
87+
not be included if 'backup_id' is sent. Official
9688
images start with "linode/", while your own images start with
9789
"private/"
9890
type: String
@@ -107,7 +99,7 @@ endpoints:
10799
optional: true
108100
description: >
109101
Whether the instance should be booted upon completion of creation.
110-
This defaults to true if created with a distribution.
102+
This defaults to true if created with an image.
111103
type: Boolean
112104
examples:
113105
curl: |
@@ -119,7 +111,7 @@ endpoints:
119111
my_linode = client.linode.create_instance(client.get_regions().first(), 'g5-nanode-1')
120112
121113
distro = client.linode.get_distributons(linode.Distribution.vendor == 'debian').first()
122-
( my_linode_2, password ) = client.linode.create_instance('us-east-1a', 'g5-standard-1', distribution=distro)
114+
( my_linode_2, password ) = client.linode.create_instance('us-east-1a', 'g5-standard-1', image=image)
123115
/linode/instances/$id:
124116
type: resource
125117
authenticated: true
@@ -196,35 +188,25 @@ endpoints:
196188
Size in MB for this disk.
197189
type: Integer
198190
limit: between 0 and the available space on the Linode
199-
distribution:
200-
optional: true
201-
description: >
202-
Optional ID of a distribution to deploy with this disk.
203-
<ul><li>If no distribution is provided, a blank disk
204-
is created.</li></ul> You may not provide distribution if image is provided.
205-
type: String
206-
deprecated: This parameter is deprecated and will be removed before the end of the Beta Period.
207-
The same value can be passed to "image" instead. See the changelog for more information.
208191
image:
209192
optional: true
210193
description: >
211-
Optional image id to deploy the disk from. You may not provide image
212-
if distribution is provided. Official images start with "linode/",
213-
while your images start with "private/"
194+
Optional image id to deploy the disk from. Official images start
195+
with "linode/", while your images start with "private/"
214196
seeAlso: ["/reference/endpoints/images"]
215197
type: String
216198
root_pass:
217-
optional: unless distribution or image is specified
199+
optional: unless image is specified
218200
description: >
219-
Root password to deploy distribution with.
220-
<ul><li>root_pass is required if a distribution is provided.</li></ul>
201+
Root password to deploy image with.
202+
<ul><li>root_pass is required if a image is provided.</li></ul>
221203
type: String
222204
authorized_keys:
223-
optional: unless distribution is not specified
205+
optional: unless image is not specified
224206
description: >
225-
An array of public SSH keys to be installed into the distribution's
207+
An array of public SSH keys to be installed into the image's
226208
default user's `authorized_keys` file when creating a new disk from
227-
a Linode provided distribution.
209+
a Linode provided image.
228210
type: Array
229211
label:
230212
description: >
@@ -245,7 +227,7 @@ endpoints:
245227
optional: true
246228
description: >
247229
The stackscript ID to deploy with this disk.
248-
<ul><li>Must provide a distribution. Distribution must be
230+
<ul><li>Must provide a image. Images must be
249231
one that the stackscript can be deployed to.</li></ul>
250232
type: Integer
251233
stackscript_data:
@@ -975,18 +957,11 @@ endpoints:
975957
oauth: linodes:modify
976958
dangerous: true
977959
params:
978-
distribution:
979-
optional: true
980-
description: >
981-
An ID of a Distribution to deploy to this Linode.
982-
type: String
983-
deprecated: This parameter is deprecated and will be removed before the end of the Beta Period.
984-
See the changelog for more information.
985960
image:
986961
optional: true
987962
description: >
988963
The gold-master image to use for this Linode. May
989-
not be included if 'distribution' is sent. Official images start
964+
not be included if 'image' is sent. Official images start
990965
with "linode/", while your own images start with "private/"
991966
type: String
992967
value: "linode/debian9"
@@ -997,14 +972,14 @@ endpoints:
997972
authorized_keys:
998973
optional: true
999974
description: >
1000-
An array of public SSH keys to be installed into the distribution's
975+
An array of public SSH keys to be installed into the image's
1001976
default user's `authorized_keys` file when rebuilding a Linode.
1002977
type: Array
1003978
stackscript_id:
1004979
optional: true
1005980
description: >
1006981
The stackscript ID to deploy with this disk.
1007-
<ul><li>Must provide a distribution. Distribution must be
982+
<ul><li>Must provide an image. Images must be
1008983
one that the stackscript can be deployed to.</li></ul>
1009984
type: Integer
1010985
stackscript_data:
@@ -1025,7 +1000,7 @@ endpoints:
10251000
-H "Authorization: Bearer $TOKEN" \
10261001
-X POST \
10271002
https://$api_root/$version/linode/instances/$linode_id/rebuild \
1028-
-d '{"distribution":"linode/debian8","root_pass":"hunter7"}'
1003+
-d '{"image":"linode/debian8","root_pass":"hunter7"}'
10291004
python: |
10301005
my_linode.rebuild('linode/ubuntu16.04LTS', root_pass='hunter7')
10311006
/linode/stackscripts:
@@ -1091,7 +1066,7 @@ endpoints:
10911066
-H "Authorization: Bearer $TOKEN" \
10921067
-X POST -d '{
10931068
"label": "Initial Label",
1094-
"distributions": ["linode/ubuntu15.4", "linode/ubuntu15.10"],
1069+
"images": ["linode/ubuntu15.4", "linode/ubuntu15.10"],
10951070
"script": "#!..."
10961071
}' \
10971072
https://$api_root/$version/linode/stackscripts
@@ -1145,38 +1120,6 @@ endpoints:
11451120
python: |
11461121
import stackscript
11471122
TODO
1148-
/linode/distributions:
1149-
group: Distributions
1150-
description: >
1151-
THIS ENDPOINT IS DEPRECATED. USE /images INSTEAD. Returns information about this distribution.
1152-
methods:
1153-
GET:
1154-
response: image
1155-
paginationKey: distributions
1156-
description: >
1157-
THIS ENDPOINT IS DEPRECATED. USE /images INSTEAD. Returns information about this distribution.
1158-
seeAlso: ["/reference/endpoints/images"]
1159-
examples:
1160-
curl: |
1161-
curl https://$api_root/$version/linode/distributions
1162-
python: |
1163-
client.linode.get_distributions()
1164-
/linode/distributions/$id:
1165-
group: Distributions
1166-
type: resource
1167-
description: >
1168-
THIS ENDPOINT IS DEPRECATED. USE /images INSTEAD. Returns information about this distribution.
1169-
methods:
1170-
GET:
1171-
response: image
1172-
description: >
1173-
THIS ENDPOINT IS DEPRECATED. USE /images INSTEAD. Returns information about this distribution.
1174-
seeAlso: ["/reference/endpoints/images"]
1175-
examples:
1176-
curl: |
1177-
curl https://$api_root/$version/linode/distributions/$distribution_id
1178-
python: |
1179-
distro = linode.Distribution(client, 'linode/debian8')
11801123
/linode/kernels:
11811124
group: Kernels
11821125
description: >

src/data/objects/distribution.yaml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)