Skip to content

Commit

Permalink
Update EC2 models for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeskew
jeskew committed Dec 16, 2015
1 parent 5f3d5a8 commit e510ba8
Show file tree
Hide file tree
Showing 9 changed files with 5,141 additions and 3,936 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## next release

* `Aws\Ec2` - Added support for specifying encryption on CopyImage commands.

## 3.11.5 - 2015-12-08

* `Aws\AutoScaling` - Added support for setting and describing instance
Expand Down
23 changes: 17 additions & 6 deletions src/data/ec2/2015-10-01/api-2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2880,7 +2880,15 @@
"SourceImageId":{"shape":"String"},
"Name":{"shape":"String"},
"Description":{"shape":"String"},
"ClientToken":{"shape":"String"}
"ClientToken":{"shape":"String"},
"Encrypted":{
"shape":"Boolean",
"locationName":"encrypted"
},
"KmsKeyId":{
"shape":"String",
"locationName":"kmsKeyId"
}
}
},
"CopyImageResult":{
Expand Down Expand Up @@ -5515,7 +5523,10 @@
},
"DescribeVpcAttributeRequest":{
"type":"structure",
"required":["VpcId"],
"required":[
"VpcId",
"Attribute"
],
"members":{
"DryRun":{
"shape":"Boolean",
Expand Down Expand Up @@ -11733,13 +11744,13 @@
"type":"structure",
"required":["Error"],
"members":{
"Error":{
"shape":"UnsuccessfulItemError",
"locationName":"error"
},
"ResourceId":{
"shape":"String",
"locationName":"resourceId"
},
"Error":{
"shape":"UnsuccessfulItemError",
"locationName":"error"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/data/ec2/2015-10-01/api-2.json.php
View file

Large diffs are not rendered by default.

8,058 changes: 4,600 additions & 3,458 deletions src/data/ec2/2015-10-01/docs-2.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/data/ec2/2015-10-01/docs-2.json.php
View file

Large diffs are not rendered by default.

204 changes: 126 additions & 78 deletions src/data/ec2/2015-10-01/paginators-1.json
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,129 @@
{
"pagination":{
"DescribeAccountAttributes":{"result_key":"AccountAttributes"},
"DescribeAddresses":{"result_key":"Addresses"},
"DescribeAvailabilityZones":{"result_key":"AvailabilityZones"},
"DescribeBundleTasks":{"result_key":"BundleTasks"},
"DescribeConversionTasks":{"result_key":"ConversionTasks"},
"DescribeCustomerGateways":{"result_key":"CustomerGateways"},
"DescribeDhcpOptions":{"result_key":"DhcpOptions"},
"DescribeExportTasks":{"result_key":"ExportTasks"},
"DescribeImages":{"result_key":"Images"},
"DescribeInstanceStatus":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"InstanceStatuses"
},
"DescribeInstances":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"Reservations"
},
"DescribeInternetGateways":{"result_key":"InternetGateways"},
"DescribeKeyPairs":{"result_key":"KeyPairs"},
"DescribeNetworkAcls":{"result_key":"NetworkAcls"},
"DescribeNetworkInterfaces":{"result_key":"NetworkInterfaces"},
"DescribePlacementGroups":{"result_key":"PlacementGroups"},
"DescribeRegions":{"result_key":"Regions"},
"DescribeReservedInstances":{"result_key":"ReservedInstances"},
"DescribeReservedInstancesListings":{"result_key":"ReservedInstancesListings"},
"DescribeReservedInstancesModifications":{
"input_token":"NextToken",
"output_token":"NextToken",
"result_key":"ReservedInstancesModifications"
},
"DescribeReservedInstancesOfferings":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"ReservedInstancesOfferings"
},
"DescribeRouteTables":{"result_key":"RouteTables"},
"DescribeSecurityGroups":{"result_key":"SecurityGroups"},
"DescribeSnapshots":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"Snapshots"
},
"DescribeSpotInstanceRequests":{"result_key":"SpotInstanceRequests"},
"DescribeSpotPriceHistory":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"SpotPriceHistory"
},
"DescribeSubnets":{"result_key":"Subnets"},
"DescribeTags":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"Tags"
},
"DescribeVolumeStatus":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"VolumeStatuses"
},
"DescribeVolumes":{
"input_token":"NextToken",
"limit_key":"MaxResults",
"output_token":"NextToken",
"result_key":"Volumes"
},
"DescribeVpcs":{"result_key":"Vpcs"},
"DescribeVpnConnections":{"result_key":"VpnConnections"},
"DescribeVpnGateways":{"result_key":"VpnGateways"}
"pagination": {
"DescribeAccountAttributes": {
"result_key": "AccountAttributes"
},
"DescribeAddresses": {
"result_key": "Addresses"
},
"DescribeAvailabilityZones": {
"result_key": "AvailabilityZones"
},
"DescribeBundleTasks": {
"result_key": "BundleTasks"
},
"DescribeConversionTasks": {
"result_key": "ConversionTasks"
},
"DescribeCustomerGateways": {
"result_key": "CustomerGateways"
},
"DescribeDhcpOptions": {
"result_key": "DhcpOptions"
},
"DescribeExportTasks": {
"result_key": "ExportTasks"
},
"DescribeImages": {
"result_key": "Images"
},
"DescribeInstanceStatus": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "InstanceStatuses"
},
"DescribeInstances": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "Reservations"
},
"DescribeInternetGateways": {
"result_key": "InternetGateways"
},
"DescribeKeyPairs": {
"result_key": "KeyPairs"
},
"DescribeNetworkAcls": {
"result_key": "NetworkAcls"
},
"DescribeNetworkInterfaces": {
"result_key": "NetworkInterfaces"
},
"DescribePlacementGroups": {
"result_key": "PlacementGroups"
},
"DescribeRegions": {
"result_key": "Regions"
},
"DescribeReservedInstances": {
"result_key": "ReservedInstances"
},
"DescribeReservedInstancesListings": {
"result_key": "ReservedInstancesListings"
},
"DescribeReservedInstancesOfferings": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "ReservedInstancesOfferings"
},
"DescribeReservedInstancesModifications": {
"input_token": "NextToken",
"output_token": "NextToken",
"result_key": "ReservedInstancesModifications"
},
"DescribeRouteTables": {
"result_key": "RouteTables"
},
"DescribeSecurityGroups": {
"result_key": "SecurityGroups"
},
"DescribeSnapshots": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "Snapshots"
},
"DescribeSpotInstanceRequests": {
"result_key": "SpotInstanceRequests"
},
"DescribeSpotPriceHistory": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "SpotPriceHistory"
},
"DescribeSubnets": {
"result_key": "Subnets"
},
"DescribeTags": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "Tags"
},
"DescribeVolumeStatus": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "VolumeStatuses"
},
"DescribeVolumes": {
"input_token": "NextToken",
"output_token": "NextToken",
"limit_key": "MaxResults",
"result_key": "Volumes"
},
"DescribeVpcs": {
"result_key": "Vpcs"
},
"DescribeVpnConnections": {
"result_key": "VpnConnections"
},
"DescribeVpnGateways": {
"result_key": "VpnGateways"
}
}
}
2 changes: 1 addition & 1 deletion src/data/ec2/2015-10-01/paginators-1.json.php
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php
// This file was auto-generated from sdk-root/src/data/ec2/2015-10-01/paginators-1.json
return [ 'pagination' => [ 'DescribeAccountAttributes' => [ 'result_key' => 'AccountAttributes', ], 'DescribeAddresses' => [ 'result_key' => 'Addresses', ], 'DescribeAvailabilityZones' => [ 'result_key' => 'AvailabilityZones', ], 'DescribeBundleTasks' => [ 'result_key' => 'BundleTasks', ], 'DescribeConversionTasks' => [ 'result_key' => 'ConversionTasks', ], 'DescribeCustomerGateways' => [ 'result_key' => 'CustomerGateways', ], 'DescribeDhcpOptions' => [ 'result_key' => 'DhcpOptions', ], 'DescribeExportTasks' => [ 'result_key' => 'ExportTasks', ], 'DescribeImages' => [ 'result_key' => 'Images', ], 'DescribeInstanceStatus' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'InstanceStatuses', ], 'DescribeInstances' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'Reservations', ], 'DescribeInternetGateways' => [ 'result_key' => 'InternetGateways', ], 'DescribeKeyPairs' => [ 'result_key' => 'KeyPairs', ], 'DescribeNetworkAcls' => [ 'result_key' => 'NetworkAcls', ], 'DescribeNetworkInterfaces' => [ 'result_key' => 'NetworkInterfaces', ], 'DescribePlacementGroups' => [ 'result_key' => 'PlacementGroups', ], 'DescribeRegions' => [ 'result_key' => 'Regions', ], 'DescribeReservedInstances' => [ 'result_key' => 'ReservedInstances', ], 'DescribeReservedInstancesListings' => [ 'result_key' => 'ReservedInstancesListings', ], 'DescribeReservedInstancesModifications' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'result_key' => 'ReservedInstancesModifications', ], 'DescribeReservedInstancesOfferings' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'ReservedInstancesOfferings', ], 'DescribeRouteTables' => [ 'result_key' => 'RouteTables', ], 'DescribeSecurityGroups' => [ 'result_key' => 'SecurityGroups', ], 'DescribeSnapshots' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'Snapshots', ], 'DescribeSpotInstanceRequests' => [ 'result_key' => 'SpotInstanceRequests', ], 'DescribeSpotPriceHistory' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'SpotPriceHistory', ], 'DescribeSubnets' => [ 'result_key' => 'Subnets', ], 'DescribeTags' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'Tags', ], 'DescribeVolumeStatus' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'VolumeStatuses', ], 'DescribeVolumes' => [ 'input_token' => 'NextToken', 'limit_key' => 'MaxResults', 'output_token' => 'NextToken', 'result_key' => 'Volumes', ], 'DescribeVpcs' => [ 'result_key' => 'Vpcs', ], 'DescribeVpnConnections' => [ 'result_key' => 'VpnConnections', ], 'DescribeVpnGateways' => [ 'result_key' => 'VpnGateways', ], ],];
return [ 'pagination' => [ 'DescribeAccountAttributes' => [ 'result_key' => 'AccountAttributes', ], 'DescribeAddresses' => [ 'result_key' => 'Addresses', ], 'DescribeAvailabilityZones' => [ 'result_key' => 'AvailabilityZones', ], 'DescribeBundleTasks' => [ 'result_key' => 'BundleTasks', ], 'DescribeConversionTasks' => [ 'result_key' => 'ConversionTasks', ], 'DescribeCustomerGateways' => [ 'result_key' => 'CustomerGateways', ], 'DescribeDhcpOptions' => [ 'result_key' => 'DhcpOptions', ], 'DescribeExportTasks' => [ 'result_key' => 'ExportTasks', ], 'DescribeImages' => [ 'result_key' => 'Images', ], 'DescribeInstanceStatus' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'InstanceStatuses', ], 'DescribeInstances' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'Reservations', ], 'DescribeInternetGateways' => [ 'result_key' => 'InternetGateways', ], 'DescribeKeyPairs' => [ 'result_key' => 'KeyPairs', ], 'DescribeNetworkAcls' => [ 'result_key' => 'NetworkAcls', ], 'DescribeNetworkInterfaces' => [ 'result_key' => 'NetworkInterfaces', ], 'DescribePlacementGroups' => [ 'result_key' => 'PlacementGroups', ], 'DescribeRegions' => [ 'result_key' => 'Regions', ], 'DescribeReservedInstances' => [ 'result_key' => 'ReservedInstances', ], 'DescribeReservedInstancesListings' => [ 'result_key' => 'ReservedInstancesListings', ], 'DescribeReservedInstancesOfferings' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'ReservedInstancesOfferings', ], 'DescribeReservedInstancesModifications' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'result_key' => 'ReservedInstancesModifications', ], 'DescribeRouteTables' => [ 'result_key' => 'RouteTables', ], 'DescribeSecurityGroups' => [ 'result_key' => 'SecurityGroups', ], 'DescribeSnapshots' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'Snapshots', ], 'DescribeSpotInstanceRequests' => [ 'result_key' => 'SpotInstanceRequests', ], 'DescribeSpotPriceHistory' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'SpotPriceHistory', ], 'DescribeSubnets' => [ 'result_key' => 'Subnets', ], 'DescribeTags' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'Tags', ], 'DescribeVolumeStatus' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'VolumeStatuses', ], 'DescribeVolumes' => [ 'input_token' => 'NextToken', 'output_token' => 'NextToken', 'limit_key' => 'MaxResults', 'result_key' => 'Volumes', ], 'DescribeVpcs' => [ 'result_key' => 'Vpcs', ], 'DescribeVpnConnections' => [ 'result_key' => 'VpnConnections', ], 'DescribeVpnGateways' => [ 'result_key' => 'VpnGateways', ], ],];
Loading

0 comments on commit e510ba8

Please sign in to comment.