Skip to content
This repository was archived by the owner on Aug 28, 2019. It is now read-only.

Commit 62cac92

Browse files
committed
Regenerated library to pick up latest schema changes
1 parent 99e2199 commit 62cac92

File tree

3 files changed

+15
-135
lines changed

3 files changed

+15
-135
lines changed

codegenerator/model/model-data.txt

Lines changed: 14 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,20 +1467,6 @@ which can read the instance user data.
14671467
'
14681468
Base URL = 'https://aws-provisioner.taskcluster.net/v1'
14691469
Entry 0 =
1470-
Entry Type = 'function'
1471-
Entry Method = 'get'
1472-
Entry Route = '/list-worker-type-summaries'
1473-
Entry Args = '[]'
1474-
Entry Name = 'listWorkerTypeSummaries'
1475-
Entry Scopes = '[]'
1476-
Entry Input = ''
1477-
Entry Output = 'http://schemas.taskcluster.net/aws-provisioner/v1/list-worker-types-summaries-response.json#'
1478-
Entry Title = 'List worker types with details'
1479-
Entry Description = 'Return a list of worker types, including some summary information about
1480-
current capacity for each. While this list includes all defined worker types,
1481-
there may be running EC2 instances for deleted worker types that are not
1482-
included here. The list is unordered.'
1483-
Entry 1 =
14841470
Entry Type = 'function'
14851471
Entry Method = 'put'
14861472
Entry Route = '/worker-type/<workerType>'
@@ -1513,7 +1499,7 @@ If provided, the secrets in the global, region and instance type sections
15131499
are available using the secrets api. If specified, the scopes provided
15141500
will be used to generate a set of temporary credentials available with
15151501
the other secrets.'
1516-
Entry 2 =
1502+
Entry 1 =
15171503
Entry Type = 'function'
15181504
Entry Method = 'post'
15191505
Entry Route = '/worker-type/<workerType>/update'
@@ -1534,7 +1520,7 @@ the request body for this method
15341520

15351521
Otherwise, all input requirements and actions are the same as the
15361522
create method.'
1537-
Entry 3 =
1523+
Entry 2 =
15381524
Entry Type = 'function'
15391525
Entry Method = 'get'
15401526
Entry Route = '/worker-type/<workerType>'
@@ -1549,7 +1535,7 @@ This copy contains a lastModified field as well as the worker
15491535
type name. As such, it will require manipulation to be able to
15501536
use the results of this method to submit date to the update
15511537
method.'
1552-
Entry 4 =
1538+
Entry 3 =
15531539
Entry Type = 'function'
15541540
Entry Method = 'delete'
15551541
Entry Route = '/worker-type/<workerType>'
@@ -1569,7 +1555,7 @@ state. If you want to gracefully remove a worker type, you must
15691555
either ensure that no tasks are created with that worker type name
15701556
or you could theoretically set maxCapacity to 0, though, this is
15711557
not a supported or tested action'
1572-
Entry 5 =
1558+
Entry 4 =
15731559
Entry Type = 'function'
15741560
Entry Method = 'get'
15751561
Entry Route = '/list-worker-types'
@@ -1583,7 +1569,7 @@ Entry 5 =
15831569
of all managed worker types known to the provisioner. This does
15841570
not include worker types which are left overs from a deleted worker
15851571
type definition but are still running in AWS.'
1586-
Entry 6 =
1572+
Entry 5 =
15871573
Entry Type = 'function'
15881574
Entry Method = 'put'
15891575
Entry Route = '/secret/<token>'
@@ -1599,7 +1585,7 @@ be converted into credentials by `getSecret`.
15991585

