Commit bbdb97c7 authored by Dmitry Smirnov's avatar Dmitry Smirnov

Imported Upstream version 0.9.9+dfsg

parent 6ecdef43
...@@ -1786,6 +1786,13 @@ ...@@ -1786,6 +1786,13 @@
"locationName":"AllocationId" "locationName":"AllocationId"
} }
}, },
"AllocationStrategy":{
"type":"string",
"enum":[
"lowestPrice",
"diversified"
]
},
"ArchitectureValues":{ "ArchitectureValues":{
"type":"string", "type":"string",
"enum":[ "enum":[
...@@ -10253,6 +10260,10 @@ ...@@ -10253,6 +10260,10 @@
"shape":"SnapshotState", "shape":"SnapshotState",
"locationName":"status" "locationName":"status"
}, },
"StateMessage":{
"shape":"String",
"locationName":"statusMessage"
},
"StartTime":{ "StartTime":{
"shape":"DateTime", "shape":"DateTime",
"locationName":"startTime" "locationName":"startTime"
...@@ -10288,6 +10299,10 @@ ...@@ -10288,6 +10299,10 @@
"KmsKeyId":{ "KmsKeyId":{
"shape":"String", "shape":"String",
"locationName":"kmsKeyId" "locationName":"kmsKeyId"
},
"DataEncryptionKeyId":{
"shape":"String",
"locationName":"dataEncryptionKeyId"
} }
} }
}, },
...@@ -10591,6 +10606,10 @@ ...@@ -10591,6 +10606,10 @@
"LaunchSpecifications":{ "LaunchSpecifications":{
"shape":"LaunchSpecsList", "shape":"LaunchSpecsList",
"locationName":"launchSpecifications" "locationName":"launchSpecifications"
},
"AllocationStrategy":{
"shape":"AllocationStrategy",
"locationName":"allocationStrategy"
} }
} }
}, },
......
This diff is collapsed.
...@@ -310,6 +310,11 @@ ...@@ -310,6 +310,11 @@
"shape":"FileSystemNotFound", "shape":"FileSystemNotFound",
"error":{"httpStatusCode":404}, "error":{"httpStatusCode":404},
"exception":true "exception":true
},
{
"shape":"MountTargetNotFound",
"error":{"httpStatusCode":404},
"exception":true
} }
] ]
}, },
...@@ -383,10 +388,7 @@ ...@@ -383,10 +388,7 @@
} }
}, },
"shapes":{ "shapes":{
"AwsAccountId":{ "AwsAccountId":{"type":"string"},
"type":"string",
"pattern":"[0-9]{12}"
},
"BadRequest":{ "BadRequest":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -537,7 +539,6 @@ ...@@ -537,7 +539,6 @@
}, },
"DescribeMountTargetsRequest":{ "DescribeMountTargetsRequest":{
"type":"structure", "type":"structure",
"required":["FileSystemId"],
"members":{ "members":{
"MaxItems":{ "MaxItems":{
"shape":"MaxItems", "shape":"MaxItems",
...@@ -553,6 +554,11 @@ ...@@ -553,6 +554,11 @@
"shape":"FileSystemId", "shape":"FileSystemId",
"location":"querystring", "location":"querystring",
"locationName":"FileSystemId" "locationName":"FileSystemId"
},
"MountTargetId":{
"shape":"MountTargetId",
"location":"querystring",
"locationName":"MountTargetId"
} }
} }
}, },
...@@ -639,10 +645,7 @@ ...@@ -639,10 +645,7 @@
"type":"list", "type":"list",
"member":{"shape":"FileSystemDescription"} "member":{"shape":"FileSystemDescription"}
}, },
"FileSystemId":{ "FileSystemId":{"type":"string"},
"type":"string",
"pattern":"fs-[0-9a-f]{8}"
},
"FileSystemInUse":{ "FileSystemInUse":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -715,10 +718,7 @@ ...@@ -715,10 +718,7 @@
"error":{"httpStatusCode":500}, "error":{"httpStatusCode":500},
"exception":true "exception":true
}, },
"IpAddress":{ "IpAddress":{"type":"string"},
"type":"string",
"pattern":"[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"
},
"IpAddressInUse":{ "IpAddressInUse":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -791,10 +791,7 @@ ...@@ -791,10 +791,7 @@
"type":"list", "type":"list",
"member":{"shape":"MountTargetDescription"} "member":{"shape":"MountTargetDescription"}
}, },
"MountTargetId":{ "MountTargetId":{"type":"string"},
"type":"string",
"pattern":"fsmt-[0-9a-f]{8}"
},
"MountTargetNotFound":{ "MountTargetNotFound":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -805,10 +802,7 @@ ...@@ -805,10 +802,7 @@
"error":{"httpStatusCode":404}, "error":{"httpStatusCode":404},
"exception":true "exception":true
}, },
"NetworkInterfaceId":{ "NetworkInterfaceId":{"type":"string"},
"type":"string",
"pattern":"eni-[0-9a-f]{8}"
},
"NetworkInterfaceLimitExceeded":{ "NetworkInterfaceLimitExceeded":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -829,10 +823,7 @@ ...@@ -829,10 +823,7 @@
"error":{"httpStatusCode":409}, "error":{"httpStatusCode":409},
"exception":true "exception":true
}, },
"SecurityGroup":{ "SecurityGroup":{"type":"string"},
"type":"string",
"pattern":"sg-[0-9a-f]{8}"
},
"SecurityGroupLimitExceeded":{ "SecurityGroupLimitExceeded":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -858,10 +849,7 @@ ...@@ -858,10 +849,7 @@
"member":{"shape":"SecurityGroup"}, "member":{"shape":"SecurityGroup"},
"max":5 "max":5
}, },
"SubnetId":{ "SubnetId":{"type":"string"},
"type":"string",
"pattern":"subnet-[0-9a-f]{8}"
},
"SubnetNotFound":{ "SubnetNotFound":{
"type":"structure", "type":"structure",
"required":["ErrorCode"], "required":["ErrorCode"],
...@@ -886,8 +874,7 @@ ...@@ -886,8 +874,7 @@
"TagKey":{ "TagKey":{
"type":"string", "type":"string",
"min":1, "min":1,
"max":128, "max":128
"pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
}, },
"TagKeys":{ "TagKeys":{
"type":"list", "type":"list",
...@@ -895,8 +882,7 @@ ...@@ -895,8 +882,7 @@
}, },
"TagValue":{ "TagValue":{
"type":"string", "type":"string",
"max":256, "max":256
"pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
}, },
"Tags":{ "Tags":{
"type":"list", "type":"list",
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"version": 2, "version": 2,
"waiters": { "waiters": {
"InstanceProfileExists": {
"delay": 1,
"operation": "GetInstanceProfile",
"maxAttempts": 40,
"acceptors": [
{
"expected": 200,
"matcher": "status",
"state": "success"
},
{
"state": "retry",
"matcher": "status",
"expected": 404
}
]
},
"UserExists": { "UserExists": {
"delay": 1, "delay": 1,
"operation": "GetUser", "operation": "GetUser",
......
...@@ -321,6 +321,7 @@ ...@@ -321,6 +321,7 @@
"Tags":{"shape":"TagMap"} "Tags":{"shape":"TagMap"}
} }
}, },
"ApproximateArrivalTimestamp":{"type":"timestamp"},
"BooleanObject":{"type":"boolean"}, "BooleanObject":{"type":"boolean"},
"CreateStreamInput":{ "CreateStreamInput":{
"type":"structure", "type":"structure",
...@@ -336,7 +337,7 @@ ...@@ -336,7 +337,7 @@
"Data":{ "Data":{
"type":"blob", "type":"blob",
"min":0, "min":0,
"max":51200 "max":1048576
}, },
"DeleteStreamInput":{ "DeleteStreamInput":{
"type":"structure", "type":"structure",
...@@ -518,7 +519,8 @@ ...@@ -518,7 +519,8 @@
}, },
"PositiveIntegerObject":{ "PositiveIntegerObject":{
"type":"integer", "type":"integer",
"min":1 "min":1,
"max":100000
}, },
"ProvisionedThroughputExceededException":{ "ProvisionedThroughputExceededException":{
"type":"structure", "type":"structure",
...@@ -614,6 +616,7 @@ ...@@ -614,6 +616,7 @@
], ],
"members":{ "members":{
"SequenceNumber":{"shape":"SequenceNumber"}, "SequenceNumber":{"shape":"SequenceNumber"},
"ApproximateArrivalTimestamp":{"shape":"ApproximateArrivalTimestamp"},
"Data":{"shape":"Data"}, "Data":{"shape":"Data"},
"PartitionKey":{"shape":"PartitionKey"} "PartitionKey":{"shape":"PartitionKey"}
} }
......
This diff is collapsed.
...@@ -10,6 +10,69 @@ ...@@ -10,6 +10,69 @@
"protocol":"json" "protocol":"json"
}, },
"operations":{ "operations":{
"CancelExportTask":{
"name":"CancelExportTask",
"http":{
"method":"POST",
"requestUri":"/"
},
"input":{"shape":"CancelExportTaskRequest"},
"errors":[
{
"shape":"InvalidParameterException",
"exception":true
},
{
"shape":"ResourceNotFoundException",
"exception":true
},
{
"shape":"InvalidOperationException",
"exception":true
},
{
"shape":"ServiceUnavailableException",
"exception":true,
"fault":true
}
]
},
"CreateExportTask":{
"name":"CreateExportTask",
"http":{
"method":"POST",
"requestUri":"/"
},
"input":{"shape":"CreateExportTaskRequest"},
"output":{"shape":"CreateExportTaskResponse"},
"errors":[
{
"shape":"InvalidParameterException",
"exception":true
},
{
"shape":"LimitExceededException",
"exception":true
},
{
"shape":"OperationAbortedException",
"exception":true
},
{
"shape":"ServiceUnavailableException",
"exception":true,
"fault":true
},
{
"shape":"ResourceNotFoundException",
"exception":true
},
{
"shape":"ResourceAlreadyExistsException",
"exception":true
}
]
},
"CreateLogGroup":{ "CreateLogGroup":{
"name":"CreateLogGroup", "name":"CreateLogGroup",
"http":{ "http":{
...@@ -250,6 +313,26 @@ ...@@ -250,6 +313,26 @@
} }
] ]
}, },
"DescribeExportTasks":{
"name":"DescribeExportTasks",
"http":{
"method":"POST",
"requestUri":"/"
},
"input":{"shape":"DescribeExportTasksRequest"},
"output":{"shape":"DescribeExportTasksResponse"},
"errors":[
{
"shape":"InvalidParameterException",
"exception":true
},
{
"shape":"ServiceUnavailableException",
"exception":true,
"fault":true
}
]
},
"DescribeLogGroups":{ "DescribeLogGroups":{
"name":"DescribeLogGroups", "name":"DescribeLogGroups",
"http":{ "http":{
...@@ -589,6 +672,37 @@ ...@@ -589,6 +672,37 @@
"min":1 "min":1
}, },
"Arn":{"type":"string"}, "Arn":{"type":"string"},
"CancelExportTaskRequest":{
"type":"structure",
"required":["taskId"],
"members":{
"taskId":{"shape":"ExportTaskId"}
}
},
"CreateExportTaskRequest":{
"type":"structure",
"required":[
"logGroupName",
"from",
"to",
"destination"
],
"members":{
"taskName":{"shape":"ExportTaskName"},
"logGroupName":{"shape":"LogGroupName"},
"logStreamNamePrefix":{"shape":"LogStreamName"},
"from":{"shape":"Timestamp"},
"to":{"shape":"Timestamp"},
"destination":{"shape":"ExportDestinationBucket"},
"destinationPrefix":{"shape":"ExportDestinationPrefix"}
}
},
"CreateExportTaskResponse":{
"type":"structure",
"members":{
"taskId":{"shape":"ExportTaskId"}
}
},
"CreateLogGroupRequest":{ "CreateLogGroupRequest":{
"type":"structure", "type":"structure",
"required":["logGroupName"], "required":["logGroupName"],
...@@ -685,6 +799,22 @@ ...@@ -685,6 +799,22 @@
"nextToken":{"shape":"NextToken"} "nextToken":{"shape":"NextToken"}
} }
}, },
"DescribeExportTasksRequest":{
"type":"structure",
"members":{
"taskId":{"shape":"ExportTaskId"},
"statusCode":{"shape":"ExportTaskStatusCode"},
"nextToken":{"shape":"NextToken"},
"limit":{"shape":"DescribeLimit"}
}
},
"DescribeExportTasksResponse":{
"type":"structure",
"members":{
"exportTasks":{"shape":"ExportTasks"},
"nextToken":{"shape":"NextToken"}
}
},
"DescribeLimit":{ "DescribeLimit":{
"type":"integer", "type":"integer",
"min":1, "min":1,
...@@ -794,6 +924,66 @@ ...@@ -794,6 +924,66 @@
"min":1, "min":1,
"max":10000 "max":10000
}, },
"ExportDestinationBucket":{
"type":"string",
"min":1,
"max":512
},
"ExportDestinationPrefix":{"type":"string"},
"ExportTask":{
"type":"structure",
"members":{
"taskId":{"shape":"ExportTaskId"},
"taskName":{"shape":"ExportTaskName"},
"logGroupName":{"shape":"LogGroupName"},
"from":{"shape":"Timestamp"},
"to":{"shape":"Timestamp"},
"destination":{"shape":"ExportDestinationBucket"},
"destinationPrefix":{"shape":"ExportDestinationPrefix"},
"status":{"shape":"ExportTaskStatus"},
"executionInfo":{"shape":"ExportTaskExecutionInfo"}
}
},
"ExportTaskExecutionInfo":{
"type":"structure",
"members":{
"creationTime":{"shape":"Timestamp"},
"completionTime":{"shape":"Timestamp"}
}
},
"ExportTaskId":{
"type":"string",
"min":1,
"max":512
},
"ExportTaskName":{
"type":"string",
"min":1,
"max":512
},
"ExportTaskStatus":{
"type":"structure",
"members":{
"code":{"shape":"ExportTaskStatusCode"},
"message":{"shape":"ExportTaskStatusMessage"}
}
},
"ExportTaskStatusCode":{
"type":"string",
"enum":[
"CANCELLED",
"COMPLETED",
"FAILED",
"PENDING",
"PENDING_CANCEL",
"RUNNING"
]
},
"ExportTaskStatusMessage":{"type":"string"},
"ExportTasks":{
"type":"list",
"member":{"shape":"ExportTask"}
},
"ExtractedValues":{ "ExtractedValues":{
"type":"map", "type":"map",
"key":{"shape":"Token"}, "key":{"shape":"Token"},
...@@ -895,6 +1085,12 @@ ...@@ -895,6 +1085,12 @@
"max":100 "max":100
}, },
"Interleaved":{"type":"boolean"}, "Interleaved":{"type":"boolean"},
"InvalidOperationException":{
"type":"structure",
"members":{
},
"exception":true
},
"InvalidParameterException":{ "InvalidParameterException":{
"type":"structure", "type":"structure",
"members":{ "members":{
......
This diff is collapsed.
...@@ -1733,11 +1733,7 @@ ...@@ -1733,11 +1733,7 @@
} }
}, },
"VariableName":{"type":"string"}, "VariableName":{"type":"string"},
"VariableValue":{ "VariableValue":{"type":"string"},
"type":"string",
"max":1024,
"pattern":"[a-zA-Z0-9_]*"
},
"Verbose":{"type":"boolean"}, "Verbose":{"type":"boolean"},
"VipURL":{ "VipURL":{
"type":"string", "type":"string",
......
This diff is collapsed.
...@@ -962,6 +962,14 @@ ...@@ -962,6 +962,14 @@
"type":"list", "type":"list",
"member":{"shape":"IPAddressCidr"} "member":{"shape":"IPAddressCidr"}
}, },
"ChildHealthCheckList":{
"type":"list",
"member":{
"shape":"HealthCheckId",
"locationName":"ChildHealthCheck"
},
"max":256
},
"ConflictingDomainExists":{ "ConflictingDomainExists":{
"type":"structure", "type":"structure",
"members":{ "members":{
...@@ -1469,7 +1477,11 @@ ...@@ -1469,7 +1477,11 @@
"FullyQualifiedDomainName":{"shape":"FullyQualifiedDomainName"}, "FullyQualifiedDomainName":{"shape":"FullyQualifiedDomainName"},
"SearchString":{"shape":"SearchString"}, "SearchString":{"shape":"SearchString"},
"RequestInterval":{"shape":"RequestInterval"}, "RequestInterval":{"shape":"RequestInterval"},
"FailureThreshold":{"shape":"FailureThreshold"} "FailureThreshold":{"shape":"FailureThreshold"},
"MeasureLatency":{"shape":"MeasureLatency"},
"Inverted":{"shape":"Inverted"},
"HealthThreshold":{"shape":"HealthThreshold"},
"ChildHealthChecks":{"shape":"ChildHealthCheckList"}
} }
}, },
"HealthCheckCount":{"type":"long"}, "HealthCheckCount":{"type":"long"},
...@@ -1511,7 +1523,8 @@ ...@@ -1511,7 +1523,8 @@
"HTTPS", "HTTPS",
"HTTP_STR_MATCH", "HTTP_STR_MATCH",
"HTTPS_STR_MATCH", "HTTPS_STR_MATCH",
"TCP" "TCP",
"CALCULATED"
] ]
}, },
"HealthCheckVersion":{ "HealthCheckVersion":{
...@@ -1533,6 +1546,11 @@ ...@@ -1533,6 +1546,11 @@
"locationName":"HealthCheck" "locationName":"HealthCheck"
} }
}, },
"HealthThreshold":{
"type":"integer",
"min":0,
"max":256
},
"HostedZone":{ "HostedZone":{
"type":"structure", "type":"structure",
"required":[ "required":[
...@@ -1639,6 +1657,7 @@ ...@@ -1639,6 +1657,7 @@
"error":{"httpStatusCode":400}, "error":{"httpStatusCode":400},