16001586
This method is not ordinarily used in production; instead, the provisioner
16011587
creates a new secret directly for each spot bid.'
1602-
Entry 7 =
1588+
Entry 6 =
16031589
Entry Type = 'function'
16041590
Entry Method = 'get'
16051591
Entry Route = '/secret/<token>'
@@ -1616,7 +1602,7 @@ based on the scopes specified when the secret was created.
16161602
It is important that this secret is deleted by the consumer (`removeSecret`),
16171603
or else the secrets will be visible to any process which can access the
16181604
user data associated with the instance.'
1619-
Entry 8 =
1605+
Entry 7 =
16201606
Entry Type = 'function'
16211607
Entry Method = 'get'
16221608
Entry Route = '/instance-started/<instanceId>/<token>'
@@ -1631,7 +1617,7 @@ as its security token. The token is given and checked to ensure
16311617
that it matches a real token that exists to ensure that random
16321618
machines do not check in. We could generate a different token
16331619
but that seems like overkill'
1634-
Entry 9 =
1620+
Entry 8 =
16351621
Entry Type = 'function'
16361622
Entry Method = 'delete'
16371623
Entry Route = '/secret/<token>'
@@ -1647,7 +1633,7 @@ token will return no information.
16471633
It is very important that the consumer of a
16481634
secret delete the secret from storage before handing over control
16491635
to untrusted processes to prevent credential and/or secret leakage.'
1650-
Entry 10 =
1636+
Entry 9 =
16511637
Entry Type = 'function'
16521638
Entry Method = 'get'
16531639
Entry Route = '/worker-type/<workerType>/launch-specifications'
@@ -1662,7 +1648,7 @@ that this worker type definition could submit to EC2. It is used to
16621648
test worker types, nothing more
16631649

16641650
**This API end-point is experimental and may be subject to change without warning.**'
1665-
Entry 11 =
1651+
Entry 10 =
16661652
Entry Type = 'function'
16671653
Entry Method = 'get'
16681654
Entry Route = '/aws-state'
@@ -1676,7 +1662,7 @@ Entry 11 =
16761662
tools.tc.net UI is updated to use the per-worker state
16771663

16781664
**DEPRECATED.**'
1679-
Entry 12 =
1665+
Entry 11 =
16801666
Entry Type = 'function'
16811667
Entry Method = 'get'
16821668
Entry Route = '/state/<workerType>'
@@ -1689,9 +1675,8 @@ Entry 12 =
16891675
Entry Description = 'Return the state of a given workertype as stored by the provisioner.
16901676
This state is stored as three lists: 1 for all instances, 1 for requests
16911677
which show in the ec2 api and 1 list for those only tracked internally
1692-
in the provisioner. The `summary` property contains an updated summary
1693-
similar to that returned from `listWorkerTypeSummaries`.'
1694-
Entry 13 =
1678+
in the provisioner.'
1679+
Entry 12 =
16951680
Entry Type = 'function'
16961681
Entry Method = 'get'
16971682
Entry Route = '/ping'
@@ -1704,7 +1689,7 @@ Entry 13 =
17041689
Entry Description = 'Documented later...
17051690

17061691
**Warning** this api end-point is **not stable**.'
1707-
Entry 14 =
1692+
Entry 13 =
17081693
Entry Type = 'function'
17091694
Entry Method = 'get'
17101695
Entry Route = '/backend-status'
@@ -2498,83 +2483,6 @@ IsOutputSchema = 'true'
24982483
SourceURL = 'http://schemas.taskcluster.net/aws-provisioner/v1/list-worker-types-response.json#'
24992484

25002485

2501-
http://schemas.taskcluster.net/aws-provisioner/v1/list-worker-types-summaries-response.json#
2502-
============================================================================================
2503-
ID = 'http://schemas.taskcluster.net/aws-provisioner/v1/list-worker-types-summaries-response.json#'
2504-
Items
2505-
Ref = 'http://schemas.taskcluster.net/aws-provisioner/v1/worker-type-summary.json#'
2506-
TypeName = 'ListWorkerTypeSummariesResponse'
2507-
IsInputSchema = 'false'
2508-
IsOutputSchema = 'false'
2509-
SourceURL = ''
2510-
Schema = 'http://json-schema.org/draft-04/schema#'
2511-
Title = 'List Worker Type Summaries Response'
2512-
Type = 'array'
2513-
TypeName = 'WorkerTypeSummary'
2514-
IsInputSchema = 'false'
2515-
IsOutputSchema = 'true'
2516-
SourceURL = 'http://schemas.taskcluster.net/aws-provisioner/v1/list-worker-types-summaries-response.json#'
2517-
2518-
2519-
http://schemas.taskcluster.net/aws-provisioner/v1/worker-type-summary.json#
2520-
===========================================================================
2521-
Additional Properties = 'false'
2522-
Description = 'A summary of a worker type's current state, expresed in terms of capacity.
2523-
'
2524-
ID = 'http://schemas.taskcluster.net/aws-provisioner/v1/worker-type-summary.json#'
2525-
Properties
2526-
Property 'maxCapacity' =
2527-
Title = 'Maximum capacity of the workerType'
2528-
Type = 'integer'
2529-
TypeName = 'maxCapacity'
2530-
IsInputSchema = 'false'
2531-
IsOutputSchema = 'false'
2532-
SourceURL = ''
2533-
Property 'minCapacity' =
2534-
Title = 'Minimum capacity of the workerType'
2535-
Type = 'integer'
2536-
TypeName = 'minCapacity'
2537-
IsInputSchema = 'false'
2538-
IsOutputSchema = 'false'
2539-
SourceURL = ''
2540-
Property 'pendingCapacity' =
2541-
Title = 'Total pending capacity'
2542-
Type = 'integer'
2543-
TypeName = 'pendingCapacity'
2544-
IsInputSchema = 'false'
2545-
IsOutputSchema = 'false'
2546-
SourceURL = ''
2547-
Property 'requestedCapacity' =
2548-
Title = 'Total requested capacity'
2549-
Type = 'integer'
2550-
TypeName = 'requestedCapacity'
2551-
IsInputSchema = 'false'
2552-
IsOutputSchema = 'false'
2553-
SourceURL = ''
2554-
Property 'runningCapacity' =
2555-
Title = 'Total running capacity'
2556-
Type = 'integer'
2557-
TypeName = 'runningCapacity'
2558-
IsInputSchema = 'false'
2559-
IsOutputSchema = 'false'
2560-
SourceURL = ''
2561-
Property 'workerType' =
2562-
Title = 'Worker type name'
2563-
Type = 'string'
2564-
TypeName = 'workerType'
2565-
IsInputSchema = 'false'
2566-
IsOutputSchema = 'false'
2567-
SourceURL = ''
2568-
Required = '[workerType minCapacity maxCapacity requestedCapacity pendingCapacity runningCapacity]'
2569-
Schema = 'http://json-schema.org/draft-04/schema#'
2570-
Title = 'Worker Type Summary'
2571-
Type = 'object'
2572-
TypeName = 'WorkerTypeSummary'
2573-
IsInputSchema = 'false'
2574-
IsOutputSchema = 'false'
2575-
SourceURL = 'http://schemas.taskcluster.net/aws-provisioner/v1/worker-type-summary.json#'
2576-
2577-
25782486
http://references.taskcluster.net/aws-provisioner/v1/exchanges.json
25792487
===================================================================
25802488
Version = '0'

src/main/java/org/mozilla/taskcluster/client/awsprovisioner/AwsProvisioner.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,6 @@ public AwsProvisioner() {
6969
super(defaultBaseURL);
7070
}
7171

72-
/**
73-
* Return a list of worker types, including some summary information about
74-
* current capacity for each. While this list includes all defined worker types,
75-
* there may be running EC2 instances for deleted worker types that are not
76-
* included here. The list is unordered.
77-
*
78-
* See http://docs.taskcluster.net/aws-provisioner/api-docs/#listWorkerTypeSummaries
79-
*/
80-
public CallSummary<EmptyPayload, WorkerTypeSummary[]> listWorkerTypeSummaries() throws APICallFailure {
81-
return apiCall(null, "GET", "/list-worker-type-summaries", WorkerTypeSummary[].class);
82-
}
83-
8472
/**
8573
* Create a worker type. A worker type contains all the configuration
8674
* needed for the provisioner to manage the instances. Each worker type
@@ -259,8 +247,7 @@ public CallSummary<EmptyPayload, EmptyPayload> awsState() throws APICallFailure
259247
* Return the state of a given workertype as stored by the provisioner.
260248
* This state is stored as three lists: 1 for all instances, 1 for requests
261249
* which show in the ec2 api and 1 list for those only tracked internally
262-
* in the provisioner. The `summary` property contains an updated summary
263-
* similar to that returned from `listWorkerTypeSummaries`.
250+
* in the provisioner.
264251
*
265252
* See http://docs.taskcluster.net/aws-provisioner/api-docs/#state
266253
*/

src/main/java/org/mozilla/taskcluster/client/awsprovisioner/WorkerTypeSummary.java

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

0 commit comments

Comments
 (0)