r88598 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r88597‎ \| r88598 \| r88599 >
Date:	19:44, 22 May 2011
Author:	reedy
Status:	deferred
Tags:
Comment:	Bump aws-sdk 1.3.3 Moogle
Modified paths:	/trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/_docs/NOTICE.md (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/extensions (added) (history) /trunk/extensions/OpenStackManager/aws-sdk/extensions/s3browserupload.class.php (added) (history) /trunk/extensions/OpenStackManager/aws-sdk/lib/requestcore/requestcore.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/cloudfront.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/elasticbeanstalk.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/importexport.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/ses.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/utilities/array.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/utilities/hadoopstep.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/utilities/json.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/utilities/policy.class.php (modified) (history) /trunk/extensions/OpenStackManager/aws-sdk/utilities/simplexml.class.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/aws-sdk/extensions/s3browserupload.class.php
—	—	@@ -0,0 +1,171 @@
	2	+<?php
	3	+/*
	4	+ * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
	5	+ *
	6	+ * Licensed under the Apache License, Version 2.0 (the "License").
	7	+ * You may not use this file except in compliance with the License.
	8	+ * A copy of the License is located at
	9	+ *
	10	+ * http://aws.amazon.com/apache2.0
	11	+ *
	12	+ * or in the "license" file accompanying this file. This file is distributed
	13	+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
	14	+ * express or implied. See the License for the specific language governing
	15	+ * permissions and limitations under the License.
	16	+ */
	17	+
	18	+
	19	+class S3BrowserUpload extends AmazonS3
	20	+{
	21	+ /**
	22	+ * The <code>POST</code> operation adds an object to a specified bucket using HTML forms. POST is an alternate
	23	+ * form of <code>PUT</code> that enables browser-based uploads as a way of putting objects in buckets.
	24	+ * Parameters that are passed to <code>PUT</code> via HTTP headers are instead passed as form fields to
	25	+ * <code>POST</code> in the <code>multipart/form-data</code> encoded message body. You must have
	26	+ * <code>WRITE</code> access on a bucket to add an object to it. Amazon S3 never stores partial objects: if
	27	+ * you receive a successful response, you can be confident the entire object was stored.
	28	+ *
	29	+ * @param string $bucket (Required) The name of the bucket to use.
	30	+ * @param string\|integer $expires (Optional) The point in time when the upload form field should expire. The default value is <code>+1 hour</code>.
	31	+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
	32	+ * <li><code>acl</code> - <code>string</code> - Optional - The access control setting to apply to the uploaded file. Accepts any of the following constants: [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>].</li>
	33	+ * <li><code>Cache-Control</code> - <code>string</code> - Optional - The Cache-Control HTTP header value to apply to the uploaded file. To use a <code>starts-with</code> comparison instead of an <code>equals</code> comparison, prefix the value with a <code>^</code> (carat) character.</li>
	34	+ * <li><code>Content-Disposition</code> - <code>string</code> - Optional - The Content-Disposition HTTP header value to apply to the uploaded file. To use a <code>starts-with</code> comparison instead of an <code>equals</code> comparison, prefix the value with a <code>^</code> (carat) character.</li>
	35	+ * <li><code>Content-Encoding</code> - <code>string</code> - Optional - The Content-Encoding HTTP header value to apply to the uploaded file. To use a <code>starts-with</code> comparison instead of an <code>equals</code> comparison, prefix the value with a <code>^</code> (carat) character.</li>
	36	+ * <li><code>Content-Type</code> - <code>string</code> - Optional - The Content-Type HTTP header value to apply to the uploaded file. The default value is <code>application/octet-stream</code>. To use a <code>starts-with</code> comparison instead of an <code>equals</code> comparison, prefix the value with a <code>^</code> (carat) character.</li>
	37	+ * <li><code>Expires</code> - <code>string</code> - Optional - The Expires HTTP header value to apply to the uploaded file. To use a <code>starts-with</code> comparison instead of an <code>equals</code> comparison, prefix the value with a <code>^</code> (carat) character.</li>
	38	+ * <li><code>key</code> - <code>string</code> - Optional - The location where the file should be uploaded to. The default value is <code>${filename}</code>.</li>
	39	+ * <li><code>success_action_redirect</code> - <code>string</code> - Optional - The URI for Amazon S3 to redirect to upon successful upload.</li>
	40	+ * <li><code>success_action_status</code> - <code>integer</code> - Optional - The status code for Amazon S3 to return upon successful upload.</li>
	41	+ * <li><code>x-amz-storage-class</code> - <code>string</code> - Optional - The storage setting to apply to the object. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>AmazonS3::STORAGE_STANDARD</code>.</li>
	42	+ * <li>x-amz-meta-*</li>
	43	+ * </ul>
	44	+ * @return array An array of fields that can be converted into markup.
	45	+ * @link http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPOST.html POST Object
	46	+ */
	47	+ public function generate_upload_parameters($bucket, $expires = '+1 hour', $opt = null)
	48	+ {
	49	+ if (!$opt) $opt = array();
	50	+
	51	+ // Policy document
	52	+ $policy = array(
	53	+ 'conditions' => array(
	54	+ array('bucket' => $bucket),
	55	+ )
	56	+ );
	57	+
	58	+ // Basic form
	59	+ $form = array();
	60	+ $form['form'] = array(
	61	+ 'action' => $bucket . '.s3.amazonaws.com',
	62	+ 'method' => 'POST',
	63	+ 'enctype' => 'multipart/form-data'
	64	+ );
	65	+
	66	+ // Inputs
	67	+ $form['inputs'] = array(
	68	+ 'AWSAccessKeyId' => $this->key
	69	+ );
	70	+
	71	+ // Expires
	72	+ if ($expires)
	73	+ {
	74	+ if (is_numeric($expires))
	75	+ {
	76	+ $expires = gmdate('j M Y, g:i a Z', (integer) $expires);
	77	+ }
	78	+
	79	+ $expires = $this->util->convert_date_to_iso8601($expires);
	80	+ $policy['expiration'] = (string) $expires;
	81	+ }
	82	+
	83	+ // Default values
	84	+ if (!isset($opt['key']))
	85	+ {
	86	+ $opt['key'] = '${filename}';
	87	+ }
	88	+
	89	+ // Success Action Status
	90	+ if (isset($opt['success_action_status']) && !empty($opt['success_action_status']))
	91	+ {
	92	+ $form['inputs']['success_action_status'] = (string) $opt['success_action_status'];
	93	+ $policy['conditions'][] = array(
	94	+ 'success_action_status' => (string) $opt['success_action_status']
	95	+ );
	96	+ unset($opt['success_action_status']);
	97	+ }
	98	+
	99	+ // Other parameters
	100	+ foreach ($opt as $param_key => $param_value)
	101	+ {
	102	+ if ($param_value[0] === '^')
	103	+ {
	104	+ $form['inputs'][$param_key] = substr((string) $param_value, 1);
	105	+ $param_value = preg_replace('/\$\{(\w*)\}/', '', (string) $param_value);
	106	+ $policy['conditions'][] = array('starts-with', '$' . $param_key, (substr((string) $param_value, 1) ? substr((string) $param_value, 1) : ''));
	107	+ }
	108	+ else
	109	+ {
	110	+ $form['inputs'][$param_key] = (string) $param_value;
	111	+ $policy['conditions'][] = array(
	112	+ $param_key => (string) $param_value
	113	+ );
	114	+ }
	115	+ }
	116	+
	117	+ // Add policy
	118	+ $json_policy = json_encode($policy);
	119	+ $json_policy_b64 = base64_encode($json_policy);
	120	+ $form['inputs']['policy'] = $json_policy_b64;
	121	+ $form['metadata']['json_policy'] = $json_policy;
	122	+
	123	+ // Add signature
	124	+ $form['inputs']['signature'] = base64_encode(hash_hmac('sha1', $json_policy_b64, $this->secret_key, true));
	125	+
	126	+ return $form;
	127	+ }
	128	+
	129	+
	130	+ /%****************************************************************************************%/
	131	+ // HELPERS
	132	+
	133	+ /**
	134	+ * Returns the protocol of the web page that this script is currently running on. This method only works
	135	+ * correctly when run from a publicly-accessible web page.
	136	+ */
	137	+ public static function protocol()
	138	+ {
	139	+ return (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) === 'on') ? 'https://' : 'http://';
	140	+ }
	141	+
	142	+ /**
	143	+ * Returns the domain (and port) of the web page that this script is currently running on. This method
	144	+ * only works correctly when run from a publicly-accessible web page.
	145	+ */
	146	+ public static function domain()
	147	+ {
	148	+ if (isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']))
	149	+ {
	150	+ return $_SERVER['SERVER_NAME'] . ((integer) $_SERVER['SERVER_PORT'] === 80 ? '' : ':' . $_SERVER['SERVER_PORT']);
	151	+ }
	152	+
	153	+ return null;
	154	+ }
	155	+
	156	+ /**
	157	+ * Returns the URI of the web page that this script is currently running on. This method only works
	158	+ * correctly when run from a publicly-accessible web page.
	159	+ */
	160	+ public static function current_uri()
	161	+ {
	162	+ if (isset($_SERVER['REQUEST_URI']))
	163	+ {
	164	+ $uri = self::protocol();
	165	+ $uri .= self::domain();
	166	+ $uri .= $_SERVER['REQUEST_URI'];
	167	+ return $uri;
	168	+ }
	169	+
	170	+ return null;
	171	+ }
	172	+}
Property changes on: trunk/extensions/OpenStackManager/aws-sdk/extensions/s3browserupload.class.php
___________________________________________________________________
Added: svn:eol-style
1	173	+ native
Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php
—	—	@@ -19,15 +19,20 @@
20	20	*
21	21	* This is the AWS CloudFormation API Reference. The major sections of this guide are described in the following table.
22	22	*
23		~~- * <table> <tr> <td> <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_Operations.html">Actions</a> </td>~~
24		~~- * <td>Alphabetical list of CloudFormation actions</td> <td> <a~~
25		~~- * href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_Types.html">Data Types</a> </td> <td>Alphabetical list of~~
26		~~- * CloudFormation data types</td> <td> <a~~
27		~~- * href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/CommonParameters.html">Common Parameters</a> </td>~~
28		~~- * <td>Parameters that all Query actions can use</td> <td> <a~~
29		~~- * href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/CommonErrors.html">Common Errors</a> </td> <td>Client and~~
30		~~- * server errors that all actions can return</td> </tr> </table>~~
	23	+ * <ul> <li> <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_Operations.html">Actions</a>: Alphabetical
	24	+ * list of CloudFormation actions</li>
31	25	*
	26	+ * <li> <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_Types.html">Data Types</a>: Alphabetical list of
	27	+ * CloudFormation data types</li>
	28	+ *
	29	+ * <li> <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/CommonParameters.html">Common Parameters</a>:
	30	+ * Parameters that all Query actions can use</li>
	31	+ *
	32	+ * <li> <a href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/CommonErrors.html">Common Errors</a>: Client and
	33	+ * server errors that all actions can return</li>
	34	+ *
	35	+ * </ul>
	36	+ *
32	37	* This guide is for programmers who need detailed information about the CloudFormation APIs. You use AWS CloudFormation to create and manage
33	38	* AWS infrastructure deployments predictably and repeatedly. CloudFormation helps you leverage AWS products such as Amazon EC2, EBS, Amazon
34	39	* SNS, ELB, and Auto Scaling to build highly-reliable, highly scalable, cost effective applications without worrying about creating and
—	—	@@ -41,9 +46,9 @@
42	47	* Page</a>.
43	48	*
44	49	* Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a specific AWS product, you can
45		~~- * find the product's technical documentation at http://aws.amazon.com/documentation/.~~
	50	+ * find the product's technical documentation at <a href="http://aws.amazon.com/documentation/">http://aws.amazon.com/documentation/</a>.
46	51	*
47		~~- * @version Tue Apr 05 15:16:15 PDT 2011~~
	52	+ * @version Tue May 10 18:24:21 PDT 2011
48	53	* @license See the included NOTICE.md file for complete information.
49	54	* @copyright See the included NOTICE.md file for complete information.
50	55	* @link http://aws.amazon.com/cloudformation/Amazon CloudFormation
—	—	@@ -119,12 +124,16 @@
120	125
121	126	if (!$key && !defined('AWS_KEY'))
122	127	{
	128	+ // @codeCoverageIgnoreStart
123	129	throw new CloudFormation_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	130	+ // @codeCoverageIgnoreEnd
124	131	}
125	132
126	133	if (!$secret_key && !defined('AWS_SECRET_KEY'))
127	134	{
	135	+ // @codeCoverageIgnoreStart
128	136	throw new CloudFormation_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	137	+ // @codeCoverageIgnoreEnd
129	138	}
130	139
131	140	return parent::__construct($key, $secret_key);
—	—	@@ -154,7 +163,7 @@
155	164	* <li><code>DisableRollback</code> - <code>boolean</code> - Optional - Boolean to enable or disable rollback on stack creation failures.<br></br> Default: <code>false</code> </li>
156	165	* <li><code>TimeoutInMinutes</code> - <code>integer</code> - Optional - The amount of time that can pass before the stack status becomes CREATE_FAILED; if <code>DisableRollback</code> is not set or is set to <code>false</code>, the stack will be rolled back. </li>
157	166	* <li><code>NotificationARNs</code> - <code>string\|array</code> - Optional - The Simple Notification Service (SNS) topic ARNs to publish stack related events. You can find your SNS topic ARNs using the SNS console or your Command Line Interface (CLI). Pass a string for a single value, or an indexed array for multiple values. </li>
158		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	167	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
159	168	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
160	169	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
161	170	*/
—	—	@@ -191,7 +200,7 @@
192	201	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
193	202	* <li><code>TemplateBody</code> - <code>string</code> - Optional - String containing the template body. (For more information, go to the AWS CloudFormation User Guide.) Conditional: You must pass <code>TemplateURL</code> or <code>TemplateBody</code>. If both are passed, only <code>TemplateBody</code> is used. </li>
194	203	* <li><code>TemplateURL</code> - <code>string</code> - Optional - Location of file containing the template body. The URL must point to a template located in an S3 bucket in the same region as the stack. For more information, go to the AWS CloudFormation User Guide. Conditional: You must pass <code>TemplateURL</code> or <code>TemplateBody</code>. If both are passed, only <code>TemplateBody</code> is used. </li>
195		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	204	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
196	205	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
197	206	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
198	207	*/
—	—	@@ -209,7 +218,7 @@
210	219	*
211	220	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
212	221	* <li><code>StackName</code> - <code>string</code> - Optional - The name or the unique identifier associated with the stack. Default: There is no default value. </li>
213		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	222	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
214	223	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
215	224	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
216	225	*/
—	—	@@ -232,7 +241,7 @@
233	242	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
234	243	* <li><code>StackName</code> - <code>string</code> - Optional - The name or the unique identifier associated with the stack.<br></br> Default: There is no default value. </li>
235	244	* <li><code>NextToken</code> - <code>string</code> - Optional - String that identifies the start of the next list of events, if there is one.<br></br> Default: There is no default value. </li>
236		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	245	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
237	246	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
238	247	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
239	248	*/
—	—	@@ -251,7 +260,7 @@
252	261	*
253	262	* @param string $stack_name (Required) The name or the unique identifier associated with the stack.
254	263	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
255		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	264	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
256	265	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
257	266	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
258	267	*/
—	—	@@ -270,7 +279,7 @@
271	280	*
272	281	* @param string $stack_name (Required) The name or the unique identifier associated with the stack.
273	282	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
274		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	283	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
275	284	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
276	285	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
277	286	*/
—	—	@@ -298,7 +307,7 @@
299	308	* <li><code>StackName</code> - <code>string</code> - Optional - The name or the unique identifier associated with the stack. Default: There is no default value. </li>
300	309	* <li><code>LogicalResourceId</code> - <code>string</code> - Optional - The logical name of the resource as specified in the template.<br></br> Default: There is on default value. </li>
301	310	* <li><code>PhysicalResourceId</code> - <code>string</code> - Optional - The name or unique identifier that corresponds to a physical instance ID of a resource supported by AWS CloudFormation. For example, for an Amazon Elastic Compute Cloud (EC2) instance, <code>PhysicalResourceId</code> corresponds to the <code>InstanceId</code>. You can pass the EC2 <code>InstanceId</code> to <code>DescribeStackResources</code> to find which stack the instance belongs to and what other resources are part of the stack. Default: There is no default value. </li>
302		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	311	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
303	312	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
304	313	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
305	314	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php
—	—	@@ -49,7 +49,7 @@
50	50	*
51	51	* Visit <http://aws.amazon.com/s3/> for more information.
52	52	*
53		~~- * @version 2011.03.11~~
	53	+ * @version 2011.04.22
54	54	* @license See the included NOTICE.md file for more information.
55	55	* @copyright See the included NOTICE.md file for more information.
56	56	* @link http://aws.amazon.com/s3/ Amazon Simple Storage Service
—	—	@@ -267,12 +267,16 @@
268	268
269	269	if (!$key && !defined('AWS_KEY'))
270	270	{
	271	+ // @codeCoverageIgnoreStart
271	272	throw new S3_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	273	+ // @codeCoverageIgnoreEnd
272	274	}
273	275
274	276	if (!$secret_key && !defined('AWS_SECRET_KEY'))
275	277	{
	278	+ // @codeCoverageIgnoreStart
276	279	throw new S3_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	280	+ // @codeCoverageIgnoreEnd
277	281	}
278	282
279	283	return parent::__construct($key, $secret_key);
—	—	@@ -332,7 +336,9 @@
333	337	// Validate the S3 bucket name
334	338	if (!$this->validate_bucketname_support($bucket))
335	339	{
	340	+ // @codeCoverageIgnoreStart
336	341	throw new S3_Exception('S3 does not support "' . $bucket . '" as a valid bucket name. Review "Bucket Restrictions and Limitations" in the S3 Developer Guide for more information.');
	342	+ // @codeCoverageIgnoreEnd
337	343	}
338	344
339	345	// Die if $opt isn't set.
—	—	@@ -719,6 +725,7 @@
720	726
721	727	// Did Amazon tell us to redirect? Typically happens for multiple rapid requests EU datacenters.
722	728	// @see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/Redirects.html
	729	+ // @codeCoverageIgnoreStart
723	730	if ((integer) $request->get_response_code() === 307) // Temporary redirect to new endpoint.
724	731	{
725	732	$data = $this->authenticate($bucket, $opt, $headers['location'], ++$redirects);
—	—	@@ -735,6 +742,7 @@
736	743	$data = $this->authenticate($bucket, $opt, null, ++$redirects);
737	744	}
738	745	}
	746	+ // @codeCoverageIgnoreEnd
739	747
740	748	// Return!
741	749	return $data;
—	—	@@ -850,7 +858,10 @@
851	859	$this->set_hostname('s3-' . $region . '.amazonaws.com');
852	860	$this->enable_path_style(false);
853	861	break;
	862	+
	863	+ // @codeCoverageIgnoreStart
854	864	}
	865	+ // @codeCoverageIgnoreEnd
855	866
856	867	return $this;
857	868	}
—	—	@@ -895,7 +906,7 @@
896	907	* @param string $region (Required) The preferred geographical location for the bucket. [Allowed values: `AmazonS3::REGION_US_E1 `, `AmazonS3::REGION_US_W1`, `AmazonS3::REGION_EU_W1`, `AmazonS3::REGION_APAC_SE1`, `AmazonS3::REGION_APAC_NE1`]
897	908	* @param string $acl (Optional) The ACL settings for the specified bucket. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <ACL_PRIVATE>.
898	909	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
899		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	910	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
900	911	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request.</li></ul>
901	912	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
902	913	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/UsingBucket.html Working with Amazon S3 Buckets
—	—	@@ -915,7 +926,9 @@
916	927	// Validate the S3 bucket name for creation
917	928	if (!$this->validate_bucketname_create($bucket))
918	929	{
	930	+ // @codeCoverageIgnoreStart
919	931	throw new S3_Exception('"' . $bucket . '" is not DNS-valid (i.e., <bucketname>.s3.amazonaws.com), and cannot be used as an S3 bucket name. Review "Bucket Restrictions and Limitations" in the S3 Developer Guide for more information.');
	932	+ // @codeCoverageIgnoreEnd
920	933	}
921	934
922	935	if (!$opt) $opt = array();
—	—	@@ -948,7 +961,10 @@
949	962	$xml->LocationConstraint = $region;
950	963	$opt['body'] = $xml->asXML();
951	964	break;
	965	+
	966	+ // @codeCoverageIgnoreStart
952	967	}
	968	+ // @codeCoverageIgnoreEnd
953	969
954	970	$response = $this->authenticate($bucket, $opt);
955	971
—	—	@@ -989,7 +1005,7 @@
990	1006	* @param string $bucket (Required) The name of the bucket to use.
991	1007	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
992	1008	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
993		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1009	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
994	1010	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
995	1011	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
996	1012	*/
—	—	@@ -1007,7 +1023,7 @@
1008	1024	* @param string $bucket (Required) The name of the bucket to use.
1009	1025	* @param boolean $force (Optional) Whether to force-delete the bucket and all of its contents. The default value is <code>false</code>.
1010	1026	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1011		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1027	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1012	1028	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1013	1029	* @return mixed A <CFResponse> object if the bucket was deleted successfully. Returns boolean <code>false</code> if otherwise.
1014	1030	*/
—	—	@@ -1031,7 +1047,9 @@
1032	1048	return $this->authenticate($bucket, $opt);
1033	1049	}
1034	1050
	1051	+ // @codeCoverageIgnoreStart
1035	1052	return false;
	1053	+ // @codeCoverageIgnoreEnd
1036	1054	}
1037	1055
1038	1056	/**
—	—	@@ -1039,7 +1057,7 @@
1040	1058	*
1041	1059	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1042	1060	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1043		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1061	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1044	1062	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1045	1063	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1046	1064	*/
—	—	@@ -1057,7 +1075,7 @@
1058	1076	* @param string $bucket (Required) The name of the bucket to use.
1059	1077	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1060	1078	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1061		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1079	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1062	1080	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1063	1081	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1064	1082	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
—	—	@@ -1079,7 +1097,7 @@
1080	1098	* @param string $bucket (Required) The name of the bucket to use.
1081	1099	* @param string $acl (Optional) The ACL settings for the specified bucket. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of associative arrays. Each associative array contains an `id` and a `permission` key. The default value is <ACL_PRIVATE>.
1082	1100	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1083		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1101	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1084	1102	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1085	1103	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1086	1104	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
—	—	@@ -1095,6 +1113,7 @@
1096	1114	);
1097	1115
1098	1116	// Make sure these are defined.
	1117	+ // @codeCoverageIgnoreStart
1099	1118	if (!defined('AWS_CANONICAL_ID') \|\| !defined('AWS_CANONICAL_NAME'))
1100	1119	{
1101	1120	// Fetch the data live.
—	—	@@ -1102,6 +1121,7 @@
1103	1122	define('AWS_CANONICAL_ID', $canonical['id']);
1104	1123	define('AWS_CANONICAL_NAME', $canonical['display_name']);
1105	1124	}
	1125	+ // @codeCoverageIgnoreEnd
1106	1126
1107	1127	if (is_array($acl))
1108	1128	{
—	—	@@ -1210,7 +1230,7 @@
1211	1231	* <li><code>range</code> - <code>string</code> - Optional - The range of bytes to fetch from the object. Specify this parameter when downloading partial bits or completing incomplete object downloads. The specified range must be notated with a hyphen (e.g., 0-10485759). Defaults to the byte range of the complete Amazon S3 object.</li>
1212	1232	* <li><code>response</code> - <code>array</code> - Optional - Allows adjustments to specific response headers. Pass an associative array where each key is one of the following: <code>cache-control</code>, <code>content-disposition</code>, <code>content-encoding</code>, <code>content-language</code>, <code>content-type</code>, <code>expires</code>. The <code>expires</code> value should use <php:gmdate()> and be formatted with the <code>DATE_RFC2822</code> constant.</li>
1213	1233	* <li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
1214		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1234	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1215	1235	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1216	1236	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1217	1237	*/
—	—	@@ -1265,7 +1285,7 @@
1266	1286	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1267	1287	* <li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
1268	1288	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1269		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1289	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1270	1290	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1271	1291	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1272	1292	*/
—	—	@@ -1289,7 +1309,7 @@
1290	1310	* <li><code>versionId</code> - <code>string</code> - Optional - The version of the object to delete. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
1291	1311	* <li><code>MFASerial</code> - <code>string</code> - Optional - The serial number on the back of the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
1292	1312	* <li><code>MFAToken</code> - <code>string</code> - Optional - The current token displayed on the Gemalto device. <code>MFASerial</code> and <code>MFAToken</code> must both be set for MFA to work.</li>
1293		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1313	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1294	1314	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1295	1315	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1296	1316	* @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
—	—	@@ -1302,12 +1322,14 @@
1303	1323	$opt['resource'] = $filename;
1304	1324
1305	1325	// Enable MFA delete?
	1326	+ // @codeCoverageIgnoreStart
1306	1327	if (isset($opt['MFASerial']) && isset($opt['MFAToken']))
1307	1328	{
1308	1329	$opt['headers'] = array(
1309	1330	'x-amz-mfa' => ($opt['MFASerial'] . ' ' . $opt['MFAToken'])
1310	1331	);
1311	1332	}
	1333	+ // @codeCoverageIgnoreEnd
1312	1334
1313	1335	// Authenticate to S3
1314	1336	return $this->authenticate($bucket, $opt);
—	—	@@ -1323,7 +1345,7 @@
1324	1346	* <li><code>max-keys</code> - <code>string</code> - Optional - The maximum number of results returned by the method call. The returned list will contain no more results than the specified value, but may return less.</li>
1325	1347	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1326	1348	* <li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to contain results that begin only with the specified prefix.</li>
1327		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1349	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1328	1350	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1329	1351	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1330	1352	*/
—	—	@@ -1367,7 +1389,7 @@
1368	1390	* <li><code>headers</code> - <code>array</code> - Optional - Standard HTTP headers to send along in the request.</li>
1369	1391	* <li><code>meta</code> - <code>array</code> - Optional - Associative array of key-value pairs. Represented by <code>x-amz-meta-:</code> Any header starting with this prefix is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
1370	1392	* <li><code>metadataDirective</code> - <code>string</code> - Optional - Accepts either COPY or REPLACE. You will likely never need to use this, as it manages itself with no issues.</li>
1371		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1393	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1372	1394	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1373	1395	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1374	1396	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/API/RESTObjectCOPY.html Copying Amazon S3 Objects
—	—	@@ -1489,7 +1511,7 @@
1490	1512	* <li><code>acl</code> - <code>string</code> - Optional - The ACL settings for the specified object. [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. The default value is <ACL_PRIVATE>.</li>
1491	1513	* <li><code>headers</code> - <code>array</code> - Optional - The standard HTTP headers to update the Amazon S3 object with.</li>
1492	1514	* <li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Any header with the <code>x-amz-meta-</code> prefix is considered user metadata and is stored with the Amazon S3 object. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
1493		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1515	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1494	1516	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1495	1517	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1496	1518	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/API/RESTObjectCOPY.html Copying Amazon S3 Objects
—	—	@@ -1519,7 +1541,7 @@
1520	1542	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1521	1543	* <li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
1522	1544	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1523		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1545	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1524	1546	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1525	1547	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1526	1548	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
—	—	@@ -1543,7 +1565,7 @@
1544	1566	* @param string $filename (Required) The file name for the object.
1545	1567	* @param string $acl (Optional) The ACL settings for the specified object. Accepts any of the following constants: [Allowed values: <code>AmazonS3::ACL_PRIVATE</code>, <code>AmazonS3::ACL_PUBLIC</code>, <code>AmazonS3::ACL_OPEN</code>, <code>AmazonS3::ACL_AUTH_READ</code>, <code>AmazonS3::ACL_OWNER_READ</code>, <code>AmazonS3::ACL_OWNER_FULL_CONTROL</code>]. Alternatively, an array of associative arrays. Each associative array contains an <code>id</code> and a <code>permission</code> key. The default value is <code>ACL_PRIVATE</code>.
1546	1568	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1547		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1569	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1548	1570	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1549	1571	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1550	1572	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
—	—	@@ -1568,6 +1590,7 @@
1569	1591	}
1570	1592
1571	1593	// Make sure these are defined.
	1594	+ // @codeCoverageIgnoreStart
1572	1595	if (!defined('AWS_CANONICAL_ID') \|\| !defined('AWS_CANONICAL_NAME'))
1573	1596	{
1574	1597	// Fetch the data live.
—	—	@@ -1575,6 +1598,7 @@
1576	1599	define('AWS_CANONICAL_ID', $canonical['id']);
1577	1600	define('AWS_CANONICAL_NAME', $canonical['display_name']);
1578	1601	}
	1602	+ // @codeCoverageIgnoreEnd
1579	1603
1580	1604	if (is_array($acl))
1581	1605	{
—	—	@@ -1664,7 +1688,7 @@
1665	1689	* @param string $bucket (Required) The name of the bucket to use. Pass a `null` value when using the <set_vhost()> method.
1666	1690	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1667	1691	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
1668		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1692	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1669	1693	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1670	1694	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1671	1695	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/ServerLogs.html Server Access Logging
—	—	@@ -1688,7 +1712,7 @@
1689	1713	* @param string $target_prefix (Required) The prefix to give to the log file names.
1690	1714	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1691	1715	* <li><code>users</code> - <code>array</code> - Optional - An array of associative arrays specifying any user to give access to. Each associative array contains an <code>id</code> and <code>permission</code> value.</li>
1692		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1716	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1693	1717	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1694	1718	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1695	1719	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/LoggingAPI.html Server Access Logging Configuration API
—	—	@@ -1767,7 +1791,7 @@
1768	1792	*
1769	1793	* @param string $bucket (Required) The name of the bucket to use. Pass `null` if using <set_vhost()>.
1770	1794	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1771		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1795	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1772	1796	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1773	1797	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1774	1798	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/LoggingAPI.html Server Access Logging Configuration API
—	—	@@ -1827,7 +1851,10 @@
1828	1852
1829	1853	if ($header->isOK()) { return true; }
1830	1854	elseif ($header->status === 404) { return false; }
	1855	+
	1856	+ // @codeCoverageIgnoreStart
1831	1857	return null;
	1858	+ // @codeCoverageIgnoreEnd
1832	1859	}
1833	1860
1834	1861	/**
—	—	@@ -1840,14 +1867,19 @@
1841	1868	{
1842	1869	if ($this->use_batch_flow)
1843	1870	{
	1871	+ // @codeCoverageIgnoreStart
1844	1872	throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
	1873	+ // @codeCoverageIgnoreEnd
1845	1874	}
1846	1875
1847	1876	$response = $this->get_bucket_policy($bucket);
1848	1877
1849	1878	if ($response->isOK()) { return true; }
1850	1879	elseif ($response->status === 404) { return false; }
	1880	+
	1881	+ // @codeCoverageIgnoreStart
1851	1882	return null;
	1883	+ // @codeCoverageIgnoreEnd
1852	1884	}
1853	1885
1854	1886	/**
—	—	@@ -1860,7 +1892,9 @@
1861	1893	{
1862	1894	if ($this->use_batch_flow)
1863	1895	{
	1896	+ // @codeCoverageIgnoreStart
1864	1897	throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
	1898	+ // @codeCoverageIgnoreEnd
1865	1899	}
1866	1900
1867	1901	return count($this->get_object_list($bucket));
—	—	@@ -1942,7 +1976,7 @@
1943	1977	* @param string $filename (Required) The file name for the object.
1944	1978	* @param string $contentType (Required) The content-type to apply to the object.
1945	1979	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1946		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1980	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1947	1981	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1948	1982	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1949	1983	*/
—	—	@@ -1983,7 +2017,7 @@
1984	2018	* @param string $filename (Required) The file name for the object.
1985	2019	* @param string $storage (Required) The storage setting to apply to the object. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]
1986	2020	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1987		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2021	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1988	2022	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1989	2023	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1990	2024	*/
—	—	@@ -2037,7 +2071,9 @@
2038	2072	return $list;
2039	2073	}
2040	2074
	2075	+ // @codeCoverageIgnoreStart
2041	2076	return array();
	2077	+ // @codeCoverageIgnoreEnd
2042	2078	}
2043	2079
2044	2080	/**
—	—	@@ -2050,7 +2086,7 @@
2051	2087	* <li><code>max-keys</code> - <code>string</code> - Optional - The maximum number of results returned by the method call. The returned list will contain no more results than the specified value, but may return less.</li>
2052	2088	* <li><code>pcre</code> - <code>string</code> - Optional - A Perl-Compatible Regular Expression (PCRE) to filter the names against. This is applied only AFTER any native Amazon S3 filtering from specified <code>prefix</code>, <code>marker</code>, <code>max-keys</code>, or <code>delimiter</code> values are applied.</li>
2053	2089	* <li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to contain results that begin only with the specified prefix.</li>
2054		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2090	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2055	2091	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2056	2092	* @return array The list of matching object names. If there are no results, the method will return an empty array.
2057	2093	* @link http://php.net/pcre Regular Expressions (Perl-Compatible)
—	—	@@ -2173,7 +2209,9 @@
2174	2210	{
2175	2211	if ($this->use_batch_flow)
2176	2212	{
	2213	+ // @codeCoverageIgnoreStart
2177	2214	throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
	2215	+ // @codeCoverageIgnoreEnd
2178	2216	}
2179	2217
2180	2218	// Instantiate
—	—	@@ -2249,7 +2287,7 @@
2250	2288	* @param string $filename (Required) The file name for the Amazon S3 object.
2251	2289	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2252	2290	* <li><code>versionId</code> - <code>string</code> - Optional - The version of the object to retrieve. Version IDs are returned in the <code>x-amz-version-id</code> header of any previous object-related request.</li>
2253		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2291	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2254	2292	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2255	2293	* @return mixed If the object exists, the method returns the collective metadata for the Amazon S3 object. If the object does not exist, the method returns boolean <code>false</code>.
2256	2294	*/
—	—	@@ -2398,7 +2436,7 @@
2399	2437	* <li><code>MFASerial</code> - string (Optional) The serial number on the back of the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2400	2438	* <li><code>MFAToken</code> - string (Optional) The current token displayed on the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2401	2439	* <li><code>MFAStatus</code> - string (Optional) The MFA Delete status. Can be <code>Enabled</code> or <code>Disabled</code>. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2402		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2440	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2403	2441	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2404	2442	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2405	2443	* @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
—	—	@@ -2418,12 +2456,13 @@
2419	2457	$xml->addChild('Status', 'Enabled');
2420	2458
2421	2459	// Enable MFA delete?
	2460	+ // @codeCoverageIgnoreStart
2422	2461	if (isset($opt['MFASerial']) && isset($opt['MFAToken']) && isset($opt['MFAStatus']))
2423	2462	{
2424	2463	$xml->addChild('MfaDelete', $opt['MFAStatus']);
2425		-
2426	2464	$opt['headers']['x-amz-mfa'] = ($opt['MFASerial'] . ' ' . $opt['MFAToken']);
2427	2465	}
	2466	+ // @codeCoverageIgnoreEnd
2428	2467
2429	2468	$opt['body'] = $xml->asXML();
2430	2469
—	—	@@ -2439,7 +2478,7 @@
2440	2479	* <li><code>MFASerial</code> - <code>string</code> - Optional - The serial number on the back of the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2441	2480	* <li><code>MFAToken</code> - <code>string</code> - Optional - The current token displayed on the Gemalto device. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2442	2481	* <li><code>MFAStatus</code> - <code>string</code> - Optional - The MFA Delete status. Can be <code>Enabled</code> or <code>Disabled</code>. <code>MFASerial</code>, <code>MFAToken</code> and <code>MFAStatus</code> must all be set for MFA to work.</li>
2443		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2482	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2444	2483	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2445	2484	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2446	2485	* @link http://aws.amazon.com/mfa/ Multi-Factor Authentication
—	—	@@ -2459,12 +2498,13 @@
2460	2499	$xml->addChild('Status', 'Suspended');
2461	2500
2462	2501	// Enable MFA delete?
	2502	+ // @codeCoverageIgnoreStart
2463	2503	if (isset($opt['MFASerial']) && isset($opt['MFAToken']) && isset($opt['MFAStatus']))
2464	2504	{
2465	2505	$xml->addChild('MfaDelete', $opt['MFAStatus']);
2466		-
2467	2506	$opt['headers']['x-amz-mfa'] = ($opt['MFASerial'] . ' ' . $opt['MFAToken']);
2468	2507	}
	2508	+ // @codeCoverageIgnoreEnd
2469	2509
2470	2510	$opt['body'] = $xml->asXML();
2471	2511
—	—	@@ -2478,7 +2518,7 @@
2479	2519	* @param string $bucket (Required) The name of the bucket to use.
2480	2520	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2481	2521	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
2482		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2522	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2483	2523	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2484	2524	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2485	2525	*/
—	—	@@ -2503,7 +2543,7 @@
2504	2544	* <li><code>prefix</code> - <code>string</code> - Optional - Restricts the response to only contain results that begin with the specified prefix.</li>
2505	2545	* <li><code>version-id-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>version-id-marker</code>.</li>
2506	2546	* <li><code>preauth</code> - <code>integer\|string</code> - Optional - Specifies that a presigned URL for this request should be returned. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
2507		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2547	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2508	2548	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2509	2549	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2510	2550	*/
—	—	@@ -2542,7 +2582,7 @@
2543	2583	* @param string $bucket (Required) The name of the bucket to use.
2544	2584	* @param CFPolicy $policy (Required) The JSON policy to use.
2545	2585	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2546		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2586	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2547	2587	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2548	2588	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2549	2589	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/AccessPolicyLanguage.html Appendix: The Access Policy Language
—	—	@@ -2569,7 +2609,7 @@
2570	2610	*
2571	2611	* @param string $bucket (Required) The name of the bucket to use.
2572	2612	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2573		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2613	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2574	2614	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2575	2615	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2576	2616	*/
—	—	@@ -2589,7 +2629,7 @@
2590	2630	*
2591	2631	* @param string $bucket (Required) The name of the bucket to use.
2592	2632	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2593		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2633	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2594	2634	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2595	2635	* @return CFResponse A <CFResponse> object containing a parsed HTTP response. If you do not have `DeletePolicy` permissions, Amazon S3 returns a `403 Access Denied` error. If you have the correct permissions, but are not the bucket owner, Amazon S3 returns a `405 Method Not Allowed` error. If the bucket doesn't have a policy, Amazon S3 returns a `204 No Content` error.
2596	2636	*/
—	—	@@ -2631,7 +2671,7 @@
2632	2672	* @param string $topic_arn (Required) The SNS topic ARN to send notifications to.
2633	2673	* @param string $event (Required) The event type to listen for.
2634	2674	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2635		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2675	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2636	2676	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2637	2677	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2638	2678	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
—	—	@@ -2671,7 +2711,7 @@
2672	2712	*
2673	2713	* @param string $bucket (Required) The name of the bucket to use.
2674	2714	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2675		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2715	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2676	2716	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2677	2717	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2678	2718	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
—	—	@@ -2691,7 +2731,7 @@
2692	2732	*
2693	2733	* @param string $bucket (Required) The name of the bucket to use.
2694	2734	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2695		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2735	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2696	2736	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2697	2737	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2698	2738	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/NotificationHowTo.html Setting Up Notification of Bucket Events
—	—	@@ -2749,7 +2789,7 @@
2750	2790	* <li><code>headers</code> - <code>array</code> - Optional - The standard HTTP headers to send along in the request.</li>
2751	2791	* <li><code>meta</code> - <code>array</code> - Optional - An associative array of key-value pairs. Any header starting with <code>x-amz-meta-:</code> is considered user metadata. It will be stored with the object and returned when you retrieve the object. The total size of the HTTP request, not including the body, must be less than 4 KB.</li>
2752	2792	* <li><code>storage</code> - <code>string</code> - Optional - Whether to use Standard or Reduced Redundancy storage. [Allowed values: <code>AmazonS3::STORAGE_STANDARD</code>, <code>AmazonS3::STORAGE_REDUCED</code>]. The default value is <code>STORAGE_STANDARD</code>.</li>
2753		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2793	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2754	2794	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2755	2795	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2756	2796	* @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAccessPolicy.html REST Access Control Policy
—	—	@@ -2825,7 +2865,7 @@
2826	2866	* <li><code>length</code> - <code>integer</code> - Optional - The size of the part in bytes. For more information, see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13">RFC 2616, section 14.13</a>. The value can also be passed to the <code>header</code> option as <code>Content-Length</code>.</li>
2827	2867	* <li><code>md5</code> - <code>string</code> - Optional - The base64 encoded 128-bit MD5 digest of the part data. This header can be used as a message integrity check to verify that the part data is the same data that was originally sent. Although it is optional, we recommend using this mechanism as an end-to-end integrity check. For more information, see <a href="http://www.ietf.org/rfc/rfc1864.txt">RFC 1864</a>. The value can also be passed to the <code>header</code> option as <code>Content-MD5</code>.</li>
2828	2868	* <li><code>seekTo</code> - <code>integer</code> - Optional - The starting position in bytes for the piece of the file/stream to upload.</li>
2829		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2869	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2830	2870	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2831	2871	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2832	2872	*/
—	—	@@ -2877,7 +2917,7 @@
2878	2918	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2879	2919	* <li><code>max-parts</code> - <code>integer</code> - Optional - The maximum number of parts to return in the response body.</li>
2880	2920	* <li><code>part-number-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur numerically after the value of the <code>part-number-marker</code>.</li>
2881		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2921	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2882	2922	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2883	2923	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2884	2924	*/
—	—	@@ -2911,7 +2951,7 @@
2912	2952	* @param string $filename (Required) The file name for the object.
2913	2953	* @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
2914	2954	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2915		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2955	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2916	2956	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2917	2957	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2918	2958	*/
—	—	@@ -2937,7 +2977,7 @@
2938	2978	* @param string $upload_id (Required) The upload ID identifying the multipart upload whose parts are being listed. The upload ID is retrieved from a call to <initiate_multipart_upload()>.
2939	2979	* @param string\|array\|SimpleXMLElement\|CFResponse $parts (Required) The completion XML document. This document can be provided in multiple ways; as a string of XML, as a <php:SimpleXMLElement> object representing the XML document, as an indexed array of associative arrays where the keys are <code>PartNumber</code> and <code>ETag</code>, or as a <CFResponse> object returned by <list_parts()>.
2940	2980	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2941		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2981	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2942	2982	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2943	2983	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2944	2984	*/
—	—	@@ -3007,7 +3047,7 @@
3008	3048	* <li><code>delimiter</code> - <code>string</code> - Optional - Keys that contain the same string between the prefix and the first occurrence of the delimiter will be rolled up into a single result element in the CommonPrefixes collection.</li>
3009	3049	* <li><code>key-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>key-marker</code>. If used in conjunction with <code>upload-id-marker</code>, the results will be filtered to include keys whose upload ID is alphabetically after the value of <code>upload-id-marker</code>.</li>
3010	3050	* <li><code>upload-id-marker</code> - <code>string</code> - Optional - Restricts the response to contain results that only occur alphabetically after the value of the <code>upload-id-marker</code>. Must be used in conjunction with <code>key-marker</code>.</li>
3011		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3051	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3012	3052	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3013	3053	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3014	3054	*/
—	—	@@ -3219,7 +3259,9 @@
3220	3260	{
3221	3261	if ($this->use_batch_flow)
3222	3262	{
	3263	+ // @codeCoverageIgnoreStart
3223	3264	throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested');
	3265	+ // @codeCoverageIgnoreEnd
3224	3266	}
3225	3267
3226	3268	$when = $when ? $when : time();
—	—	@@ -3283,7 +3325,7 @@
3284	3326	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3285	3327	* <li><code>indexDocument</code> - <code>string</code> - Optional - The file path to use as the root document. The default value is <code>index.html</code>.</li>
3286	3328	* <li><code>errorDocument</code> - <code>string</code> - Optional - The file path to use as the error document. The default value is <code>error.html</code>.</li>
3287		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3329	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3288	3330	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3289	3331	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3290	3332	*/
—	—	@@ -3316,7 +3358,7 @@
3317	3359	*
3318	3360	* @param string $bucket (Required) The name of the bucket to use.
3319	3361	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3320		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3362	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3321	3363	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3322	3364	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3323	3365	*/
—	—	@@ -3338,7 +3380,7 @@
3339	3381	*
3340	3382	* @param string $bucket (Required) The name of the bucket to use.
3341	3383	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3342		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3384	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3343	3385	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3344	3386	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3345	3387	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/ses.class.php
—	—	@@ -23,7 +23,7 @@
24	24	* For specific details on how to construct a service request, please consult the <a
25	25	* href="http://docs.amazonwebservices.com/ses/latest/DeveloperGuide">Amazon SES Developer Guide</a>.
26	26	*
27		~~- * @version Tue Apr 05 15:19:25 PDT 2011~~
	27	+ * @version Tue May 10 18:27:31 PDT 2011
28	28	* @license See the included NOTICE.md file for complete information.
29	29	* @copyright See the included NOTICE.md file for complete information.
30	30	* @link http://aws.amazon.com/ses/Amazon Simple Email Service
—	—	@@ -89,12 +89,16 @@
90	90
91	91	if (!$key && !defined('AWS_KEY'))
92	92	{
	93	+ // @codeCoverageIgnoreStart
93	94	throw new Email_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	95	+ // @codeCoverageIgnoreEnd
94	96	}
95	97
96	98	if (!$secret_key && !defined('AWS_SECRET_KEY'))
97	99	{
	100	+ // @codeCoverageIgnoreStart
98	101	throw new Email_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	102	+ // @codeCoverageIgnoreEnd
99	103	}
100	104
101	105	return parent::__construct($key, $secret_key);
—	—	@@ -109,7 +113,7 @@
110	114	* Returns the user's current activity limits.
111	115	*
112	116	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
113		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	117	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
114	118	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
115	119	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
116	120	*/
—	—	@@ -125,7 +129,7 @@
126	130	* Returns a list containing all of the email addresses that have been verified.
127	131	*
128	132	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
129		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	133	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
130	134	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
131	135	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
132	136	*/
—	—	@@ -143,7 +147,7 @@
144	148	* Each data point in the list contains statistics for a 15-minute interval.
145	149	*
146	150	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
147		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	151	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
148	152	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
149	153	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
150	154	*/
—	—	@@ -187,7 +191,7 @@
188	192	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
189	193	* <li><code>ReplyToAddresses</code> - <code>string\|array</code> - Optional - The reply-to email address(es) for the message. If the recipient replies to the message, each reply-to address will receive the reply. Pass a string for a single value, or an indexed array for multiple values. </li>
190	194	* <li><code>ReturnPath</code> - <code>string</code> - Optional - The email address to which bounce notifications are to be forwarded. If the message cannot be delivered to the recipient, then an error message will be returned from the recipient's ISP; this message will then be forwarded to the email address specified by the <code>ReturnPath</code> parameter. </li>
191		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	195	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
192	196	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
193	197	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
194	198	*/
—	—	@@ -248,7 +252,7 @@
249	253	*
250	254	* @param string $email_address (Required) An email address to be removed from the list of verified addreses.
251	255	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
252		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	256	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
253	257	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
254	258	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
255	259	*/
—	—	@@ -266,7 +270,7 @@
267	271	*
268	272	* @param string $email_address (Required) The email address to be verified.
269	273	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
270		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	274	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
271	275	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
272	276	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
273	277	*/
—	—	@@ -291,9 +295,9 @@
292	296	* <li><code>Data</code> - <code>blob</code> - Required - The raw data of the message. The client must ensure that the message format complies with Internet email standards regarding email header fields, MIME types, MIME encoding, and base64 encoding (if necessary). For more information, go to the Amazon SES Developer Guide. </li>
293	297	* </ul>
294	298	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
295		~~- * <li><code>Source</code> - <code>string</code> - Optional - The sender's email address. </li>~~
	299	+ * <li><code>Source</code> - <code>string</code> - Optional - The sender's email address. If you specify the <code>Source</code> parameter, then bounce notifications and complaints will be sent to this email address. This takes precedence over any <i>Return-Path</i> header that you might include in the raw text of the message. </li>
296	300	* <li><code>Destinations</code> - <code>string\|array</code> - Optional - A list of destinations for the message. Pass a string for a single value, or an indexed array for multiple values. </li>
297		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	301	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
298	302	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
299	303	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
300	304	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudwatch.class.php
—	—	@@ -47,7 +47,7 @@
48	48	*
49	49	* </ul>
50	50	*
51		~~- * @version Tue Apr 05 15:16:49 PDT 2011~~
	51	+ * @version Tue May 10 18:24:54 PDT 2011
52	52	* @license See the included NOTICE.md file for complete information.
53	53	* @copyright See the included NOTICE.md file for complete information.
54	54	* @link http://aws.amazon.com/cloudwatch/Amazon CloudWatch
—	—	@@ -123,12 +123,16 @@
124	124
125	125	if (!$key && !defined('AWS_KEY'))
126	126	{
	127	+ // @codeCoverageIgnoreStart
127	128	throw new CW_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	129	+ // @codeCoverageIgnoreEnd
128	130	}
129	131
130	132	if (!$secret_key && !defined('AWS_SECRET_KEY'))
131	133	{
	134	+ // @codeCoverageIgnoreStart
132	135	throw new CW_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	136	+ // @codeCoverageIgnoreEnd
133	137	}
134	138
135	139	return parent::__construct($key, $secret_key);
—	—	@@ -169,7 +173,7 @@
170	174	* </ul></li>
171	175	* </ul></li>
172	176	* <li><code>Unit</code> - <code>string</code> - Optional - The unit for the alarm's associated metric. [Allowed values: <code>Seconds</code>, <code>Microseconds</code>, <code>Milliseconds</code>, <code>Bytes</code>, <code>Kilobytes</code>, <code>Megabytes</code>, <code>Gigabytes</code>, <code>Terabytes</code>, <code>Bits</code>, <code>Kilobits</code>, <code>Megabits</code>, <code>Gigabits</code>, <code>Terabits</code>, <code>Percent</code>, <code>Count</code>, <code>Bytes/Second</code>, <code>Kilobytes/Second</code>, <code>Megabytes/Second</code>, <code>Gigabytes/Second</code>, <code>Terabytes/Second</code>, <code>Bits/Second</code>, <code>Kilobits/Second</code>, <code>Megabits/Second</code>, <code>Gigabits/Second</code>, <code>Terabits/Second</code>, <code>Count/Second</code>, <code>None</code>]</li>
173		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	177	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
174	178	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
175	179	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
176	180	*/
—	—	@@ -225,15 +229,73 @@
226	230	}
227	231
228	232	/**
	233	+ * Publishes metric data points to Amazon CloudWatch. Amazon Cloudwatch associates the data points with the specified metric. If the specified
	234	+ * metric does not exist, Amazon CloudWatch creates the metric. If you create a metric with the <code>PutMetricData</code> action, allow up to
	235	+ * fifteen minutes for the metric to appear in calls to the ListMetrics action.
229	236	*
230		~~- * Returns a list of valid metrics stored for the AWS account owner. Returned metrics can be used with <code>GetMetricStatistics</code> to~~
231		~~- * obtain statistical data for a given metric.~~
	237	+ * The size of a <code>PutMetricData</code> request is limited to 8 KB for HTTP GET requests and 40 KB for HTTP POST requests.
232	238	*
	239	+ * Amazon CloudWatch truncates values with very large exponents. Values with base-10 exponents greater than 126 (1 x 10^126) are truncated.
	240	+ * Likewise, values with base-10 exponents less than -130 (1 x 10^-130) are also truncated.
	241	+ *
	242	+ * @param string $namespace (Required) The namespace for the metric data. You cannot specify a namespace that begins with <code>AWS/</code>. Namespaces that begin with <code>AWS/</code> are reserved for other Amazon Web Services products that send metrics to Amazon CloudWatch.
	243	+ * @param array $metric_data (Required) A list of data describing the metric. <ul>
	244	+ * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
	245	+ * <li><code>MetricName</code> - <code>string</code> - Required - The name of the metric. </li>
	246	+ * <li><code>Dimensions</code> - <code>array</code> - Optional - A list of dimensions associated with the metric. <ul>
	247	+ * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
	248	+ * <li><code>Name</code> - <code>string</code> - Required - The name of the dimension. </li>
	249	+ * <li><code>Value</code> - <code>string</code> - Required - The value representing the dimension measurement </li>
	250	+ * </ul></li>
	251	+ * </ul></li>
	252	+ * <li><code>Timestamp</code> - <code>string</code> - Optional - The time stamp used for the metric. If not specified, the default value is set to the time the metric data was received. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
	253	+ * <li><code>Value</code> - <code>integer</code> - Optional - The value for the metric. <important>Amazon CloudWatch truncates values with very large exponents. Values with base-10 exponents greater than 126 (1 x 10^126) are truncated. Likewise, values with base-10 exponents less than -130 (1 x 10^-130) are also truncated. </important> </li>
	254	+ * <li><code>StatisticValues</code> - <code>array</code> - Optional - A set of statistical values describing the metric. Takes an associative array of parameters that can have the following keys: <ul>
	255	+ * <li><code>SampleCount</code> - <code>double</code> - Required - The number of samples used for the statistic set. </li>
	256	+ * <li><code>Sum</code> - <code>double</code> - Required - The sum of values for the sample set. </li>
	257	+ * <li><code>Minimum</code> - <code>double</code> - Required - The minimum value of the sample set. </li>
	258	+ * <li><code>Maximum</code> - <code>double</code> - Required - The maximum value of the sample set. </li>
	259	+ * </ul></li>
	260	+ * <li><code>Unit</code> - <code>string</code> - Optional - The unit of the metric. [Allowed values: <code>Seconds</code>, <code>Microseconds</code>, <code>Milliseconds</code>, <code>Bytes</code>, <code>Kilobytes</code>, <code>Megabytes</code>, <code>Gigabytes</code>, <code>Terabytes</code>, <code>Bits</code>, <code>Kilobits</code>, <code>Megabits</code>, <code>Gigabits</code>, <code>Terabits</code>, <code>Percent</code>, <code>Count</code>, <code>Bytes/Second</code>, <code>Kilobytes/Second</code>, <code>Megabytes/Second</code>, <code>Gigabytes/Second</code>, <code>Terabytes/Second</code>, <code>Bits/Second</code>, <code>Kilobits/Second</code>, <code>Megabits/Second</code>, <code>Gigabits/Second</code>, <code>Terabits/Second</code>, <code>Count/Second</code>, <code>None</code>]</li>
	261	+ * </ul></li>
	262	+ * </ul>
	263	+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
	264	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
	265	+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
	266	+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
	267	+ */
	268	+ public function put_metric_data($namespace, $metric_data, $opt = null)
	269	+ {
	270	+ if (!$opt) $opt = array();
	271	+ $opt['Namespace'] = $namespace;
	272	+
	273	+ // Handle Timestamps
	274	+ for ($i = 0, $max = count($metric_data); $i < $max; $i++)
	275	+ {
	276	+ if (isset($metric_data[$i]['Timestamp']))
	277	+ {
	278	+ $metric_data[$i]['Timestamp'] = $this->util->convert_date_to_iso8601($metric_data[$i]['Timestamp']);
	279	+ }
	280	+ }
	281	+
	282	+ // Required parameter
	283	+ $opt = array_merge($opt, CFComplexType::map(array(
	284	+ 'MetricData' => (is_array($metric_data) ? $metric_data : array($metric_data))
	285	+ ), 'member'));
	286	+
	287	+ return $this->authenticate('PutMetricData', $opt, $this->hostname);
	288	+ }
	289	+
	290	+ /**
	291	+ *
	292	+ * Returns a list of valid metrics stored for the AWS account owner. Returned metrics can be used with GetMetricStatistics to obtain
	293	+ * statistical data for a given metric.
	294	+ *
233	295	* Up to 500 results are returned for any one call. To retrieve further results, use returned <code>NextToken</code> values with subsequent
234	296	* <code>ListMetrics</code> operations.
235	297	*
236	298	* If you create a metric with the PutMetricData action, allow up to fifteen minutes for the metric to appear in calls to the
237		~~- * <code>ListMetrics</code> action.~~
	299	+ * <code>ListMetrics</code> action. Statistics about the metric, however, are available sooner using GetMetricStatistics.
238	300	*
239	301	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
240	302	* <li><code>Namespace</code> - <code>string</code> - Optional - The namespace to filter against. </li>
—	—	@@ -245,7 +307,7 @@
246	308	* </ul></li>
247	309	* </ul></li>
248	310	* <li><code>NextToken</code> - <code>string</code> - Optional - The token returned by a previous call to indicate that there is more data available. </li>
249		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	311	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
250	312	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
251	313	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
252	314	*/
—	—	@@ -304,7 +366,7 @@
305	367	* <li><code>Value</code> - <code>string</code> - Required - The value representing the dimension measurement </li>
306	368	* </ul></li>
307	369	* </ul></li>
308		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	370	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
309	371	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
310	372	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
311	373	*/
—	—	@@ -342,7 +404,7 @@
343	405	*
344	406	* @param string\|array $alarm_names (Required) The names of the alarms to disable actions for. Pass a string for a single value, or an indexed array for multiple values.
345	407	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
346		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	408	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
347	409	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
348	410	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
349	411	*/
—	—	@@ -370,7 +432,7 @@
371	433	* <li><code>ActionPrefix</code> - <code>string</code> - Optional - The action name prefix. </li>
372	434	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of alarm descriptions to retrieve. </li>
373	435	* <li><code>NextToken</code> - <code>string</code> - Optional - The token returned by a previous call to indicate that there is more data available. </li>
374		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	436	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
375	437	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
376	438	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
377	439	*/
—	—	@@ -406,7 +468,7 @@
407	469	* </ul></li>
408	470	* <li><code>Period</code> - <code>integer</code> - Optional - The period in seconds over which the statistic is applied. </li>
409	471	* <li><code>Unit</code> - <code>string</code> - Optional - The unit for the metric. [Allowed values: <code>Seconds</code>, <code>Microseconds</code>, <code>Milliseconds</code>, <code>Bytes</code>, <code>Kilobytes</code>, <code>Megabytes</code>, <code>Gigabytes</code>, <code>Terabytes</code>, <code>Bits</code>, <code>Kilobits</code>, <code>Megabits</code>, <code>Gigabits</code>, <code>Terabits</code>, <code>Percent</code>, <code>Count</code>, <code>Bytes/Second</code>, <code>Kilobytes/Second</code>, <code>Megabytes/Second</code>, <code>Gigabytes/Second</code>, <code>Terabytes/Second</code>, <code>Bits/Second</code>, <code>Kilobits/Second</code>, <code>Megabits/Second</code>, <code>Gigabits/Second</code>, <code>Terabits/Second</code>, <code>Count/Second</code>, <code>None</code>]</li>
410		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	472	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
411	473	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
412	474	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
413	475	*/
—	—	@@ -442,7 +504,7 @@
443	505	* <li><code>EndDate</code> - <code>string</code> - Optional - The ending date to retrieve alarm history. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
444	506	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of alarm history records to retrieve. </li>
445	507	* <li><code>NextToken</code> - <code>string</code> - Optional - The token returned by a previous call to indicate that there is more data available. </li>
446		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	508	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
447	509	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
448	510	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
449	511	*/
—	—	@@ -471,7 +533,7 @@
472	534	*
473	535	* @param string\|array $alarm_names (Required) The names of the alarms to enable actions for. Pass a string for a single value, or an indexed array for multiple values.
474	536	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
475		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	537	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
476	538	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
477	539	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
478	540	*/
—	—	@@ -493,7 +555,7 @@
494	556	*
495	557	* @param string\|array $alarm_names (Required) A list of alarms to be deleted. Pass a string for a single value, or an indexed array for multiple values.
496	558	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
497		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	559	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
498	560	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
499	561	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
500	562	*/
—	—	@@ -520,7 +582,7 @@
521	583	* @param string $state_reason (Required) The reason that this alarm is set to this specific state (in human-readable text format)
522	584	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
523	585	* <li><code>StateReasonData</code> - <code>string</code> - Optional - The reason that this alarm is set to this specific state (in machine-readable JSON format) </li>
524		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	586	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
525	587	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
526	588	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
527	589	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/elb.class.php
—	—	@@ -16,11 +16,12 @@
17	17
18	18	/**
19	19	*
	20	+ *
20	21	* Elastic Load Balancing is a cost-effective and easy to use web service to help you improve availability and scalability of your
21	22	* application. It makes it easy for you to distribute application loads between two or more EC2 instances. Elastic Load Balancing enables
22	23	* availability through redundancy and supports traffic growth of your application.
23	24	*
24		~~- * @version Tue Apr 05 15:18:51 PDT 2011~~
	25	+ * @version Tue May 10 18:26:54 PDT 2011
25	26	* @license See the included NOTICE.md file for complete information.
26	27	* @copyright See the included NOTICE.md file for complete information.
27	28	* @link http://aws.amazon.com/elasticloadbalancing/Amazon Elastic Load Balancing
—	—	@@ -96,12 +97,16 @@
97	98
98	99	if (!$key && !defined('AWS_KEY'))
99	100	{
	101	+ // @codeCoverageIgnoreStart
100	102	throw new ELB_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	103	+ // @codeCoverageIgnoreEnd
101	104	}
102	105
103	106	if (!$secret_key && !defined('AWS_SECRET_KEY'))
104	107	{
	108	+ // @codeCoverageIgnoreStart
105	109	throw new ELB_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	110	+ // @codeCoverageIgnoreEnd
106	111	}
107	112
108	113	return parent::__construct($key, $secret_key);
—	—	@@ -126,7 +131,7 @@
127	132	* </ul></li>
128	133	* </ul>
129	134	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
130		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	135	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
131	136	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
132	137	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
133	138	*/
—	—	@@ -145,32 +150,26 @@
146	151
147	152	/**
148	153	*
149		~~- * Generates a stickiness policy with sticky session lifetimes controlled by the lifetime of the browser (user-agent) or a specified~~
150		~~- * expiration period. This policy can only be associated only with HTTP listeners.~~
	154	+ * Deletes listeners from the LoadBalancer for the specified port.
151	155	*
152		~~- * When a load balancer implements this policy, the load balancer uses a special cookie to track the backend server instance for each request.~~
153		~~- * When the load balancer receives a request, it first checks to see if this cookie is present in the request. If so, the load balancer sends~~
154		~~- * the request to the application server specified in the cookie. If not, the load balancer sends the request to a server that is chosen based~~
155		~~- * on the existing load balancing algorithm.~~
156		- *
157		~~- * A cookie is inserted into the response for binding subsequent requests from the same user to that server. The validity of the cookie is~~
158		~~- * based on the cookie expiration time, which is specified in the policy configuration.~~
159		- *
160		~~- * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.~~
161		~~- * @param string $policy_name (Required) The name of the policy being created. The name must be unique within the set of policies for this Load Balancer.~~
	156	+ * @param string $load_balancer_name (Required) The mnemonic name associated with the LoadBalancer.
	157	+ * @param integer LoadBalancerPorts (Required) The client port number(s) of the LoadBalancerListener(s) to be removed.
162	158	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
163		- * <li><code>CookieExpirationPeriod</code> - <code>long</code> - Optional - The time period in seconds after which the cookie should be considered stale. Not specifying this parameter indicates that the sticky session will last for the duration of the browser session. </li>
164		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	159	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
165	160	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
166	161	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
167	162	*/
168		~~- public function create_lb_cookie_stickiness_policy($load_balancer_name, $policy_name, $opt = null)~~
	163	+ public function delete_load_balancer_listeners($load_balancer_name, $load_balancer_ports, $opt = null)
169	164	{
170	165	if (!$opt) $opt = array();
171	166	$opt['LoadBalancerName'] = $load_balancer_name;
172		~~- $opt['PolicyName'] = $policy_name;~~
173	167
174		~~- return $this->authenticate('CreateLBCookieStickinessPolicy', $opt, $this->hostname);~~
	168	+ // Required parameter
	169	+ $opt = array_merge($opt, CFComplexType::map(array(
	170	+ 'LoadBalancerPorts' => (is_array($load_balancer_ports) ? $load_balancer_ports : array($load_balancer_ports))
	171	+ ), 'member'));
	172	+
	173	+ return $this->authenticate('DeleteLoadBalancerListeners', $opt, $this->hostname);
175	174	}
176	175
177	176	/**
—	—	@@ -186,7 +185,7 @@
187	186	* <li><code>HealthyThreshold</code> - <code>integer</code> - Required - Specifies the number of consecutive health probe successes required before moving the instance to the <i>Healthy</i> state. </li>
188	187	* </ul>
189	188	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
190		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	189	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
191	190	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
192	191	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
193	192	*/
—	—	@@ -213,7 +212,7 @@
214	213	*
215	214	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
216	215	* <li><code>LoadBalancerNames</code> - <code>string\|array</code> - Optional - A list of names associated with the LoadBalancers at creation time. Pass a string for a single value, or an indexed array for multiple values. </li>
217		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	216	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
218	217	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
219	218	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
220	219	*/
—	—	@@ -235,83 +234,32 @@
236	235
237	236	/**
238	237	*
239		~~- * Sets the certificate that terminates the specified listener's SSL connections. The specified certificate replaces any prior certificate~~
240		~~- * that was used on the same LoadBalancer and port.~~
	238	+ * Generates a stickiness policy with sticky session lifetimes controlled by the lifetime of the browser (user-agent) or a specified
	239	+ * expiration period. This policy can only be associated only with HTTP listeners.
241	240	*
242		~~- * @param string $load_balancer_name (Required) The name of the the LoadBalancer.~~
243		~~- * @param integer $load_balancer_port (Required) The port that uses the specified SSL certificate.~~
244		- * @param string $ssl_certificate_id (Required) The ID of the SSL certificate chain to use. For more information on SSL certificates, see Managing Server Certificates in the AWS Identity and Access Management documentation.
245		~~- * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>~~
246		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
247		- * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
248		~~- * @return CFResponse A <CFResponse> object containing a parsed HTTP response.~~
249		~~- */~~
250		~~- public function set_load_balancer_listener_ssl_certificate($load_balancer_name, $load_balancer_port, $ssl_certificate_id, $opt = null)~~
251		~~- {~~
252		~~- if (!$opt) $opt = array();~~
253		~~- $opt['LoadBalancerName'] = $load_balancer_name;~~
254		~~- $opt['LoadBalancerPort'] = $load_balancer_port;~~
255		~~- $opt['SSLCertificateId'] = $ssl_certificate_id;~~
256		-
257		~~- return $this->authenticate('SetLoadBalancerListenerSSLCertificate', $opt, $this->hostname);~~
258		~~- }~~
259		-
260		- /**
	241	+ * When a load balancer implements this policy, the load balancer uses a special cookie to track the backend server instance for each request.
	242	+ * When the load balancer receives a request, it first checks to see if this cookie is present in the request. If so, the load balancer sends
	243	+ * the request to the application server specified in the cookie. If not, the load balancer sends the request to a server that is chosen based
	244	+ * on the existing load balancing algorithm.
261	245	*
262		~~- * Creates a new LoadBalancer.~~
	246	+ * A cookie is inserted into the response for binding subsequent requests from the same user to that server. The validity of the cookie is
	247	+ * based on the cookie expiration time, which is specified in the policy configuration.
263	248	*
264		~~- * Once the call has completed successfully, a new LoadBalancer is created; however, it will not be usable until at least one instance has~~
265		~~- * been registered. When the LoadBalancer creation is completed, the client can check whether or not it is usable by using the~~
266		~~- * DescribeInstanceHealth API. The LoadBalancer is usable as soon as any registered instance is <i>InService</i>.~~
267		- *
268		~~- * Currently, the client's quota of LoadBalancers is limited to five per Region.~~
269		- *
270		~~- * Load balancer DNS names vary depending on the Region they're created in. For load balancers created in the United States, the DNS name ends~~
271		~~- * with:~~
272		- *
273		~~- * <ul> <li> <i>us-east-1.elb.amazonaws.com</i> (for the US Standard Region) </li>~~
274		- *
275		~~- * <li> <i>us-west-1.elb.amazonaws.com</i> (for the Northern California Region) </li>~~
276		- *
277		~~- * </ul>~~
278		- *
279		~~- * For load balancers created in the EU (Ireland) Region, the DNS name ends with:~~
280		- *
281		~~- * <ul> <li> <i>eu-west-1.elb.amazonaws.com</i> </li>~~
282		- *
283		~~- * </ul>~~
284		- *
285		- * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within your set of LoadBalancers requests on the specified protocol and received by Elastic Load Balancing on the LoadBalancerPort are load balanced across the registered instances and sent to port InstancePort.
286		~~- * @param array $listeners (Required) A list of the following tuples: LoadBalancerPort, InstancePort, and Protocol. <ul>~~
287		~~- * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>~~
288		- * <li><code>Protocol</code> - <code>string</code> - Required - Specifies the LoadBalancer transport protocol to use for routing - TCP or HTTP. This property cannot be modified for the life of the LoadBalancer. </li>
289		- * <li><code>LoadBalancerPort</code> - <code>integer</code> - Required - Specifies the LoadBalancer transport protocol to use for routing - TCP or HTTP. This property cannot be modified for the life of the LoadBalancer. </li>
290		- * <li><code>InstancePort</code> - <code>integer</code> - Required - Specifies the TCP port on which the instance server is listening. This property cannot be modified for the life of the LoadBalancer. </li>
291		- * <li><code>SSLCertificateId</code> - <code>string</code> - Optional - The ID of the SSL certificate chain to use. For more information on SSL certificates, see Managing Keys and Certificates in the AWS Identity and Access Management documentation. </li>
292		~~- * </ul></li>~~
293		~~- * </ul>~~
294		- * @param string\|array $availability_zones (Required) A list of Availability Zones. At least one Availability Zone must be specified. Specified Availability Zones must be in the same EC2 Region as the LoadBalancer. Traffic will be equally distributed across all zones. This list can be modified after the creation of the LoadBalancer. Pass a string for a single value, or an indexed array for multiple values.
	249	+ * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
	250	+ * @param string $policy_name (Required) The name of the policy being created. The name must be unique within the set of policies for this Load Balancer.
295	251	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
296		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	252	+ * <li><code>CookieExpirationPeriod</code> - <code>long</code> - Optional - The time period in seconds after which the cookie should be considered stale. Not specifying this parameter indicates that the sticky session will last for the duration of the browser session. </li>
	253	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
297	254	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
298	255	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
299	256	*/
300		~~- public function create_load_balancer($load_balancer_name, $listeners, $availability_zones, $opt = null)~~
	257	+ public function create_lb_cookie_stickiness_policy($load_balancer_name, $policy_name, $opt = null)
301	258	{
302	259	if (!$opt) $opt = array();
303	260	$opt['LoadBalancerName'] = $load_balancer_name;
	261	+ $opt['PolicyName'] = $policy_name;
304	262
305		~~- // Required parameter~~
306		~~- $opt = array_merge($opt, CFComplexType::map(array(~~
307		~~- 'Listeners' => (is_array($listeners) ? $listeners : array($listeners))~~
308		~~- ), 'member'));~~
309		-
310		~~- // Required parameter~~
311		~~- $opt = array_merge($opt, CFComplexType::map(array(~~
312		~~- 'AvailabilityZones' => (is_array($availability_zones) ? $availability_zones : array($availability_zones))~~
313		~~- ), 'member'));~~
314		-
315		~~- return $this->authenticate('CreateLoadBalancer', $opt, $this->hostname);~~
	263	+ return $this->authenticate('CreateLBCookieStickinessPolicy', $opt, $this->hostname);
316	264	}
317	265
318	266	/**
—	—	@@ -326,7 +274,7 @@
327	275	* @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
328	276	* @param string\|array $availability_zones (Required) A list of new Availability Zones for the LoadBalancer. Each Availability Zone must be in the same Region as the LoadBalancer. Pass a string for a single value, or an indexed array for multiple values.
329	277	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
330		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	278	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
331	279	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
332	280	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
333	281	*/
—	—	@@ -358,7 +306,7 @@
359	307	* <li><code>InstanceId</code> - <code>string</code> - Optional - Provides an EC2 instance ID. </li>
360	308	* </ul></li>
361	309	* </ul></li>
362		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	310	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
363	311	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
364	312	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
365	313	*/
—	—	@@ -381,75 +329,138 @@
382	330
383	331	/**
384	332	*
385		~~- * Deletes a policy from the LoadBalancer. The specified policy must not be enabled for any listeners.~~
	333	+ * Sets the certificate that terminates the specified listener's SSL connections. The specified certificate replaces any prior certificate
	334	+ * that was used on the same LoadBalancer and port.
386	335	*
387		~~- * @param string $load_balancer_name (Required) The mnemonic name associated with the LoadBalancer. The name must be unique within your AWS account.~~
388		~~- * @param string $policy_name (Required) The mnemonic name for the policy being deleted.~~
	336	+ * @param string $load_balancer_name (Required) The name of the the LoadBalancer.
	337	+ * @param integer $load_balancer_port (Required) The port that uses the specified SSL certificate.
	338	+ * @param string $ssl_certificate_id (Required) The ID of the SSL certificate chain to use. For more information on SSL certificates, see Managing Server Certificates in the AWS Identity and Access Management documentation.
389	339	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
390		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	340	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
391	341	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
392	342	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
393	343	*/
394		~~- public function delete_load_balancer_policy($load_balancer_name, $policy_name, $opt = null)~~
	344	+ public function set_load_balancer_listener_ssl_certificate($load_balancer_name, $load_balancer_port, $ssl_certificate_id, $opt = null)
395	345	{
396	346	if (!$opt) $opt = array();
397	347	$opt['LoadBalancerName'] = $load_balancer_name;
398		~~- $opt['PolicyName'] = $policy_name;~~
	348	+ $opt['LoadBalancerPort'] = $load_balancer_port;
	349	+ $opt['SSLCertificateId'] = $ssl_certificate_id;
399	350
400		~~- return $this->authenticate('DeleteLoadBalancerPolicy', $opt, $this->hostname);~~
	351	+ return $this->authenticate('SetLoadBalancerListenerSSLCertificate', $opt, $this->hostname);
401	352	}
402	353
403	354	/**
404	355	*
405		~~- * Removes the specified EC2 Availability Zones from the set of configured Availability Zones for the LoadBalancer.~~
	356	+ * Associates, updates, or disables a policy with a listener on the load balancer. Currently only zero (0) or one (1) policy can be associated
	357	+ * with a listener.
406	358	*
407		~~- * There must be at least one Availability Zone registered with a LoadBalancer at all times. A client cannot remove all the Availability Zones~~
408		~~- * from a LoadBalancer. Once an Availability Zone is removed, all the instances registered with the LoadBalancer that are in the removed~~
409		~~- * Availability Zone go into the OutOfService state. Upon Availability Zone removal, the LoadBalancer attempts to equally balance the traffic~~
410		~~- * among its remaining usable Availability Zones. Trying to remove an Availability Zone that was not associated with the LoadBalancer does~~
411		~~- * nothing.~~
	359	+ * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
	360	+ * @param integer $load_balancer_port (Required) The external port of the LoadBalancer with which this policy has to be associated.
	361	+ * @param string\|array $policy_names (Required) List of policies to be associated with the listener. Currently this list can have at most one policy. If the list is empty, the current policy is removed from the listener. Pass a string for a single value, or an indexed array for multiple values.
	362	+ * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
	363	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
	364	+ * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
	365	+ * @return CFResponse A <CFResponse> object containing a parsed HTTP response.
	366	+ */
	367	+ public function set_load_balancer_policies_of_listener($load_balancer_name, $load_balancer_port, $policy_names, $opt = null)
	368	+ {
	369	+ if (!$opt) $opt = array();
	370	+ $opt['LoadBalancerName'] = $load_balancer_name;
	371	+ $opt['LoadBalancerPort'] = $load_balancer_port;
	372	+
	373	+ // Required parameter
	374	+ $opt = array_merge($opt, CFComplexType::map(array(
	375	+ 'PolicyNames' => (is_array($policy_names) ? $policy_names : array($policy_names))
	376	+ ), 'member'));
	377	+
	378	+ return $this->authenticate('SetLoadBalancerPoliciesOfListener', $opt, $this->hostname);
	379	+ }
	380	+
	381	+ /**
412	382	*
413		~~- * In order for this call to be successful, the client must have created the LoadBalancer. The client must provide the same account~~
414		~~- * credentials as those that were used to create the LoadBalancer.~~
	383	+ * Creates a new LoadBalancer.
415	384	*
416		~~- * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.~~
417		- * @param string\|array $availability_zones (Required) A list of Availability Zones to be removed from the LoadBalancer. There must be at least one Availability Zone registered with a LoadBalancer at all times. The client cannot remove all the Availability Zones from a LoadBalancer. Specified Availability Zones must be in the same Region. Pass a string for a single value, or an indexed array for multiple values.
	385	+ * Once the call has completed successfully, a new LoadBalancer is created; however, it will not be usable until at least one instance has
	386	+ * been registered. When the LoadBalancer creation is completed, the client can check whether or not it is usable by using the
	387	+ * DescribeInstanceHealth API. The LoadBalancer is usable as soon as any registered instance is <i>InService</i>.
	388	+ *
	389	+ * Currently, the client's quota of LoadBalancers is limited to five per Region.
	390	+ *
	391	+ * Load balancer DNS names vary depending on the Region they're created in. For load balancers created in the United States, the DNS name ends
	392	+ * with:
	393	+ *
	394	+ * <ul> <li> <i>us-east-1.elb.amazonaws.com</i> (for the US Standard Region) </li>
	395	+ *
	396	+ * <li> <i>us-west-1.elb.amazonaws.com</i> (for the Northern California Region) </li>
	397	+ *
	398	+ * </ul>
	399	+ *
	400	+ * For load balancers created in the EU (Ireland) Region, the DNS name ends with:
	401	+ *
	402	+ * <ul> <li> <i>eu-west-1.elb.amazonaws.com</i> </li>
	403	+ *
	404	+ * </ul>
	405	+ *
	406	+ * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within your set of LoadBalancers requests on the specified protocol and received by Elastic Load Balancing on the LoadBalancerPort are load balanced across the registered instances and sent to port InstancePort.
	407	+ * @param array $listeners (Required) A list of the following tuples: LoadBalancerPort, InstancePort, and Protocol. <ul>
	408	+ * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
	409	+ * <li><code>Protocol</code> - <code>string</code> - Required - Specifies the LoadBalancer transport protocol to use for routing - TCP or HTTP. This property cannot be modified for the life of the LoadBalancer. </li>
	410	+ * <li><code>LoadBalancerPort</code> - <code>integer</code> - Required - Specifies the LoadBalancer transport protocol to use for routing - TCP or HTTP. This property cannot be modified for the life of the LoadBalancer. </li>
	411	+ * <li><code>InstancePort</code> - <code>integer</code> - Required - Specifies the TCP port on which the instance server is listening. This property cannot be modified for the life of the LoadBalancer. </li>
	412	+ * <li><code>SSLCertificateId</code> - <code>string</code> - Optional - The ID of the SSL certificate chain to use. For more information on SSL certificates, see Managing Keys and Certificates in the AWS Identity and Access Management documentation. </li>
	413	+ * </ul></li>
	414	+ * </ul>
	415	+ * @param string\|array $availability_zones (Required) A list of Availability Zones. At least one Availability Zone must be specified. Specified Availability Zones must be in the same EC2 Region as the LoadBalancer. Traffic will be equally distributed across all zones. This list can be modified after the creation of the LoadBalancer. Pass a string for a single value, or an indexed array for multiple values.
418	416	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
419		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	417	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
420	418	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
421	419	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
422	420	*/
423		~~- public function disable_availability_zones_for_load_balancer($load_balancer_name, $availability_zones, $opt = null)~~
	421	+ public function create_load_balancer($load_balancer_name, $listeners, $availability_zones, $opt = null)
424	422	{
425	423	if (!$opt) $opt = array();
426	424	$opt['LoadBalancerName'] = $load_balancer_name;
427	425
428	426	// Required parameter
429	427	$opt = array_merge($opt, CFComplexType::map(array(
	428	+ 'Listeners' => (is_array($listeners) ? $listeners : array($listeners))
	429	+ ), 'member'));
	430	+
	431	+ // Required parameter
	432	+ $opt = array_merge($opt, CFComplexType::map(array(
430	433	'AvailabilityZones' => (is_array($availability_zones) ? $availability_zones : array($availability_zones))
431	434	), 'member'));
432	435
433		~~- return $this->authenticate('DisableAvailabilityZonesForLoadBalancer', $opt, $this->hostname);~~
	436	+ return $this->authenticate('CreateLoadBalancer', $opt, $this->hostname);
434	437	}
435	438
436	439	/**
437	440	*
438		~~- * Deregisters instances from the LoadBalancer. Once the instance is deregistered, it will stop receiving traffic from the LoadBalancer.~~
	441	+ * Adds new instances to the LoadBalancer.
439	442	*
440		~~- * In order to successfully call this API, the same account credentials as those used to create the LoadBalancer must be provided.~~
	443	+ * Once the instance is registered, it starts receiving traffic and requests from the LoadBalancer. Any instance that is not in any of the
	444	+ * Availability Zones registered for the LoadBalancer will be moved to the <i>OutOfService</i> state. It will move to the <i>InService</i>
	445	+ * state when the Availability Zone is added to the LoadBalancer.
441	446	*
	447	+ * In order for this call to be successful, the client must have created the LoadBalancer. The client must provide the same account
	448	+ * credentials as those that were used to create the LoadBalancer.
	449	+ *
	450	+ * Completion of this API does not guarantee that operation has completed. Rather, it means that the request has been registered and the
	451	+ * changes will happen shortly.
	452	+ *
442	453	* @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
443		~~- * @param array $instances (Required) A list of EC2 instance IDs consisting of all instances to be deregistered. <ul>~~
	454	+ * @param array $instances (Required) A list of instances IDs that should be registered with the LoadBalancer. <ul>
444	455	* <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
445	456	* <li><code>InstanceId</code> - <code>string</code> - Optional - Provides an EC2 instance ID. </li>
446	457	* </ul></li>
447	458	* </ul>
448	459	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
449		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	460	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
450	461	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
451	462	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
452	463	*/
453		~~- public function deregister_instances_from_load_balancer($load_balancer_name, $instances, $opt = null)~~
	464	+ public function register_instances_with_load_balancer($load_balancer_name, $instances, $opt = null)
454	465	{
455	466	if (!$opt) $opt = array();
456	467	$opt['LoadBalancerName'] = $load_balancer_name;
—	—	@@ -459,31 +470,36 @@
460	471	'Instances' => (is_array($instances) ? $instances : array($instances))
461	472	), 'member'));
462	473
463		~~- return $this->authenticate('DeregisterInstancesFromLoadBalancer', $opt, $this->hostname);~~
	474	+ return $this->authenticate('RegisterInstancesWithLoadBalancer', $opt, $this->hostname);
464	475	}
465	476
466	477	/**
467	478	*
468		~~- * Deletes listeners from the LoadBalancer for the specified port.~~
	479	+ * Generates a stickiness policy with sticky session lifetimes that follow that of an application-generated cookie. This policy can only be
	480	+ * associated with HTTP listeners.
469	481	*
470		~~- * @param string $load_balancer_name (Required) The mnemonic name associated with the LoadBalancer.~~
471		~~- * @param integer LoadBalancerPorts (Required) The client port number(s) of the LoadBalancerListener(s) to be removed.~~
	482	+ * This policy is similar to the policy created by CreateLBCookieStickinessPolicy, except that the lifetime of the special Elastic Load
	483	+ * Balancing cookie follows the lifetime of the application-generated cookie specified in the policy configuration. The load balancer only
	484	+ * inserts a new stickiness cookie when the application response includes a new application cookie.
	485	+ *
	486	+ * If the application cookie is explicitly removed or expires, the session stops being sticky until a new application cookie is issued.
	487	+ *
	488	+ * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
	489	+ * @param string $policy_name (Required) The name of the policy being created. The name must be unique within the set of policies for this Load Balancer.
	490	+ * @param string $cookie_name (Required) Name of the application cookie used for stickiness.
472	491	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
473		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	492	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
474	493	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
475	494	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
476	495	*/
477		~~- public function delete_load_balancer_listeners($load_balancer_name, $load_balancer_ports, $opt = null)~~
	496	+ public function create_app_cookie_stickiness_policy($load_balancer_name, $policy_name, $cookie_name, $opt = null)
478	497	{
479	498	if (!$opt) $opt = array();
480	499	$opt['LoadBalancerName'] = $load_balancer_name;
	500	+ $opt['PolicyName'] = $policy_name;
	501	+ $opt['CookieName'] = $cookie_name;
481	502
482		~~- // Required parameter~~
483		~~- $opt = array_merge($opt, CFComplexType::map(array(~~
484		~~- 'LoadBalancerPorts' => (is_array($load_balancer_ports) ? $load_balancer_ports : array($load_balancer_ports))~~
485		~~- ), 'member'));~~
486		-
487		~~- return $this->authenticate('DeleteLoadBalancerListeners', $opt, $this->hostname);~~
	503	+ return $this->authenticate('CreateAppCookieStickinessPolicy', $opt, $this->hostname);
488	504	}
489	505
490	506	/**
—	—	@@ -501,7 +517,7 @@
502	518	*
503	519	* @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
504	520	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
505		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	521	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
506	522	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
507	523	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
508	524	*/
—	—	@@ -515,96 +531,85 @@
516	532
517	533	/**
518	534	*
519		~~- * Generates a stickiness policy with sticky session lifetimes that follow that of an application-generated cookie. This policy can only be~~
520		~~- * associated with HTTP listeners.~~
	535	+ * Removes the specified EC2 Availability Zones from the set of configured Availability Zones for the LoadBalancer.
521	536	*
522		~~- * This policy is similar to the policy created by CreateLBCookieStickinessPolicy, except that the lifetime of the special Elastic Load~~
523		~~- * Balancing cookie follows the lifetime of the application-generated cookie specified in the policy configuration. The load balancer only~~
524		~~- * inserts a new stickiness cookie when the application response includes a new application cookie.~~
	537	+ * There must be at least one Availability Zone registered with a LoadBalancer at all times. A client cannot remove all the Availability Zones
	538	+ * from a LoadBalancer. Once an Availability Zone is removed, all the instances registered with the LoadBalancer that are in the removed
	539	+ * Availability Zone go into the OutOfService state. Upon Availability Zone removal, the LoadBalancer attempts to equally balance the traffic
	540	+ * among its remaining usable Availability Zones. Trying to remove an Availability Zone that was not associated with the LoadBalancer does
	541	+ * nothing.
525	542	*
526		~~- * If the application cookie is explicitly removed or expires, the session stops being sticky until a new application cookie is issued.~~
	543	+ * In order for this call to be successful, the client must have created the LoadBalancer. The client must provide the same account
	544	+ * credentials as those that were used to create the LoadBalancer.
527	545	*
528	546	* @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
529		~~- * @param string $policy_name (Required) The name of the policy being created. The name must be unique within the set of policies for this Load Balancer.~~
530		~~- * @param string $cookie_name (Required) Name of the application cookie used for stickiness.~~
	547	+ * @param string\|array $availability_zones (Required) A list of Availability Zones to be removed from the LoadBalancer. There must be at least one Availability Zone registered with a LoadBalancer at all times. The client cannot remove all the Availability Zones from a LoadBalancer. Specified Availability Zones must be in the same Region. Pass a string for a single value, or an indexed array for multiple values.
531	548	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
532		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	549	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
533	550	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
534	551	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
535	552	*/
536		~~- public function create_app_cookie_stickiness_policy($load_balancer_name, $policy_name, $cookie_name, $opt = null)~~
	553	+ public function disable_availability_zones_for_load_balancer($load_balancer_name, $availability_zones, $opt = null)
537	554	{
538	555	if (!$opt) $opt = array();
539	556	$opt['LoadBalancerName'] = $load_balancer_name;
540		~~- $opt['PolicyName'] = $policy_name;~~
541		~~- $opt['CookieName'] = $cookie_name;~~
542	557
543		~~- return $this->authenticate('CreateAppCookieStickinessPolicy', $opt, $this->hostname);~~
	558	+ // Required parameter
	559	+ $opt = array_merge($opt, CFComplexType::map(array(
	560	+ 'AvailabilityZones' => (is_array($availability_zones) ? $availability_zones : array($availability_zones))
	561	+ ), 'member'));
	562	+
	563	+ return $this->authenticate('DisableAvailabilityZonesForLoadBalancer', $opt, $this->hostname);
544	564	}
545	565
546	566	/**
547	567	*
548		~~- * Adds new instances to the LoadBalancer.~~
	568	+ * Deletes a policy from the LoadBalancer. The specified policy must not be enabled for any listeners.
549	569	*
550		~~- * Once the instance is registered, it starts receiving traffic and requests from the LoadBalancer. Any instance that is not in any of the~~
551		~~- * Availability Zones registered for the LoadBalancer will be moved to the <i>OutOfService</i> state. It will move to the <i>InService</i>~~
552		~~- * state when the Availability Zone is added to the LoadBalancer.~~
553		- *
554		~~- * In order for this call to be successful, the client must have created the LoadBalancer. The client must provide the same account~~
555		~~- * credentials as those that were used to create the LoadBalancer.~~
556		- *
557		~~- * Completion of this API does not guarantee that operation has completed. Rather, it means that the request has been registered and the~~
558		~~- * changes will happen shortly.~~
559		- *
560		~~- * @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.~~
561		~~- * @param array $instances (Required) A list of instances IDs that should be registered with the LoadBalancer. <ul>~~
562		~~- * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>~~
563		~~- * <li><code>InstanceId</code> - <code>string</code> - Optional - Provides an EC2 instance ID. </li>~~
564		~~- * </ul></li>~~
565		~~- * </ul>~~
	570	+ * @param string $load_balancer_name (Required) The mnemonic name associated with the LoadBalancer. The name must be unique within your AWS account.
	571	+ * @param string $policy_name (Required) The mnemonic name for the policy being deleted.
566	572	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
567		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	573	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
568	574	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
569	575	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
570	576	*/
571		~~- public function register_instances_with_load_balancer($load_balancer_name, $instances, $opt = null)~~
	577	+ public function delete_load_balancer_policy($load_balancer_name, $policy_name, $opt = null)
572	578	{
573	579	if (!$opt) $opt = array();
574	580	$opt['LoadBalancerName'] = $load_balancer_name;
	581	+ $opt['PolicyName'] = $policy_name;
575	582
576		~~- // Required parameter~~
577		~~- $opt = array_merge($opt, CFComplexType::map(array(~~
578		~~- 'Instances' => (is_array($instances) ? $instances : array($instances))~~
579		~~- ), 'member'));~~
580		-
581		~~- return $this->authenticate('RegisterInstancesWithLoadBalancer', $opt, $this->hostname);~~
	583	+ return $this->authenticate('DeleteLoadBalancerPolicy', $opt, $this->hostname);
582	584	}
583	585
584	586	/**
585	587	*
586		~~- * Associates, updates, or disables a policy with a listener on the load balancer. Currently only zero (0) or one (1) policy can be associated~~
587		~~- * with a listener.~~
	588	+ * Deregisters instances from the LoadBalancer. Once the instance is deregistered, it will stop receiving traffic from the LoadBalancer.
588	589	*
	590	+ * In order to successfully call this API, the same account credentials as those used to create the LoadBalancer must be provided.
	591	+ *
589	592	* @param string $load_balancer_name (Required) The name associated with the LoadBalancer. The name must be unique within the client AWS account.
590		~~- * @param integer $load_balancer_port (Required) The external port of the LoadBalancer with which this policy has to be associated.~~
591		- * @param string\|array $policy_names (Required) List of policies to be associated with the listener. Currently this list can have at most one policy. If the list is empty, the current policy is removed from the listener. Pass a string for a single value, or an indexed array for multiple values.
	593	+ * @param array $instances (Required) A list of EC2 instance IDs consisting of all instances to be deregistered. <ul>
	594	+ * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul>
	595	+ * <li><code>InstanceId</code> - <code>string</code> - Optional - Provides an EC2 instance ID. </li>
	596	+ * </ul></li>
	597	+ * </ul>
592	598	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
593		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	599	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
594	600	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
595	601	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
596	602	*/
597		~~- public function set_load_balancer_policies_of_listener($load_balancer_name, $load_balancer_port, $policy_names, $opt = null)~~
	603	+ public function deregister_instances_from_load_balancer($load_balancer_name, $instances, $opt = null)
598	604	{
599	605	if (!$opt) $opt = array();
600	606	$opt['LoadBalancerName'] = $load_balancer_name;
601		~~- $opt['LoadBalancerPort'] = $load_balancer_port;~~
602	607
603	608	// Required parameter
604	609	$opt = array_merge($opt, CFComplexType::map(array(
605		~~- 'PolicyNames' => (is_array($policy_names) ? $policy_names : array($policy_names))~~
	610	+ 'Instances' => (is_array($instances) ? $instances : array($instances))
606	611	), 'member'));
607	612
608		~~- return $this->authenticate('SetLoadBalancerPoliciesOfListener', $opt, $this->hostname);~~
	613	+ return $this->authenticate('DeregisterInstancesFromLoadBalancer', $opt, $this->hostname);
609	614	}
610	615	}
611	616
Index: trunk/extensions/OpenStackManager/aws-sdk/services/as.class.php
—	—	@@ -46,7 +46,7 @@
47	47	*
48	48	* </ul>
49	49	*
50		~~- * @version Tue Apr 05 15:15:27 PDT 2011~~
	50	+ * @version Tue May 10 18:23:42 PDT 2011
51	51	* @license See the included NOTICE.md file for complete information.
52	52	* @copyright See the included NOTICE.md file for complete information.
53	53	* @link http://aws.amazon.com/autoscaling/Amazon Auto-Scaling
—	—	@@ -122,12 +122,16 @@
123	123
124	124	if (!$key && !defined('AWS_KEY'))
125	125	{
	126	+ // @codeCoverageIgnoreStart
126	127	throw new AS_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	128	+ // @codeCoverageIgnoreEnd
127	129	}
128	130
129	131	if (!$secret_key && !defined('AWS_SECRET_KEY'))
130	132	{
	133	+ // @codeCoverageIgnoreStart
131	134	throw new AS_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	135	+ // @codeCoverageIgnoreEnd
132	136	}
133	137
134	138	return parent::__construct($key, $secret_key);
—	—	@@ -149,7 +153,7 @@
150	154	* <li><code>MinSize</code> - <code>integer</code> - Optional - The minimum size for the new Auto Scaling group. </li>
151	155	* <li><code>MaxSize</code> - <code>integer</code> - Optional - The maximum size for the Auto Scaling group. </li>
152	156	* <li><code>DesiredCapacity</code> - <code>integer</code> - Optional - The number of EC2 instances that should be running in the group. </li>
153		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	157	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
154	158	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
155	159	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
156	160	*/
—	—	@@ -185,7 +189,7 @@
186	190	* @param integer $desired_capacity (Required) The new capacity setting for the AutoScalingGroup.
187	191	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
188	192	* <li><code>HonorCooldown</code> - <code>boolean</code> - Optional - By default, <code>SetDesiredCapacity</code> overrides any cooldown period. Set to True if you want Auto Scaling to reject this request if the Auto Scaling group is in cooldown. </li>
189		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	193	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
190	194	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
191	195	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
192	196	*/
—	—	@@ -205,7 +209,7 @@
206	210	* @param string $policy_name (Required) The name or PolicyARN of the policy you want to delete
207	211	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
208	212	* <li><code>AutoScalingGroupName</code> - <code>string</code> - Optional - The name of the Auto Scaling group. </li>
209		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	213	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
210	214	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
211	215	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
212	216	*/
—	—	@@ -224,7 +228,7 @@
225	229	* @param string $scheduled_action_name (Required) The name of the action you want to delete.
226	230	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
227	231	* <li><code>AutoScalingGroupName</code> - <code>string</code> - Optional - The name of the Auto Scaling group </li>
228		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	232	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
229	233	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
230	234	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
231	235	*/
—	—	@@ -246,7 +250,7 @@
247	251	* <li><code>LaunchConfigurationNames</code> - <code>string\|array</code> - Optional - A list of launch configuration names. Pass a string for a single value, or an indexed array for multiple values. </li>
248	252	* <li><code>NextToken</code> - <code>string</code> - Optional - A string that marks the start of the next batch of returned results. </li>
249	253	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of launch configurations. </li>
250		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	254	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
251	255	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
252	256	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
253	257	*/
—	—	@@ -271,7 +275,7 @@
272	276	* Returns scaling process types for use in the ResumeProcesses and SuspendProcesses actions.
273	277	*
274	278	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
275		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	279	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
276	280	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
277	281	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
278	282	*/
—	—	@@ -294,7 +298,7 @@
295	299	* <li><code>AutoScalingGroupNames</code> - <code>string\|array</code> - Optional - A list of Auto Scaling group names. Pass a string for a single value, or an indexed array for multiple values. </li>
296	300	* <li><code>NextToken</code> - <code>string</code> - Optional - A string that marks the start of the next batch of returned results. </li>
297	301	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of records to return. </li>
298		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	302	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
299	303	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
300	304	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
301	305	*/
—	—	@@ -326,7 +330,7 @@
327	331	* @param string $granularity (Required) The granularity to associate with the metrics to collect. Currently, the only legal granularity is "1Minute".
328	332	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
329	333	* <li><code>Metrics</code> - <code>string\|array</code> - Optional - The list of metrics to collect. If no metrics are specified, all metrics are enabled. The following metrics are supported: <ul> <li>GroupMinSize</li><li>GroupMaxSize</li><li>GroupDesiredCapacity</li><li>GroupInServiceInstances</li><li>GroupPendingInstances</li><li>GroupTerminatingInstances</li><li>GroupTotalInstances</li> </ul> Pass a string for a single value, or an indexed array for multiple values. </li>
330		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	334	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
331	335	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
332	336	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
333	337	*/
—	—	@@ -357,7 +361,7 @@
358	362	* @param string $instance_id (Required) The ID of the EC2 instance to be terminated.
359	363	* @param boolean $should_decrement_desired_capacity (Required) Specifies whether (<i>true</i>) or not (<i>false</i>) terminating this instance should also decrement the size of the AutoScalingGroup.
360	364	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
361		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	365	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
362	366	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
363	367	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
364	368	*/
—	—	@@ -385,7 +389,7 @@
386	390	* <li><code>AutoScalingGroupName</code> - <code>string</code> - Optional - The name of the AutoScalingGroup. </li>
387	391	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of scaling activities to return. </li>
388	392	* <li><code>NextToken</code> - <code>string</code> - Optional - A string that marks the start of the next batch of returned results for pagination. </li>
389		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	393	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
390	394	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
391	395	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
392	396	*/
—	—	@@ -413,7 +417,7 @@
414	418	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
415	419	* <li><code>AutoScalingGroupName</code> - <code>string</code> - Optional - The name or ARN of the Auto Scaling Group. </li>
416	420	* <li><code>HonorCooldown</code> - <code>boolean</code> - Optional - Set to True if you want Auto Scaling to reject this request if the Auto Scaling group is in cooldown. </li>
417		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	421	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
418	422	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
419	423	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
420	424	*/
—	—	@@ -430,7 +434,7 @@
431	435	* Returns a list of metrics and a corresponding list of granularities for each metric.
432	436	*
433	437	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
434		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	438	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
435	439	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
436	440	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
437	441	*/
—	—	@@ -451,7 +455,7 @@
452	456	* <li><code>PolicyNames</code> - <code>string\|array</code> - Optional - A list of policy names or policy ARNs to be described. If this list is omitted, all policy names are described. If an auto scaling group name is provided, the results are limited to that group.The list of requested policy names cannot contain more than 50 items. If unknown policy names are requested, they are ignored with no error. Pass a string for a single value, or an indexed array for multiple values. </li>
453	457	* <li><code>NextToken</code> - <code>string</code> - Optional - A string that is used to mark the start of the next batch of returned results for pagination. </li>
454	458	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of policies that will be described with each call. </li>
455		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	459	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
456	460	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
457	461	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
458	462	*/
—	—	@@ -476,7 +480,7 @@
477	481	* Returns policy adjustment types for use in the PutScalingPolicy action.
478	482	*
479	483	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
480		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	484	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
481	485	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
482	486	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
483	487	*/
—	—	@@ -496,7 +500,7 @@
497	501	*
498	502	* @param string $auto_scaling_group_name (Required) The name of the Auto Scaling group.
499	503	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
500		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	504	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
501	505	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
502	506	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
503	507	*/
—	—	@@ -529,7 +533,7 @@
530	534	* <li><code>HealthCheckGracePeriod</code> - <code>integer</code> - Optional - Length of time in seconds after a new EC2 instance comes into service that Auto Scaling starts checking its health. </li>
531	535	* <li><code>PlacementGroup</code> - <code>string</code> - Optional - Physical location of your cluster placement group created in Amazon EC2. </li>
532	536	* <li><code>VPCZoneIdentifier</code> - <code>string</code> - Optional - The subnet identifier of the Virtual Private Cloud. </li>
533		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	537	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
534	538	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
535	539	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
536	540	*/
—	—	@@ -570,7 +574,7 @@
571	575	* <li><code>InstanceIds</code> - <code>string\|array</code> - Optional - The list of Auto Scaling instances to describe. If this list is omitted, all auto scaling instances are described. The list of requested instances cannot contain more than 50 items. If unknown instances are requested, they are ignored with no error. Pass a string for a single value, or an indexed array for multiple values. </li>
572	576	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of Auto Scaling instances to be described with each call. </li>
573	577	* <li><code>NextToken</code> - <code>string</code> - Optional - The token returned by a previous call to indicate that there is more data available. </li>
574		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	578	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
575	579	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
576	580	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
577	581	*/
—	—	@@ -599,7 +603,7 @@
600	604	*
601	605	* @param string $launch_configuration_name (Required) The name of the launch configuration.
602	606	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
603		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	607	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
604	608	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
605	609	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
606	610	*/
—	—	@@ -622,7 +626,7 @@
623	627	* @param string $adjustment_type (Required) Specifies whether the <code>ScalingAdjustment</code> is an absolute number or a percentage of the current capacity. Valid values are <code>ChangeInCapacity</code>, <code>ExactCapacity</code>, and <code>PercentChangeInCapacity</code>.
624	628	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
625	629	* <li><code>Cooldown</code> - <code>integer</code> - Optional - The amount of time, in seconds, after a scaling activity completes before any further trigger-related scaling activities can start. </li>
626		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	630	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
627	631	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
628	632	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
629	633	*/
—	—	@@ -645,7 +649,7 @@
646	650	* @param string $health_status (Required) The health status of the instance. "Healthy" means that the instance is healthy and should remain in service. "Unhealthy" means that the instance is unhealthy. Auto Scaling should terminate and replace it.
647	651	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
648	652	* <li><code>ShouldRespectGracePeriod</code> - <code>boolean</code> - Optional - If True, this call should respect the grace period associated with the group. </li>
649		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	653	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
650	654	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
651	655	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
652	656	*/
—	—	@@ -686,7 +690,7 @@
687	691	* <li><code>HealthCheckGracePeriod</code> - <code>integer</code> - Optional - The length of time that Auto Scaling waits before checking an instance's health status. The grace period begins when an instance comes into service. </li>
688	692	* <li><code>PlacementGroup</code> - <code>string</code> - Optional - The name of the cluster placement group, if applicable. For more information, go to Using Cluster Instances in the Amazon EC2 User Guide. </li>
689	693	* <li><code>VPCZoneIdentifier</code> - <code>string</code> - Optional - The identifier for the VPC connection, if applicable. </li>
690		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	694	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
691	695	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
692	696	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
693	697	*/
—	—	@@ -719,7 +723,7 @@
720	724	* <li><code>EndTime</code> - <code>string</code> - Optional - The latest scheduled start time to return. If scheduled action names are provided, this field will be ignored. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
721	725	* <li><code>NextToken</code> - <code>string</code> - Optional - A string that marks the start of the next batch of returned results. </li>
722	726	* <li><code>MaxRecords</code> - <code>integer</code> - Optional - The maximum number of scheduled actions to return. </li>
723		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	727	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
724	728	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
725	729	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
726	730	*/
—	—	@@ -765,7 +769,7 @@
766	770	* @param string $auto_scaling_group_name (Required) The name or Amazon Resource Name (ARN) of the Auto Scaling group.
767	771	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
768	772	* <li><code>ScalingProcesses</code> - <code>string\|array</code> - Optional - The processes that you want to suspend or resume, which can include one or more of the following: <ul> <li>Launch</li><li>Terminate</li><li>HealthCheck</li><li>ReplaceUnhealthy</li><li>AZRebalance</li><li>AlarmNotifications</li><li>ScheduledActions</li> </ul> To suspend all process types, omit this parameter. Pass a string for a single value, or an indexed array for multiple values. </li>
769		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	773	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
770	774	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
771	775	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
772	776	*/
—	—	@@ -793,7 +797,7 @@
794	798	* @param string $auto_scaling_group_name (Required) The name or Amazon Resource Name (ARN) of the Auto Scaling group.
795	799	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
796	800	* <li><code>ScalingProcesses</code> - <code>string\|array</code> - Optional - The processes that you want to suspend or resume, which can include one or more of the following: <ul> <li>Launch</li><li>Terminate</li><li>HealthCheck</li><li>ReplaceUnhealthy</li><li>AZRebalance</li><li>AlarmNotifications</li><li>ScheduledActions</li> </ul> To suspend all process types, omit this parameter. Pass a string for a single value, or an indexed array for multiple values. </li>
797		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	801	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
798	802	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
799	803	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
800	804	*/
—	—	@@ -842,7 +846,7 @@
843	847	* </ul></li>
844	848	* <li><code>InstanceMonitoring</code> - <code>array</code> - Optional - Enables detailed monitoring. <ul>
845	849	* <li><code>Enabled</code> - <code>boolean</code> - Optional - If true, instance monitoring is enabled. </li></ul></li>
846		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	850	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
847	851	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
848	852	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
849	853	*/
—	—	@@ -891,7 +895,7 @@
892	896	* @param string $auto_scaling_group_name (Required) The name or ARN of the Auto Scaling Group.
893	897	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
894	898	* <li><code>Metrics</code> - <code>string\|array</code> - Optional - The list of metrics to disable. If no metrics are specified, all metrics are disabled. The following metrics are supported: <ul> <li>GroupMinSize</li><li>GroupMaxSize</li><li>GroupDesiredCapacity</li><li>GroupInServiceInstances</li><li>GroupPendingInstances</li><li>GroupTerminatingInstances</li><li>GroupTotalInstances</li> </ul> Pass a string for a single value, or an indexed array for multiple values. </li>
895		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	899	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
896	900	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
897	901	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
898	902	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sns.class.php
—	—	@@ -17,7 +17,7 @@
18	18	/**
19	19
20	20	*
21		~~- * @version Tue Apr 05 15:22:52 PDT 2011~~
	21	+ * @version Tue May 10 18:31:18 PDT 2011
22	22	* @license See the included NOTICE.md file for complete information.
23	23	* @copyright See the included NOTICE.md file for complete information.
24	24	* @link http://aws.amazon.com/sns/Amazon Simple Notification Service
—	—	@@ -122,12 +122,16 @@
123	123
124	124	if (!$key && !defined('AWS_KEY'))
125	125	{
	126	+ // @codeCoverageIgnoreStart
126	127	throw new SNS_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	128	+ // @codeCoverageIgnoreEnd
127	129	}
128	130
129	131	if (!$secret_key && !defined('AWS_SECRET_KEY'))
130	132	{
	133	+ // @codeCoverageIgnoreStart
131	134	throw new SNS_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	135	+ // @codeCoverageIgnoreEnd
132	136	}
133	137
134	138	return parent::__construct($key, $secret_key);
—	—	@@ -147,7 +151,7 @@
148	152	* @param string $token (Required) Short-lived token sent to an endpoint during the Subscribe action.
149	153	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
150	154	* <li><code>AuthenticateOnUnsubscribe</code> - <code>string</code> - Optional - Indicates that you want to disable unauthenticated unsubsciption of the subscription. If parameter is present in the request, the request has an AWS signature, and the value of this parameter is true, only the topic owner and the subscription owner will be permitted to unsubscribe the endopint, and the Unsubscribe action will require AWS authentication. </li>
151		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	155	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
152	156	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
153	157	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
154	158	*/
—	—	@@ -167,7 +171,7 @@
168	172	*
169	173	* @param string $topic_arn (Required) The ARN of the topic whose properties you want to get.
170	174	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
171		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	175	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
172	176	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
173	177	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
174	178	*/
—	—	@@ -189,7 +193,7 @@
190	194	* @param string $protocol (Required) The protocol you want to use. Supported protocols include: <ul> <li>http -- delivery of JSON-encoded message via HTTP POST</li><li>https -- delivery of JSON-encoded message via HTTPS POST</li><li>email -- delivery of message via SMTP</li><li>email-json -- delivery of JSON-encoded message via SMTP</li><li>sqs -- delivery of JSON-encoded message to an Amazon SQS queue</li> </ul>
191	195	* @param string $endpoint (Required) The endpoint that you want to receive notifications. Endpoints vary by protocol: <ul> <li>For the http protocol, the endpoint is an URL beginning with "http://"</li><li>For the https protocol, the endpoint is a URL beginning with "https://"</li><li>For the email protocol, the endpoint is an e-mail address</li><li>For the email-json protocol, the endpoint is an e-mail address</li><li>For the sqs protocol, the endpoint is the ARN of an Amazon SQS queue</li> </ul>
192	196	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
193		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	197	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
194	198	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
195	199	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
196	200	*/
—	—	@@ -211,7 +215,7 @@
212	216	* @param string $attribute_name (Required) The name of the attribute you want to set. Only a subset of the topic's attributes are mutable.
213	217	* @param string $attribute_value (Required) The new value for the attribute.
214	218	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
215		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	219	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
216	220	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
217	221	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
218	222	*/
—	—	@@ -232,7 +236,7 @@
233	237	*
234	238	* @param string $topic_arn (Required) The ARN of the topic you want to delete.
235	239	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
236		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	240	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
237	241	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
238	242	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
239	243	*/
—	—	@@ -251,7 +255,7 @@
252	256	* @param string $topic_arn (Required) The ARN of the topic whose access control policy you wish to modify.
253	257	* @param string $label (Required) The unique label of the statement you want to remove.
254	258	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
255		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	259	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
256	260	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
257	261	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
258	262	*/
—	—	@@ -271,7 +275,7 @@
272	276	*
273	277	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
274	278	* <li><code>NextToken</code> - <code>string</code> - Optional - Token returned by the previous ListSubscriptions request. </li>
275		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	279	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
276	280	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
277	281	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
278	282	*/
—	—	@@ -292,7 +296,7 @@
293	297	* @param string\|array $account_id (Required) The AWS account IDs of the users (principals) who will be given access to the specified actions. The users must have AWS accounts, but do not need to be signed up for this service. Pass a string for a single value, or an indexed array for multiple values.
294	298	* @param string\|array $action_name (Required) The action you want to allow for the specified principal(s). Pass a string for a single value, or an indexed array for multiple values.
295	299	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
296		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	300	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
297	301	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
298	302	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
299	303	*/
—	—	@@ -323,7 +327,7 @@
324	328	*
325	329	* @param string $name (Required) The name of the topic you want to create. Constraints: Topic names must be made up of only uppercase and lowercase ASCII letters, numbers, and hyphens, and must be between 1 and 256 characters long.
326	330	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
327		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	331	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
328	332	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
329	333	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
330	334	*/
—	—	@@ -342,7 +346,7 @@
343	347	*
344	348	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
345	349	* <li><code>NextToken</code> - <code>string</code> - Optional - Token returned by the previous ListTopics request. </li>
346		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	350	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
347	351	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
348	352	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
349	353	*/
—	—	@@ -362,7 +366,7 @@
363	367	*
364	368	* @param string $subscription_arn (Required) The ARN of the subscription to be deleted.
365	369	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
366		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	370	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
367	371	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
368	372	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
369	373	*/
—	—	@@ -383,7 +387,7 @@
384	388	* @param string $topic_arn (Required) The ARN of the topic for which you wish to find subscriptions.
385	389	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
386	390	* <li><code>NextToken</code> - <code>string</code> - Optional - Token returned by the previous ListSubscriptionsByTopic request. </li>
387		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	391	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
388	392	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
389	393	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
390	394	*/
—	—	@@ -405,7 +409,7 @@
406	410	* @param string $message (Required) The message you want to send to the topic. Constraints: Messages must be UTF-8 encoded strings at most 8 KB in size (8192 bytes, not 8192 characters).
407	411	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
408	412	* <li><code>Subject</code> - <code>string</code> - Optional - Optional parameter to be used as the "Subject" line of when the message is delivered to e-mail endpoints. This field will also be included, if present, in the standard JSON messages delivered to other endpoints. Constraints: Subjects must be ASCII text that begins with a letter, number or punctuation mark; must not include line breaks or control characters; and must be less than 100 characters long. </li>
409		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	413	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
410	414	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
411	415	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
412	416	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/iam.class.php
—	—	@@ -32,7 +32,7 @@
33	33	*
34	34	* We will refer to Amazon AWS Identity and Access Management using the abbreviated form IAM. All copyrights and legal protections still apply.
35	35	*
36		~~- * @version Tue Apr 05 15:20:35 PDT 2011~~
	36	+ * @version Tue May 10 18:28:47 PDT 2011
37	37	* @license See the included NOTICE.md file for complete information.
38	38	* @copyright See the included NOTICE.md file for complete information.
39	39	* @link http://aws.amazon.com/iam/Amazon Identity and Access Management Service
—	—	@@ -68,12 +68,16 @@
69	69
70	70	if (!$key && !defined('AWS_KEY'))
71	71	{
	72	+ // @codeCoverageIgnoreStart
72	73	throw new IAM_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	74	+ // @codeCoverageIgnoreEnd
73	75	}
74	76
75	77	if (!$secret_key && !defined('AWS_SECRET_KEY'))
76	78	{
	79	+ // @codeCoverageIgnoreStart
77	80	throw new IAM_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	81	+ // @codeCoverageIgnoreEnd
78	82	}
79	83
80	84	return parent::__construct($key, $secret_key);
—	—	@@ -93,7 +97,7 @@
94	98	* <li><code>PathPrefix</code> - <code>string</code> - Optional - The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all groups whose path starts with <code>/division_abc/subdivision_xyz/</code>. This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. </li>
95	99	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
96	100	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of groups you want in the response. If there are additional groups beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
97		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	101	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
98	102	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
99	103	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
100	104	*/
—	—	@@ -115,7 +119,7 @@
116	120	* @param string $access_key_id (Required) The Access Key ID for the Access Key ID and Secret Access Key you want to delete.
117	121	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
118	122	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User whose key you want to delete. </li>
119		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	123	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
120	124	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
121	125	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
122	126	*/
—	—	@@ -135,7 +139,7 @@
136	140	*
137	141	* @param string $account_alias (Required) Name of the account alias to delete.
138	142	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
139		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	143	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
140	144	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
141	145	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
142	146	*/
—	—	@@ -162,7 +166,7 @@
163	167	* <li><code>UserName</code> - <code>string</code> - Optional - The name of the User. </li>
164	168	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
165	169	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of certificate IDs you want in the response. If there are additional certificate IDs beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
166		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	170	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
167	171	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
168	172	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
169	173	*/
—	—	@@ -190,7 +194,7 @@
191	195	* @param string $certificate_body (Required) The contents of the signing certificate.
192	196	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
193	197	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User the signing certificate is for. </li>
194		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	198	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
195	199	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
196	200	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
197	201	*/
—	—	@@ -209,7 +213,7 @@
210	214	* @param string $user_name (Required) Name of the User the policy is associated with.
211	215	* @param string $policy_name (Required) Name of the policy document to delete.
212	216	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
213		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	217	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
214	218	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
215	219	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
216	220	*/
—	—	@@ -240,7 +244,7 @@
241	245	* @param string $policy_name (Required) Name of the policy document.
242	246	* @param string $policy_document (Required) The policy document.
243	247	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
244		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	248	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
245	249	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
246	250	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
247	251	*/
—	—	@@ -264,7 +268,7 @@
265	269	* <li><code>PathPrefix</code> - <code>string</code> - Optional - The path prefix for filtering the results. For example: <code>/company/servercerts</code> would get all server certificates for which the path starts with <code>/company/servercerts</code>. This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. </li>
266	270	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
267	271	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of server certificates you want in the response. If there are additional server certificates beyond the maximum you specify, the <code>IsTruncated</code> response element will be set to <code>true</code>. </li>
268		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	272	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
269	273	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
270	274	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
271	275	*/
—	—	@@ -283,7 +287,7 @@
284	288	* @param string $user_name (Required) Name of the User who the policy is associated with.
285	289	* @param string $policy_name (Required) Name of the policy document to get.
286	290	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
287		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	291	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
288	292	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
289	293	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
290	294	*/
—	—	@@ -303,7 +307,7 @@
304	308	* @param string $user_name (Required) Name of the User whose login profile you want to update.
305	309	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
306	310	* <li><code>Password</code> - <code>string</code> - Optional - The new password for the User name. </li>
307		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	311	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
308	312	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
309	313	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
310	314	*/
—	—	@@ -332,7 +336,7 @@
333	337	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
334	338	* <li><code>NewPath</code> - <code>string</code> - Optional - The new path for the server certificate. Include this only if you are updating the server certificate's path. </li>
335	339	* <li><code>NewServerCertificateName</code> - <code>string</code> - Optional - The new name for the server certificate. Include this only if you are updating the server certificate's name. </li>
336		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	340	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
337	341	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
338	342	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
339	343	*/
—	—	@@ -361,7 +365,7 @@
362	366	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
363	367	* <li><code>NewPath</code> - <code>string</code> - Optional - New path for the User. Include this parameter only if you're changing the User's path. </li>
364	368	* <li><code>NewUserName</code> - <code>string</code> - Optional - New name for the User. Include this parameter only if you're changing the User's name. </li>
365		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	369	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
366	370	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
367	371	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
368	372	*/
—	—	@@ -383,7 +387,7 @@
384	388	*
385	389	* @param string $user_name (Required) Name of the User whose login profile you want to delete.
386	390	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
387		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	391	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
388	392	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
389	393	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
390	394	*/
—	—	@@ -412,7 +416,7 @@
413	417	* @param string $status (Required) The status you want to assign to the certificate. <code>Active</code> means the certificate can be used for API calls to AWS, while <code>Inactive</code> means the certificate cannot be used. [Allowed values: <code>Active</code>, <code>Inactive</code>]
414	418	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
415	419	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User the signing certificate belongs to. </li>
416		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	420	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
417	421	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
418	422	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
419	423	*/
—	—	@@ -432,7 +436,7 @@
433	437	* @param string $group_name (Required) Name of the group the policy is associated with.
434	438	* @param string $policy_name (Required) Name of the policy document to delete.
435	439	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
436		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	440	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
437	441	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
438	442	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
439	443	*/
—	—	@@ -455,7 +459,7 @@
456	460	* <li><code>PathPrefix</code> - <code>string</code> - Optional - The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all User names whose path starts with <code>/division_abc/subdivision_xyz/</code>. This parameter is optional. If it is not included, it defaults to a slash (/), listing all User names. </li>
457	461	* <li><code>Marker</code> - <code>string</code> - Optional - Use this parameter only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
458	462	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this parameter only when paginating results to indicate the maximum number of User names you want in the response. If there are additional User names beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
459		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	463	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
460	464	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
461	465	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
462	466	*/
—	—	@@ -483,7 +487,7 @@
484	488	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
485	489	* <li><code>NewPath</code> - <code>string</code> - Optional - New path for the group. Only include this if changing the group's path. </li>
486	490	* <li><code>NewGroupName</code> - <code>string</code> - Optional - New name for the group. Only include this if changing the group's name. </li>
487		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	491	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
488	492	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
489	493	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
490	494	*/
—	—	@@ -501,7 +505,7 @@
502	506	*
503	507	* @param string $server_certificate_name (Required) The name of the server certificate you want to retrieve information about.
504	508	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
505		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	509	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
506	510	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
507	511	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
508	512	*/
—	—	@@ -531,7 +535,7 @@
532	536	* @param string $policy_name (Required) Name of the policy document.
533	537	* @param string $policy_document (Required) The policy document.
534	538	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
535		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	539	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
536	540	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
537	541	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
538	542	*/
—	—	@@ -556,7 +560,7 @@
557	561	* @param string $user_name (Required) Name of the User to create.
558	562	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
559	563	* <li><code>Path</code> - <code>string</code> - Optional - The path for the User name. For more information about paths, see Identifiers for IAM Entities in <i>Using AWS Identity and Access Management</i>. This parameter is optional. If it is not included, it defaults to a slash (/). </li>
560		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	564	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
561	565	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
562	566	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
563	567	*/
—	—	@@ -579,7 +583,7 @@
580	584	* @param string $certificate_id (Required) ID of the signing certificate to delete.
581	585	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
582	586	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User the signing certificate belongs to. </li>
583		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	587	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
584	588	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
585	589	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
586	590	*/
—	—	@@ -601,7 +605,7 @@
602	606	* @param string $authentication_code1 (Required) An authentication code emitted by the device.
603	607	* @param string $authentication_code2 (Required) A subsequent authentication code emitted by the device.
604	608	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
605		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	609	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
606	610	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
607	611	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
608	612	*/
—	—	@@ -626,7 +630,7 @@
627	631	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
628	632	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
629	633	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of policy names you want in the response. If there are additional policy names beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
630		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	634	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
631	635	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
632	636	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
633	637	*/
—	—	@@ -655,7 +659,7 @@
656	660	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User. </li>
657	661	* <li><code>Marker</code> - <code>string</code> - Optional - Use this parameter only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
658	662	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this parameter only when paginating results to indicate the maximum number of keys you want in the response. If there are additional keys beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
659		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	663	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
660	664	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
661	665	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
662	666	*/
—	—	@@ -672,7 +676,7 @@
673	677	*
674	678	* @param string $user_name (Required) Name of the User whose login profile you want to retrieve.
675	679	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
676		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	680	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
677	681	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
678	682	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
679	683	*/
—	—	@@ -694,7 +698,7 @@
695	699	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
696	700	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
697	701	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of groups you want in the response. If there are additional groups beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
698		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	702	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
699	703	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
700	704	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
701	705	*/
—	—	@@ -717,7 +721,7 @@
718	722	* @param string $group_name (Required) Name of the group to create. Do not include the path in this value.
719	723	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
720	724	* <li><code>Path</code> - <code>string</code> - Optional - The path to the group. For more information about paths, see Identifiers for IAM Entities in <i>Using AWS Identity and Access Management</i>. This parameter is optional. If it is not included, it defaults to a slash (/). </li>
721		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	725	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
722	726	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
723	727	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
724	728	*/
—	—	@@ -749,7 +753,7 @@
750	754	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
751	755	* <li><code>Path</code> - <code>string</code> - Optional - The path for the server certificate. For more information about paths, see Identifiers for IAM Entities in <i>Using AWS Identity and Access Management</i>. This parameter is optional. If it is not included, it defaults to a slash (/). </li>
752	756	* <li><code>CertificateChain</code> - <code>string</code> - Optional - The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain. </li>
753		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	757	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
754	758	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
755	759	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
756	760	*/
—	—	@@ -771,7 +775,7 @@
772	776	*
773	777	* @param string $account_alias (Required) Name of the account alias to create
774	778	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
775		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	779	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
776	780	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
777	781	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
778	782	*/
—	—	@@ -791,7 +795,7 @@
792	796	* @param string $group_name (Required) Name of the group the policy is associated with.
793	797	* @param string $policy_name (Required) Name of the policy document to get.
794	798	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
795		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	799	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
796	800	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
797	801	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
798	802	*/
—	—	@@ -810,7 +814,7 @@
811	815	*
812	816	* @param string $user_name (Required) Name of the User to delete.
813	817	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
814		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	818	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
815	819	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
816	820	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
817	821	*/
—	—	@@ -829,7 +833,7 @@
830	834	* @param string $user_name (Required) Name of the User whose MFA device you want to deactivate.
831	835	* @param string $serial_number (Required) The serial number that uniquely identifies the MFA device.
832	836	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
833		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	837	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
834	838	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
835	839	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
836	840	*/
—	—	@@ -849,7 +853,7 @@
850	854	* @param string $group_name (Required) Name of the group to update.
851	855	* @param string $user_name (Required) Name of the User to remove.
852	856	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
853		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	857	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
854	858	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
855	859	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
856	860	*/
—	—	@@ -873,7 +877,7 @@
874	878	*
875	879	* @param string $server_certificate_name (Required) The name of the server certificate you want to delete.
876	880	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
877		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	881	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
878	882	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
879	883	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
880	884	*/
—	—	@@ -895,7 +899,7 @@
896	900	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
897	901	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
898	902	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of policy names you want in the response. If there are additional policy names beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
899		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	903	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
900	904	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
901	905	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
902	906	*/
—	—	@@ -917,7 +921,7 @@
918	922	* @param string $user_name (Required) Name of the User to create a login profile for.
919	923	* @param string $password (Required) The new password for the User name.
920	924	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
921		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	925	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
922	926	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
923	927	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
924	928	*/
—	—	@@ -949,7 +953,7 @@
950	954	*
951	955	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
952	956	* <li><code>UserName</code> - <code>string</code> - Optional - The User name that the new key will belong to. </li>
953		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	957	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
954	958	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
955	959	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
956	960	*/
—	—	@@ -968,7 +972,7 @@
969	973	*
970	974	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
971	975	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User to get information about. This parameter is optional. If it is not included, it defaults to the User making the request. </li>
972		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	976	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
973	977	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
974	978	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
975	979	*/
—	—	@@ -988,7 +992,7 @@
989	993	* @param string $authentication_code1 (Required) An authentication code emitted by the device.
990	994	* @param string $authentication_code2 (Required) A subsequent authentication code emitted by the device.
991	995	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
992		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	996	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
993	997	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
994	998	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
995	999	*/
—	—	@@ -1013,7 +1017,7 @@
1014	1018	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1015	1019	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
1016	1020	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of keys you want in the response. If there are additional keys beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
1017		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1021	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1018	1022	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1019	1023	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1020	1024	*/
—	—	@@ -1042,7 +1046,7 @@
1043	1047	* @param string $status (Required) The status you want to assign to the Secret Access Key. <code>Active</code> means the key can be used for API calls to AWS, while <code>Inactive</code> means the key cannot be used. [Allowed values: <code>Active</code>, <code>Inactive</code>]
1044	1048	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1045	1049	* <li><code>UserName</code> - <code>string</code> - Optional - Name of the User whose key you want to update. </li>
1046		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1050	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1047	1051	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1048	1052	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1049	1053	*/
—	—	@@ -1064,7 +1068,7 @@
1065	1069	* <i>Using AWS Identity and Access Management</i>.
1066	1070	*
1067	1071	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1068		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1072	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1069	1073	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1070	1074	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1071	1075	*/
—	—	@@ -1082,7 +1086,7 @@
1083	1087	* @param string $group_name (Required) Name of the group to update.
1084	1088	* @param string $user_name (Required) Name of the User to add.
1085	1089	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1086		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1090	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1087	1091	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1088	1092	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1089	1093	*/
—	—	@@ -1104,7 +1108,7 @@
1105	1109	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1106	1110	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
1107	1111	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of User names you want in the response. If there are additional User names beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
1108		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1112	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1109	1113	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1110	1114	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1111	1115	*/
—	—	@@ -1127,7 +1131,7 @@
1128	1132	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1129	1133	* <li><code>Marker</code> - <code>string</code> - Optional - Use this only when paginating results, and only in a subsequent request after you've received a response where the results are truncated. Set it to the value of the <code>Marker</code> element in the response you just received. </li>
1130	1134	* <li><code>MaxItems</code> - <code>integer</code> - Optional - Use this only when paginating results to indicate the maximum number of account aliases you want in the response. If there are additional account aliases beyond the maximum you specify, the <code>IsTruncated</code> response element is <code>true</code>. </li>
1131		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1135	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1132	1136	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1133	1137	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1134	1138	*/
—	—	@@ -1144,7 +1148,7 @@
1145	1149	*
1146	1150	* @param string $group_name (Required) Name of the group to delete.
1147	1151	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1148		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1152	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1149	1153	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1150	1154	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1151	1155	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sqs.class.php
—	—	@@ -28,7 +28,7 @@
29	29	*
30	30	* Visit <a href="http://aws.amazon.com/sqs/">http://aws.amazon.com/sqs/</a> for more information.
31	31	*
32		~~- * @version Tue Apr 05 15:23:20 PDT 2011~~
	32	+ * @version Tue May 10 18:31:54 PDT 2011
33	33	* @license See the included NOTICE.md file for complete information.
34	34	* @copyright See the included NOTICE.md file for complete information.
35	35	* @link http://aws.amazon.com/sqs/Amazon Simple Queue Service
—	—	@@ -168,12 +168,16 @@
169	169
170	170	if (!$key && !defined('AWS_KEY'))
171	171	{
	172	+ // @codeCoverageIgnoreStart
172	173	throw new SQS_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	174	+ // @codeCoverageIgnoreEnd
173	175	}
174	176
175	177	if (!$secret_key && !defined('AWS_SECRET_KEY'))
176	178	{
	179	+ // @codeCoverageIgnoreStart
177	180	throw new SQS_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	181	+ // @codeCoverageIgnoreEnd
178	182	}
179	183
180	184	return parent::__construct($key, $secret_key);
—	—	@@ -189,7 +193,7 @@
190	194	*
191	195	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
192	196	* <li><code>QueueNamePrefix</code> - <code>string</code> - Optional - A string to use for filtering the list results. Only those queues whose name begins with the specified string are returned. </li>
193		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	197	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
194	198	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
195	199	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
196	200	*/
—	—	@@ -212,7 +216,7 @@
213	217	* </ul></li>
214	218	* </ul>
215	219	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
216		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	220	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
217	221	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
218	222	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
219	223	*/
—	—	@@ -252,7 +256,7 @@
253	257	* @param string $receipt_handle (Required) The receipt handle associated with the message whose visibility timeout should be changed.
254	258	* @param integer $visibility_timeout (Required) The new value (in seconds) for the message's visibility timeout.
255	259	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
256		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	260	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
257	261	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
258	262	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
259	263	*/
—	—	@@ -278,7 +282,7 @@
279	283	* @param string $queue_name (Required) The name for the queue to be created.
280	284	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
281	285	* <li><code>DefaultVisibilityTimeout</code> - <code>integer</code> - Optional - The visibility timeout (in seconds) to use for the created queue. </li>
282		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	286	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
283	287	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
284	288	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
285	289	*/
—	—	@@ -298,7 +302,7 @@
299	303	* @param string $queue_url (Required) The URL of the SQS queue to take action on.
300	304	* @param string $label (Required) The identfication of the permission to remove. This is the label added with the AddPermission operation.
301	305	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
302		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	306	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
303	307	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
304	308	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
305	309	*/
—	—	@@ -318,7 +322,7 @@
319	323	* @param string $queue_url (Required) The URL of the SQS queue to take action on.
320	324	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
321	325	* <li><code>AttributeName</code> - <code>string\|array</code> - Optional - A list of attributes to retrieve information for. Pass a string for a single value, or an indexed array for multiple values. </li>
322		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	326	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
323	327	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
324	328	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
325	329	*/
—	—	@@ -359,7 +363,7 @@
360	364	* @param string\|array $account_id (Required) The AWS account number of the principal who will be given permission. The principal must have an AWS account, but does not need to be signed up for Amazon SQS. Pass a string for a single value, or an indexed array for multiple values.
361	365	* @param string\|array $action_name (Required) The action the client wants to allow for the specified principal. Pass a string for a single value, or an indexed array for multiple values.
362	366	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
363		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	367	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
364	368	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
365	369	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
366	370	*/
—	—	@@ -388,7 +392,7 @@
389	393	*
390	394	* @param string $queue_url (Required) The URL of the SQS queue to take action on.
391	395	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
392		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	396	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
393	397	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
394	398	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
395	399	*/
—	—	@@ -407,7 +411,7 @@
408	412	* @param string $queue_url (Required) The URL of the SQS queue to take action on.
409	413	* @param string $receipt_handle (Required) The receipt handle associated with the message to delete.
410	414	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
411		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	415	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
412	416	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
413	417	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
414	418	*/
—	—	@@ -426,7 +430,7 @@
427	431	* @param string $queue_url (Required) The URL of the SQS queue to take action on.
428	432	* @param string $message_body (Required) The message to send.
429	433	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
430		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	434	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
431	435	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
432	436	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
433	437	*/
—	—	@@ -450,7 +454,7 @@
451	455	* <li><code>AttributeName</code> - <code>string\|array</code> - Optional - A list of attributes to retrieve information for. Pass a string for a single value, or an indexed array for multiple values. </li>
452	456	* <li><code>MaxNumberOfMessages</code> - <code>integer</code> - Optional - The maximum number of messages to return. Amazon SQS never returns more messages than this value but may return fewer. All of the messages are not necessarily returned. </li>
453	457	* <li><code>VisibilityTimeout</code> - <code>integer</code> - Optional - The duration (in seconds) that the received messages are hidden from subsequent retrieve requests after being retrieved by a <code>ReceiveMessage</code> request. </li>
454		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	458	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
455	459	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
456	460	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
457	461	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/sdb.class.php
—	—	@@ -31,7 +31,7 @@
32	32	*
33	33	* Visit <a href="http://aws.amazon.com/simpledb/">http://aws.amazon.com/simpledb/</a> for more information.
34	34	*
35		~~- * @version Tue Apr 05 15:22:22 PDT 2011~~
	35	+ * @version Tue May 10 18:30:45 PDT 2011
36	36	* @license See the included NOTICE.md file for complete information.
37	37	* @copyright See the included NOTICE.md file for complete information.
38	38	* @link http://aws.amazon.com/simpledb/Amazon SimpleDB
—	—	@@ -226,12 +226,16 @@
227	227
228	228	if (!$key && !defined('AWS_KEY'))
229	229	{
	230	+ // @codeCoverageIgnoreStart
230	231	throw new SDB_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	232	+ // @codeCoverageIgnoreEnd
231	233	}
232	234
233	235	if (!$secret_key && !defined('AWS_SECRET_KEY'))
234	236	{
	237	+ // @codeCoverageIgnoreStart
235	238	throw new SDB_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	239	+ // @codeCoverageIgnoreEnd
236	240	}
237	241
238	242	return parent::__construct($key, $secret_key);
—	—	@@ -256,7 +260,7 @@
257	261	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
258	262	* <li><code>NextToken</code> - <code>string</code> - Optional - A string informing Amazon SimpleDB where to start the next list of <code>ItemNames</code>. </li>
259	263	* <li><code>ConsistentRead</code> - <code>boolean</code> - Optional - Determines whether or not strong consistency should be enforced when data is read from SimpleDB. If <code>true</code>, any data previously written to SimpleDB will be returned. Otherwise, results will be consistent eventually, and the client may not see data that was written immediately before your read. </li>
260		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	264	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
261	265	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
262	266	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
263	267	*/
—	—	@@ -312,7 +316,7 @@
313	317	* <li><code>Value</code> - <code>string</code> - Optional - The value of an attribute. This value can only be specified when the exists parameter is equal to true.</li>
314	318	* <li><code>Exists</code> - <code>string</code> - Optional - True if the specified attribute must exist with the specified value in order for this update condition to be satisfied, otherwise false if the specified attribute should not exist in order for this update condition to be satisfied.</li>
315	319	* </ul></li>
316		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	320	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
317	321	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
318	322	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
319	323	*/
—	—	@@ -359,7 +363,7 @@
360	364	* </ul>
361	365	*
362	366	* @param string $domain_name (Required) The name of the domain in which the attributes are being deleted.
363		~~- * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags).~~
	367	+ * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags). <ul>
364	368	* <li><code>[item]</code> - <code>array</code> - Set the custom item name as the key for this value.<ul>
365	369	* <li><code>[key]</code> - <code>array</code> - Set the custom key name as the key for this value. For the value, pass a string for a single value, or an indexed array for multiple values.</li>
366	370	* </ul></li></ul>
—	—	@@ -377,7 +381,7 @@
378	382	* </ul></li>
379	383	* </ul></li>
380	384	* </ul></li>
381		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	385	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
382	386	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
383	387	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
384	388	*/
—	—	@@ -411,7 +415,7 @@
412	416	*
413	417	* @param string $domain_name (Required) The name of the domain to delete.
414	418	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
415		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	419	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
416	420	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
417	421	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
418	422	*/
—	—	@@ -437,7 +441,7 @@
438	442	*
439	443	* @param string $domain_name (Required) The name of the domain to create. The name can range between 3 and 255 characters and can contain the following characters: a-z, A-Z, 0-9, '_', '-', and '.'.
440	444	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
441		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	445	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
442	446	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
443	447	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
444	448	*/
—	—	@@ -480,7 +484,7 @@
481	485	* <li><code>Value</code> - <code>string</code> - Optional - The value of an attribute. This value can only be specified when the exists parameter is equal to true.</li>
482	486	* <li><code>Exists</code> - <code>string</code> - Optional - True if the specified attribute must exist with the specified value in order for this update condition to be satisfied, otherwise false if the specified attribute should not exist in order for this update condition to be satisfied.</li>
483	487	* </ul></li>
484		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	488	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
485	489	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
486	490	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
487	491	*/
—	—	@@ -518,7 +522,7 @@
519	523	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
520	524	* <li><code>MaxNumberOfDomains</code> - <code>integer</code> - Optional - The maximum number of domain names you want returned. The range is 1 to 100. The default setting is 100. </li>
521	525	* <li><code>NextToken</code> - <code>string</code> - Optional - A string informing Amazon SimpleDB where to start the next list of domain names. </li>
522		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	526	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
523	527	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
524	528	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
525	529	*/
—	—	@@ -545,7 +549,7 @@
546	550	* @param string\|array $attribute_name (Optional) The names of the attributes. Pass a string for a single value, or an indexed array for multiple values.
547	551	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
548	552	* <li><code>ConsistentRead</code> - <code>boolean</code> - Optional - True if strong consistency should be enforced when data is read from SimpleDB, meaning that any data previously written to SimpleDB will be returned. Without specifying this parameter, results will be eventually consistent, and you may not see data that was written immediately before your read.</li>
549		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	553	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
550	554	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
551	555	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
552	556	*/
—	—	@@ -593,7 +597,7 @@
594	598	* </ul>
595	599	*
596	600	* @param string $domain_name (Required) The name of the domain in which the attributes are being deleted.
597		~~- * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags).~~
	601	+ * @param array $item_keypairs (Required) Associative array of parameters which are treated as item-key-value and item-key-multivalue pairs (i.e. a key can have one or more values; think tags). <ul>
598	602	* <li><code>[item]</code> - <code>array</code> - Set the custom item name as the key for this value.<ul>
599	603	* <li><code>[key]</code> - <code>array</code> - Set the custom key name as the key for this value. For the value, pass a string for a single value, or an indexed array for multiple values.</li>
600	604	* </ul></li></ul>
—	—	@@ -612,7 +616,7 @@
613	617	* </ul></li>
614	618	* </ul></li>
615	619	* </ul></li>
616		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	620	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
617	621	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
618	622	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
619	623	*/
—	—	@@ -643,7 +647,7 @@
644	648	*
645	649	* @param string $domain_name (Required) The name of the domain for which to display the metadata of.
646	650	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
647		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	651	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
648	652	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
649	653	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
650	654	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/ec2.class.php
—	—	@@ -27,7 +27,7 @@
28	28	*
29	29	* Visit <a href="http://aws.amazon.com/ec2/">http://aws.amazon.com/ec2/</a> for more information.
30	30	*
31		~~- * @version Tue Apr 05 15:18:08 PDT 2011~~
	31	+ * @version Tue May 10 18:26:09 PDT 2011
32	32	* @license See the included NOTICE.md file for complete information.
33	33	* @copyright See the included NOTICE.md file for complete information.
34	34	* @link http://aws.amazon.com/ec2/Amazon Elastic Compute Cloud
—	—	@@ -133,12 +133,16 @@
134	134
135	135	if (!$key && !defined('AWS_KEY'))
136	136	{
	137	+ // @codeCoverageIgnoreStart
137	138	throw new EC2_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	139	+ // @codeCoverageIgnoreEnd
138	140	}
139	141
140	142	if (!$secret_key && !defined('AWS_SECRET_KEY'))
141	143	{
	144	+ // @codeCoverageIgnoreStart
142	145	throw new EC2_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	146	+ // @codeCoverageIgnoreEnd
143	147	}
144	148
145	149	return parent::__construct($key, $secret_key);
—	—	@@ -156,7 +160,7 @@
157	161	*
158	162	* @param string\|array $instance_id (Required) The list of instances to terminate. Pass a string for a single value, or an indexed array for multiple values.
159	163	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
160		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	164	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
161	165	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
162	166	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
163	167	*/
—	—	@@ -184,7 +188,7 @@
185	189	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
186	190	* </ul></li>
187	191	* </ul></li>
188		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	192	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
189	193	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
190	194	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
191	195	*/
—	—	@@ -228,7 +232,7 @@
229	233	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
230	234	* </ul></li>
231	235	* </ul></li>
232		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	236	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
233	237	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
234	238	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
235	239	*/
—	—	@@ -266,7 +270,7 @@
267	271	* <li><code>InstanceId</code> - <code>string</code> - Optional - The ID of the instance from which to detach the the specified volume. </li>
268	272	* <li><code>Device</code> - <code>string</code> - Optional - The device name to which the volume is attached on the specified instance. </li>
269	273	* <li><code>Force</code> - <code>boolean</code> - Optional - Forces detachment if the previous detachment attempt did not occur cleanly (logging into an instance, unmounting the volume, and detaching normally). This option can lead to data loss or a corrupted file system. Use this option only as a last resort to detach a volume from a failed instance. The instance will not have an opportunity to flush file system caches nor file system meta data. If you use this option, you must perform file system check and repair procedures. </li>
270		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	274	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
271	275	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
272	276	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
273	277	*/
—	—	@@ -284,7 +288,7 @@
285	289	*
286	290	* @param string $key_name (Required) The name of the Amazon EC2 key pair to delete.
287	291	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
288		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	292	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
289	293	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
290	294	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
291	295	*/
—	—	@@ -302,7 +306,7 @@
303	307	*
304	308	* @param string\|array $instance_id (Required) The list of Amazon EC2 instances on which to disable monitoring. Pass a string for a single value, or an indexed array for multiple values.
305	309	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
306		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	310	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
307	311	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
308	312	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
309	313	*/
—	—	@@ -326,7 +330,7 @@
327	331	* @param string $vpn_gateway_id (Required) The ID of the VPN gateway to attach to the VPC.
328	332	* @param string $vpc_id (Required) The ID of the VPC to attach to the VPN gateway.
329	333	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
330		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	334	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
331	335	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
332	336	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
333	337	*/
—	—	@@ -349,7 +353,7 @@
350	354	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
351	355	* <li><code>Description</code> - <code>string</code> - Optional - The description for the new AMI being created. </li>
352	356	* <li><code>NoReboot</code> - <code>boolean</code> - Optional - By default this property is set to <code>false</code>, which means Amazon EC2 attempts to cleanly shut down the instance before image creation and reboots the instance afterwards. When set to true, Amazon EC2 will not shut down the instance before creating the image. When this option is used, file system integrity on the created image cannot be guaranteed. </li>
353		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	357	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
354	358	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
355	359	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
356	360	*/
—	—	@@ -374,7 +378,7 @@
375	379	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
376	380	* <li><code>GroupName</code> - <code>string</code> - Optional - The name of the Amazon EC2 security group to delete. </li>
377	381	* <li><code>GroupId</code> - <code>string</code> - Optional - The ID of the Amazon EC2 security group to delete. </li>
378		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	382	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
379	383	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
380	384	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
381	385	*/
—	—	@@ -418,7 +422,7 @@
419	423	* <li><code>IpRanges</code> - <code>string\|array</code> - Optional - The list of CIDR IP ranges included in this permission. Pass a string for a single value, or an indexed array for multiple values. </li>
420	424	* </ul></li>
421	425	* </ul></li>
422		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	426	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
423	427	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
424	428	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
425	429	*/
—	—	@@ -449,7 +453,7 @@
450	454	* @param string $instance_id (Required) The ID of the instance for which you want the Windows administrator password.
451	455	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
452	456	* <li><code>DecryptPasswordWithKey</code> - <code>string</code> - Optional - Enables the decryption of the Administrator password for the given Microsoft Windows instance. Specifies the RSA private key that is associated with the keypair ID which was used to launch the Microsoft Windows instance.</li>
453		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	457	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
454	458	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
455	459	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
456	460	*/
—	—	@@ -501,7 +505,7 @@
502	506	* @param string $dhcp_options_id (Required) The ID of the DHCP options to associate with the VPC. Specify "default" to associate the default DHCP options with the VPC.
503	507	* @param string $vpc_id (Required) The ID of the VPC to associate the DHCP options with.
504	508	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
505		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	509	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
506	510	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
507	511	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
508	512	*/
—	—	@@ -529,7 +533,7 @@
530	534	* @param string\|array $instance_id (Required) The list of Amazon EC2 instances to stop. Pass a string for a single value, or an indexed array for multiple values.
531	535	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
532	536	* <li><code>Force</code> - <code>boolean</code> - Optional - Forces the instance to stop. The instance will not have an opportunity to flush file system caches nor file system meta data. If you use this option, you must perform file system check and repair procedures. This option is not recommended for Windows instances. </li>
533		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	537	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
534	538	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
535	539	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
536	540	*/
—	—	@@ -564,7 +568,7 @@
565	569	* @param string $key_name (Required) The unique name for the key pair.
566	570	* @param string $public_key_material (Required) The public key portion of the key pair being imported.
567	571	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
568		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	572	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
569	573	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
570	574	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
571	575	*/
—	—	@@ -590,7 +594,7 @@
591	595	* @param string $group_description (Required) Description of the group. This is informational only.
592	596	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
593	597	* <li><code>VpcId</code> - <code>string</code> - Optional - ID of the VPC. </li>
594		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	598	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
595	599	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
596	600	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
597	601	*/
—	—	@@ -624,7 +628,7 @@
625	629	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
626	630	* </ul></li>
627	631	* </ul></li>
628		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	632	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
629	633	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
630	634	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
631	635	*/
—	—	@@ -686,7 +690,7 @@
687	691	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
688	692	* </ul></li>
689	693	* </ul></li>
690		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	694	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
691	695	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
692	696	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
693	697	*/
—	—	@@ -728,7 +732,7 @@
729	733	* </ul></li>
730	734	* </ul>
731	735	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
732		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	736	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
733	737	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
734	738	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
735	739	*/
—	—	@@ -751,7 +755,7 @@
752	756	* @param string $snapshot_id (Required) The ID of the snapshot whose attribute is being reset.
753	757	* @param string $attribute (Required) The name of the attribute being reset. Available attribute names: <code>createVolumePermission</code>
754	758	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
755		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	759	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
756	760	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
757	761	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
758	762	*/
—	—	@@ -773,7 +777,7 @@
774	778	* @param string $route_table_id (Required) The ID of the route table where the route will be deleted.
775	779	* @param string $destination_cidr_block (Required) The CIDR range for the route you want to delete. The value you specify must exactly match the CIDR for the route you want to delete.
776	780	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
777		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	781	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
778	782	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
779	783	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
780	784	*/
—	—	@@ -808,7 +812,7 @@
809	813	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
810	814	* </ul></li>
811	815	* </ul></li>
812		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	816	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
813	817	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
814	818	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
815	819	*/
—	—	@@ -853,7 +857,7 @@
854	858	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
855	859	* </ul></li>
856	860	* </ul></li>
857		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	861	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
858	862	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
859	863	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
860	864	*/
—	—	@@ -901,7 +905,7 @@
902	906	* @param string $vpn_gateway_id (Required) The ID of the VPN gateway to detach from the VPC.
903	907	* @param string $vpc_id (Required) The ID of the VPC to detach the VPN gateway from.
904	908	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
905		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	909	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
906	910	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
907	911	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
908	912	*/
—	—	@@ -920,7 +924,7 @@
921	925	*
922	926	* @param string $image_id (Required) The ID of the AMI to deregister.
923	927	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
924		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	928	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
925	929	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
926	930	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
927	931	*/
—	—	@@ -940,7 +944,7 @@
941	945	* User Guide.
942	946	*
943	947	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
944		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	948	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
945	949	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
946	950	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
947	951	*/
—	—	@@ -963,7 +967,7 @@
964	968	* <li><code>Value</code> - <code>string</code> - Optional - The tag's value. </li>
965	969	* </ul></li>
966	970	* </ul></li>
967		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	971	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
968	972	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
969	973	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
970	974	*/
—	—	@@ -995,7 +999,7 @@
996	1000	*
997	1001	* @param string $subnet_id (Required) The ID of the subnet you want to delete.
998	1002	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
999		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1003	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1000	1004	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1001	1005	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1002	1006	*/
—	—	@@ -1015,7 +1019,7 @@
1016	1020	* @param string $type (Required) The type of VPN connection this VPN gateway supports.
1017	1021	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1018	1022	* <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The Availability Zone in which to create the VPN gateway. </li>
1019		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1023	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1020	1024	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1021	1025	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1022	1026	*/
—	—	@@ -1035,7 +1039,7 @@
1036	1040	*
1037	1041	* @param string $vpn_gateway_id (Required) The ID of the VPN gateway to delete.
1038	1042	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1039		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1043	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1040	1044	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1041	1045	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1042	1046	*/
—	—	@@ -1055,7 +1059,7 @@
1056	1060	* @param string $instance_id (Required) The ID of the instance to which the volume attaches. The volume and instance must be within the same Availability Zone and the instance must be running.
1057	1061	* @param string $device (Required) Specifies how the device is exposed to the instance (e.g., <code>/dev/sdh</code>).
1058	1062	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1059		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1063	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1060	1064	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1061	1065	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1062	1066	*/
—	—	@@ -1082,7 +1086,7 @@
1083	1087	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1084	1088	* </ul></li>
1085	1089	* </ul></li>
1086		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1090	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1087	1091	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1088	1092	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1089	1093	*/
—	—	@@ -1118,7 +1122,7 @@
1119	1123	* @param string $license_id (Required) Specifies the ID for the specific license to activate against.
1120	1124	* @param integer $capacity (Required) Specifies the additional number of licenses to activate.
1121	1125	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1122		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1126	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1123	1127	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1124	1128	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1125	1129	*/
—	—	@@ -1140,7 +1144,7 @@
1141	1145	* @param string $image_id (Required) The ID of the AMI whose attribute is being reset.
1142	1146	* @param string $attribute (Required) The name of the attribute being reset. Available attribute names: <code>launchPermission</code>
1143	1147	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1144		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1148	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1145	1149	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1146	1150	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1147	1151	*/
—	—	@@ -1174,7 +1178,7 @@
1175	1179	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1176	1180	* </ul></li>
1177	1181	* </ul></li>
1178		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1182	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1179	1183	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1180	1184	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1181	1185	*/
—	—	@@ -1214,7 +1218,7 @@
1215	1219	* @param string $volume_id (Required) The ID of the volume from which to create the snapshot.
1216	1220	* @param string $description (Required) The description for the new snapshot.
1217	1221	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1218		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1222	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1219	1223	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1220	1224	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1221	1225	*/
—	—	@@ -1233,7 +1237,7 @@
1234	1238	*
1235	1239	* @param string $volume_id (Required) The ID of the EBS volume to delete.
1236	1240	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1237		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1241	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1238	1242	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1239	1243	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1240	1244	*/
—	—	@@ -1263,7 +1267,7 @@
1264	1268	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1265	1269	* </ul></li>
1266	1270	* </ul></li>
1267		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1271	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1268	1272	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1269	1273	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1270	1274	*/
—	—	@@ -1300,7 +1304,7 @@
1301	1305	* @param string $license_id (Required) Specifies the ID for the specific license to deactivate against.
1302	1306	* @param integer $capacity (Required) Specifies the amount of capacity to deactivate against the license.
1303	1307	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1304		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1308	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1305	1309	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1306	1310	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1307	1311	*/
—	—	@@ -1324,7 +1328,7 @@
1325	1329	* @param string $public_ip (Required) IP address that you are assigning to the instance.
1326	1330	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1327	1331	* <li><code>AllocationId</code> - <code>string</code> - Optional - The allocation ID that AWS returned when you allocated the elastic IP address for use with Amazon VPC. </li>
1328		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1332	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1329	1333	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1330	1334	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1331	1335	*/
—	—	@@ -1346,7 +1350,7 @@
1347	1351	*
1348	1352	* @param string $customer_gateway_id (Required) The ID of the customer gateway to delete.
1349	1353	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1350		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1354	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1351	1355	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1352	1356	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1353	1357	*/
—	—	@@ -1384,7 +1388,7 @@
1385	1389	* <li><code>PortRange</code> - <code>array</code> - Optional - Port ranges. <ul>
1386	1390	* <li><code>From</code> - <code>integer</code> - Optional - The first port in the range. Required if specifying <code>tcp</code> or <code>udp</code> for the protocol. </li>
1387	1391	* <li><code>To</code> - <code>integer</code> - Optional - The last port in the range. Required if specifying <code>tcp</code> or <code>udp</code> for the protocol. </li></ul></li>
1388		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1392	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1389	1393	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1390	1394	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1391	1395	*/
—	—	@@ -1430,7 +1434,7 @@
1431	1435	* @param string $internet_gateway_id (Required) The ID of the Internet gateway to detach.
1432	1436	* @param string $vpc_id (Required) The ID of the VPC.
1433	1437	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1434		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1438	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1435	1439	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1436	1440	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1437	1441	*/
—	—	@@ -1452,7 +1456,7 @@
1453	1457	*
1454	1458	* @param string $vpc_id (Required) The ID of the VPC where the route table will be created.
1455	1459	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1456		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1460	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1457	1461	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1458	1462	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1459	1463	*/
—	—	@@ -1477,7 +1481,7 @@
1478	1482	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1479	1483	* </ul></li>
1480	1484	* </ul></li>
1481		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1485	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1482	1486	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1483	1487	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1484	1488	*/
—	—	@@ -1528,7 +1532,7 @@
1529	1533	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1530	1534	* </ul></li>
1531	1535	* </ul></li>
1532		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1536	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1533	1537	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1534	1538	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1535	1539	*/
—	—	@@ -1563,7 +1567,7 @@
1564	1568	*
1565	1569	* @param string\|array $instance_id (Required) The list of Amazon EC2 instances on which to enable monitoring. Pass a string for a single value, or an indexed array for multiple values.
1566	1570	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1567		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1571	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1568	1572	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1569	1573	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1570	1574	*/
—	—	@@ -1598,7 +1602,7 @@
1599	1603	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1600	1604	* </ul></li>
1601	1605	* </ul></li>
1602		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1606	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1603	1607	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1604	1608	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1605	1609	*/
—	—	@@ -1649,7 +1653,7 @@
1650	1654	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1651	1655	* </ul></li>
1652	1656	* </ul></li>
1653		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1657	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1654	1658	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1655	1659	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1656	1660	*/
—	—	@@ -1691,7 +1695,7 @@
1692	1696	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
1693	1697	* </ul></li>
1694	1698	* </ul></li>
1695		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1699	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1696	1700	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1697	1701	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1698	1702	*/
—	—	@@ -1749,7 +1753,7 @@
1750	1754	* <li><code>IpRanges</code> - <code>string\|array</code> - Optional - The list of CIDR IP ranges included in this permission. Pass a string for a single value, or an indexed array for multiple values. </li>
1751	1755	* </ul></li>
1752	1756	* </ul></li>
1753		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1757	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1754	1758	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1755	1759	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1756	1760	*/
—	—	@@ -1778,7 +1782,7 @@
1779	1783	*
1780	1784	* @param string $instance_id (Required) The ID of the instance for which you want console output.
1781	1785	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1782		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1786	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1783	1787	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
1784	1788	* @return CFResponse A <CFResponse> object containing a parsed HTTP response. The value of <code>output</code> is automatically Base64-decoded.
1785	1789	*/
—	—	@@ -1804,7 +1808,7 @@
1805	1809	* <code>AttachInternetGateway</code>. For more information about your VPC and Internet gateway, go to Amazon Virtual Private Cloud User Guide.
1806	1810	*
1807	1811	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1808		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1812	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1809	1813	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1810	1814	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1811	1815	*/
—	—	@@ -1827,7 +1831,7 @@
1828	1832	* <li><code>UserGroup</code> - <code>string\|array</code> - Optional - The user group being added to or removed from the list of user groups with launch permissions for this AMI. Only valid when the launchPermission attribute is being modified. Available user groups: <code>all</code> Pass a string for a single value, or an indexed array for multiple values. </li>
1829	1833	* <li><code>ProductCode</code> - <code>string\|array</code> - Optional - The list of product codes being added to or removed from the specified AMI. Only valid when the productCodes attribute is being modified. Pass a string for a single value, or an indexed array for multiple values. </li>
1830	1834	* <li><code>Value</code> - <code>string</code> - Optional - The value of the attribute being modified. Only valid when the description attribute is being modified. </li>
1831		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1835	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1832	1836	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1833	1837	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1834	1838	*/
—	—	@@ -1885,7 +1889,7 @@
1886	1890	* @param string $ip_address (Required) The Internet-routable IP address for the customer gateway's outside interface. The address must be static
1887	1891	* @param integer $bgp_asn (Required) The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).
1888	1892	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1889		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1893	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1890	1894	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1891	1895	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1892	1896	*/
—	—	@@ -1909,7 +1913,7 @@
1910	1914	* @param string $bucket (Required) The Amazon S3 bucket in which to store the Spot Instance datafeed.
1911	1915	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1912	1916	* <li><code>Prefix</code> - <code>string</code> - Optional - The prefix that is prepended to datafeed files. </li>
1913		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1917	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1914	1918	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1915	1919	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1916	1920	*/
—	—	@@ -1929,7 +1933,7 @@
1930	1934	* @param string $internet_gateway_id (Required) The ID of the Internet gateway to attach.
1931	1935	* @param string $vpc_id (Required) The ID of the VPC.
1932	1936	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1933		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1937	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1934	1938	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1935	1939	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1936	1940	*/
—	—	@@ -1954,7 +1958,7 @@
1955	1959	*
1956	1960	* @param string $vpn_connection_id (Required) The ID of the VPN connection to delete
1957	1961	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1958		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1962	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1959	1963	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1960	1964	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1961	1965	*/
—	—	@@ -1985,7 +1989,7 @@
1986	1990	* @param string $customer_gateway_id (Required) The ID of the customer gateway.
1987	1991	* @param string $vpn_gateway_id (Required) The ID of the VPN gateway.
1988	1992	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1989		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1993	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1990	1994	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1991	1995	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1992	1996	*/
—	—	@@ -2006,7 +2010,7 @@
2007	2011	* @param string $instance_id (Required) The ID of the instance whose instance attribute is being described.
2008	2012	* @param string $attribute (Required) The name of the attribute to describe. Available attribute names: <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>, <code>userData</code>, <code>disableApiTermination</code>, <code>instanceInitiatedShutdownBehavior</code>, <code>rootDeviceName</code>, <code>blockDeviceMapping</code>
2009	2013	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2010		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2014	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2011	2015	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2012	2016	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2013	2017	*/
—	—	@@ -2038,7 +2042,7 @@
2039	2043	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2040	2044	* </ul></li>
2041	2045	* </ul></li>
2042		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2046	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2043	2047	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2044	2048	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2045	2049	*/
—	—	@@ -2137,7 +2141,7 @@
2138	2142	* <li><code>PrivateIpAddress</code> - <code>string</code> - Optional - If you're using Amazon Virtual Private Cloud, you can optionally use this parameter to assign the instance a specific available IP address from the subnet. </li>
2139	2143	* <li><code>ClientToken</code> - <code>string</code> - Optional - Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, go to How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide. </li>
2140	2144	* <li><code>AdditionalInfo</code> - <code>string</code> - Optional - </li>
2141		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2145	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2142	2146	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2143	2147	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2144	2148	*/
—	—	@@ -2208,7 +2212,7 @@
2209	2213	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2210	2214	* </ul></li>
2211	2215	* </ul></li>
2212		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2216	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2213	2217	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2214	2218	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2215	2219	*/
—	—	@@ -2250,7 +2254,7 @@
2251	2255	* @param string $subnet_id (Required) The ID of the subnet.
2252	2256	* @param string $route_table_id (Required) The ID of the route table.
2253	2257	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2254		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2258	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2255	2259	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2256	2260	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2257	2261	*/
—	—	@@ -2281,7 +2285,7 @@
2282	2286	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2283	2287	* </ul></li>
2284	2288	* </ul></li>
2285		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2289	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2286	2290	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2287	2291	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2288	2292	*/
—	—	@@ -2317,7 +2321,7 @@
2318	2322	*
2319	2323	* @param string $network_acl_id (Required) The ID of the network ACL to be deleted.
2320	2324	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2321		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2325	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2322	2326	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2323	2327	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2324	2328	*/
—	—	@@ -2371,7 +2375,7 @@
2372	2376	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2373	2377	* </ul></li>
2374	2378	* </ul></li>
2375		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2379	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2376	2380	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2377	2381	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2378	2382	*/
—	—	@@ -2429,7 +2433,7 @@
2430	2434	*
2431	2435	* @param string\|array $instance_id (Required) The list of Amazon EC2 instances to start. Pass a string for a single value, or an indexed array for multiple values.
2432	2436	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2433		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2437	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2434	2438	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2435	2439	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2436	2440	*/
—	—	@@ -2466,7 +2470,7 @@
2467	2471	* </ul></li>
2468	2472	* <li><code>SourceDestCheck</code> - <code>boolean</code> - Optional - Boolean value </li>
2469	2473	* <li><code>GroupId</code> - <code>string\|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values. </li>
2470		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2474	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2471	2475	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2472	2476	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2473	2477	*/
—	—	@@ -2504,7 +2508,7 @@
2505	2509	*
2506	2510	* @param string $dhcp_options_id (Required) The ID of the DHCP options set to delete.
2507	2511	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2508		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2512	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2509	2513	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2510	2514	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2511	2515	*/
—	—	@@ -2545,7 +2549,7 @@
2546	2550	* <li><code>IpRanges</code> - <code>string\|array</code> - Optional - The list of CIDR IP ranges included in this permission. Pass a string for a single value, or an indexed array for multiple values. </li>
2547	2551	* </ul></li>
2548	2552	* </ul></li>
2549		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2553	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2550	2554	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2551	2555	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2552	2556	*/
—	—	@@ -2594,7 +2598,7 @@
2595	2599	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2596	2600	* </ul></li>
2597	2601	* </ul></li>
2598		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2602	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2599	2603	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2600	2604	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2601	2605	*/
—	—	@@ -2635,7 +2639,7 @@
2636	2640	* @param string $cidr_block (Required) A valid CIDR block.
2637	2641	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2638	2642	* <li><code>InstanceTenancy</code> - <code>string</code> - Optional - The allowed tenancy of instances launched into the VPC. A value of default means instances can be launched with any tenancy; a value of dedicated means instances must be launched with tenancy as dedicated. </li>
2639		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2643	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2640	2644	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2641	2645	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2642	2646	*/
—	—	@@ -2664,7 +2668,7 @@
2665	2669	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2666	2670	* </ul></li>
2667	2671	* </ul></li>
2668		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2672	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2669	2673	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2670	2674	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2671	2675	*/
—	—	@@ -2719,7 +2723,7 @@
2720	2724	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2721	2725	* <li><code>GatewayId</code> - <code>string</code> - Optional - The ID of a VPN or Internet gateway attached to your VPC. You must provide either <code>GatewayId</code> or <code>InstanceId</code>, but not both. </li>
2722	2726	* <li><code>InstanceId</code> - <code>string</code> - Optional - The ID of a NAT instance in your VPC. You must provide either <code>GatewayId</code> or <code>InstanceId</code>, but not both. </li>
2723		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2727	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2724	2728	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2725	2729	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2726	2730	*/
—	—	@@ -2740,7 +2744,7 @@
2741	2745	*
2742	2746	* @param string $route_table_id (Required) The ID of the route table to be deleted.
2743	2747	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2744		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2748	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2745	2749	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2746	2750	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2747	2751	*/
—	—	@@ -2802,7 +2806,7 @@
2803	2807	* </ul></li>
2804	2808	* <li><code>Monitoring.Enabled</code> - <code>boolean</code> - Optional - Enables monitoring for the instance. </li>
2805	2809	* <li><code>SubnetId</code> - <code>string</code> - Optional - Specifies the Amazon VPC subnet ID within which to launch the instance(s) for Amazon Virtual Private Cloud. </li></ul></li>
2806		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2810	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2807	2811	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2808	2812	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2809	2813	*/
—	—	@@ -2848,7 +2852,7 @@
2849	2853	* </ul></li>
2850	2854	* </ul>
2851	2855	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2852		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2856	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2853	2857	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2854	2858	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2855	2859	*/
—	—	@@ -2880,7 +2884,7 @@
2881	2885	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2882	2886	* <li><code>GatewayId</code> - <code>string</code> - Optional - The ID of a VPN or Internet gateway attached to your VPC. </li>
2883	2887	* <li><code>InstanceId</code> - <code>string</code> - Optional - The ID of a NAT instance in your VPC. </li>
2884		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2888	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2885	2889	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2886	2890	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2887	2891	*/
—	—	@@ -2904,7 +2908,7 @@
2905	2909	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
2906	2910	* </ul></li>
2907	2911	* </ul></li>
2908		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2912	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2909	2913	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2910	2914	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2911	2915	*/
—	—	@@ -2932,7 +2936,7 @@
2933	2937	*
2934	2938	* @param string $bundle_id (Required) The ID of the bundle task to cancel.
2935	2939	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2936		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2940	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2937	2941	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2938	2942	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2939	2943	*/
—	—	@@ -2956,7 +2960,7 @@
2957	2961	*
2958	2962	* @param string\|array $spot_instance_request_id (Required) Specifies the ID of the Spot Instance request. Pass a string for a single value, or an indexed array for multiple values.
2959	2963	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2960		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2964	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2961	2965	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2962	2966	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2963	2967	*/
—	—	@@ -2981,7 +2985,7 @@
2982	2986	* @param string $reserved_instances_offering_id (Required) The unique ID of the Reserved Instances offering being purchased.
2983	2987	* @param integer $instance_count (Required) The number of Reserved Instances to purchase.
2984	2988	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
2985		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	2989	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
2986	2990	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
2987	2991	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
2988	2992	*/
—	—	@@ -3004,7 +3008,7 @@
3005	3009	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3006	3010	* <li><code>UserId</code> - <code>string\|array</code> - Optional - The AWS user IDs to add to or remove from the list of users that have permission to create EBS volumes from the specified snapshot. Currently supports "all". Only valid when the <code>createVolumePermission</code> attribute is being modified. Pass a string for a single value, or an indexed array for multiple values. </li>
3007	3011	* <li><code>UserGroup</code> - <code>string\|array</code> - Optional - The AWS group names to add to or remove from the list of groups that have permission to create EBS volumes from the specified snapshot. Currently supports "all". Only valid when the <code>createVolumePermission</code> attribute is being modified. Pass a string for a single value, or an indexed array for multiple values. </li>
3008		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3012	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3009	3013	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3010	3014	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3011	3015	*/
—	—	@@ -3045,7 +3049,7 @@
3046	3050	*
3047	3051	* @param string\|array $instance_id (Required) The list of instances to terminate. Pass a string for a single value, or an indexed array for multiple values.
3048	3052	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3049		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3053	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3050	3054	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3051	3055	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3052	3056	*/
—	—	@@ -3069,7 +3073,7 @@
3070	3074	* User Guide.
3071	3075	*
3072	3076	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3073		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3077	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3074	3078	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3075	3079	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3076	3080	*/
—	—	@@ -3087,7 +3091,7 @@
3088	3092	*
3089	3093	* @param string $internet_gateway_id (Required) The ID of the Internet gateway to be deleted.
3090	3094	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3091		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3095	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3092	3096	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3093	3097	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3094	3098	*/
—	—	@@ -3112,7 +3116,7 @@
3113	3117	* @param string $association_id (Required) The ID representing the current association between the original route table and the subnet.
3114	3118	* @param string $route_table_id (Required) The ID of the new route table to associate with the subnet.
3115	3119	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3116		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3120	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3117	3121	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3118	3122	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3119	3123	*/
—	—	@@ -3132,7 +3136,7 @@
3133	3137	* @param string $snapshot_id (Required) The ID of the EBS snapshot whose attribute is being described.
3134	3138	* @param string $attribute (Required) The name of the EBS attribute to describe. Available attribute names: createVolumePermission
3135	3139	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3136		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3140	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3137	3141	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3138	3142	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3139	3143	*/
—	—	@@ -3158,7 +3162,7 @@
3159	3163	* </ul></li>
3160	3164	* </ul></li>
3161	3165	* <li><code>AllocationId</code> - <code>string\|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values. </li>
3162		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3166	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3163	3167	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3164	3168	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3165	3169	*/
—	—	@@ -3209,7 +3213,7 @@
3210	3214	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
3211	3215	* </ul></li>
3212	3216	* </ul></li>
3213		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3217	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3214	3218	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3215	3219	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3216	3220	*/
—	—	@@ -3245,7 +3249,7 @@
3246	3250	* @param string $image_id (Required) The ID of the AMI whose attribute is to be described.
3247	3251	* @param string $attribute (Required) The name of the attribute to describe. Available attribute names: <code>productCodes</code>, <code>kernel</code>, <code>ramdisk</code>, <code>launchPermisson</code>, <code>blockDeviceMapping</code>
3248	3252	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3249		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3253	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3250	3254	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3251	3255	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3252	3256	*/
—	—	@@ -3269,7 +3273,7 @@
3270	3274	*
3271	3275	* @param string $association_id (Required) The association ID representing the current association between the route table and subnet.
3272	3276	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3273		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3277	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3274	3278	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3275	3279	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3276	3280	*/
—	—	@@ -3292,7 +3296,7 @@
3293	3297	* @param string $product_code (Required) The product code to confirm.
3294	3298	* @param string $instance_id (Required) The ID of the instance to confirm.
3295	3299	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3296		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3300	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3297	3301	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3298	3302	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3299	3303	*/
—	—	@@ -3314,7 +3318,7 @@
3315	3319	* @param integer $rule_number (Required) Rule number for the entry to delete.
3316	3320	* @param boolean $egress (Required) Whether the rule to delete is an egress rule (<code>true</code>) or ingress rule (<code>false</code>).
3317	3321	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3318		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3322	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3319	3323	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3320	3324	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3321	3325	*/
—	—	@@ -3358,7 +3362,7 @@
3359	3363	* <li><code>IpRanges</code> - <code>string\|array</code> - Optional - The list of CIDR IP ranges included in this permission. Pass a string for a single value, or an indexed array for multiple values. </li>
3360	3364	* </ul></li>
3361	3365	* </ul></li>
3362		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3366	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3363	3367	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3364	3368	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3365	3369	*/
—	—	@@ -3387,7 +3391,7 @@
3388	3392	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3389	3393	* <li><code>Size</code> - <code>integer</code> - Optional - The size of the volume, in gigabytes. Required if you are not creating a volume from a snapshot. </li>
3390	3394	* <li><code>SnapshotId</code> - <code>string</code> - Optional - The ID of the snapshot from which to create the new volume. </li>
3391		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3395	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3392	3396	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3393	3397	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3394	3398	*/
—	—	@@ -3419,7 +3423,7 @@
3420	3424	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
3421	3425	* </ul></li>
3422	3426	* </ul></li>
3423		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3427	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3424	3428	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3425	3429	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3426	3430	*/
—	—	@@ -3463,7 +3467,7 @@
3464	3468	* @param string $cidr_block (Required) The CIDR block the subnet is to cover.
3465	3469	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3466	3470	* <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The Availability Zone to create the subnet in. </li>
3467		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3471	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3468	3472	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3469	3473	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3470	3474	*/
—	—	@@ -3494,7 +3498,7 @@
3495	3499	* </ul></li>
3496	3500	* </ul></li>
3497	3501	* <li><code>InstanceTenancy</code> - <code>string</code> - Optional - The tenancy of the Reserved Instance offering. A Reserved Instance with tenancy of dedicated will run on single-tenant hardware and can only be launched within a VPC. </li>
3498		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3502	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3499	3503	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3500	3504	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3501	3505	*/
—	—	@@ -3529,7 +3533,7 @@
3530	3534	*
3531	3535	* @param string $snapshot_id (Required) The ID of the snapshot to delete.
3532	3536	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3533		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3537	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3534	3538	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3535	3539	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3536	3540	*/
—	—	@@ -3549,7 +3553,7 @@
3550	3554	* @param string $association_id (Required) The ID representing the current association between the original network ACL and the subnet.
3551	3555	* @param string $network_acl_id (Required) The ID of the new ACL to associate with the subnet.
3552	3556	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3553		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3557	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3554	3558	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3555	3559	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3556	3560	*/
—	—	@@ -3570,7 +3574,7 @@
3571	3575	* @param string $public_ip (Required) The elastic IP address that you are disassociating from the instance.
3572	3576	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3573	3577	* <li><code>AssocationId</code> - <code>string</code> - Optional - Association ID corresponding to the VPC elastic IP address you want to disassociate. </li>
3574		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3578	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3575	3579	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3576	3580	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3577	3581	*/
—	—	@@ -3590,7 +3594,7 @@
3591	3595	* @param string $group_name (Required) The name of the <code>PlacementGroup</code>.
3592	3596	* @param string $strategy (Required) The <code>PlacementGroup</code> strategy. [Allowed values: <code>cluster</code>]
3593	3597	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3594		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3598	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3595	3599	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3596	3600	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3597	3601	*/
—	—	@@ -3616,7 +3620,7 @@
3617	3621	* <li><code>UploadPolicy</code> - <code>string</code> - Optional - A Base64-encoded Amazon S3 upload policy that gives Amazon EC2 permission to upload items into Amazon S3 on the user's behalf. Use the <CFPolicy::get_policy()> method of a <CFPolicy> instance.</li>
3618	3622	* <li><code>UploadPolicySignature</code> - <code>string</code> - Optional - The signature of the Base64 encoded JSON document. Use the <CFPolicy::get_policy_signature()> method of a <CFPolicy> instance.</li></ul>
3619	3623	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3620		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3624	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3621	3625	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This is useful for manually-managed batch requests.</li></ul>
3622	3626	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3623	3627	*/
—	—	@@ -3638,7 +3642,7 @@
3639	3643	*
3640	3644	* @param string $group_name (Required) The name of the <code>PlacementGroup</code> to delete.
3641	3645	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3642		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3646	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3643	3647	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3644	3648	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3645	3649	*/
—	—	@@ -3657,7 +3661,7 @@
3658	3662	*
3659	3663	* @param string $vpc_id (Required) The ID of the VPC you want to delete.
3660	3664	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3661		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3665	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3662	3666	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3663	3667	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3664	3668	*/
—	—	@@ -3675,7 +3679,7 @@
3676	3680	*
3677	3681	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3678	3682	* <li><code>Domain</code> - <code>string</code> - Optional - Set to <code>vpc</code> to allocate the address to your VPC. By default, will allocate to EC2. [Allowed values: <code>vpc</code>, <code>standard</code>]</li>
3679		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3683	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3680	3684	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3681	3685	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3682	3686	*/
—	—	@@ -3702,7 +3706,7 @@
3703	3707	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3704	3708	* <li><code>PublicIp</code> - <code>string</code> - Optional - The elastic IP address that you are releasing from your account. </li>
3705	3709	* <li><code>AllocationId</code> - <code>string</code> - Optional - The allocation ID that AWS provided when you allocated the address for use with Amazon VPC. </li>
3706		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3710	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3707	3711	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3708	3712	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3709	3713	*/
—	—	@@ -3720,7 +3724,7 @@
3721	3725	* @param string $instance_id (Required) The ID of the Amazon EC2 instance whose attribute is being reset.
3722	3726	* @param string $attribute (Required) The name of the attribute being reset. Available attribute names: <code>kernel</code>, <code>ramdisk</code>
3723	3727	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3724		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3728	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3725	3729	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3726	3730	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3727	3731	*/
—	—	@@ -3740,7 +3744,7 @@
3741	3745	*
3742	3746	* @param string $key_name (Required) The unique name for the new key pair.
3743	3747	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3744		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3748	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3745	3749	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3746	3750	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3747	3751	*/
—	—	@@ -3770,7 +3774,7 @@
3771	3775	* <li><code>PortRange</code> - <code>array</code> - Optional - Port ranges. <ul>
3772	3776	* <li><code>From</code> - <code>integer</code> - Optional - The first port in the range. Required if specifying <code>tcp</code> or <code>udp</code> for the protocol. </li>
3773	3777	* <li><code>To</code> - <code>integer</code> - Optional - The last port in the range. Required if specifying <code>tcp</code> or <code>udp</code> for the protocol. </li></ul></li>
3774		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3778	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3775	3779	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3776	3780	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3777	3781	*/
—	—	@@ -3821,7 +3825,7 @@
3822	3826	* <li><code>Value</code> - <code>string\|array</code> - Optional - Contains one or more values for the filter. Pass a string for a single value, or an indexed array for multiple values. </li>
3823	3827	* </ul></li>
3824	3828	* </ul></li>
3825		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3829	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3826	3830	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3827	3831	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3828	3832	*/
—	—	@@ -3875,7 +3879,7 @@
3876	3880	*
3877	3881	* @param string $vpc_id (Required) The ID of the VPC where the network ACL will be created.
3878	3882	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
3879		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3883	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3880	3884	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3881	3885	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3882	3886	*/
—	—	@@ -3920,7 +3924,7 @@
3921	3925	* <li><code>NoDevice</code> - <code>string</code> - Optional - Specifies the device name to suppress during instance launch. </li>
3922	3926	* </ul></li>
3923	3927	* </ul></li>
3924		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	3928	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
3925	3929	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
3926	3930	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
3927	3931	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/elasticbeanstalk.class.php
—	—	@@ -35,7 +35,7 @@
36	36	*
37	37	* </ul>
38	38	*
39		~~- * @version Tue Apr 05 15:17:23 PDT 2011~~
	39	+ * @version Tue May 10 18:25:29 PDT 2011
40	40	* @license See the included NOTICE.md file for complete information.
41	41	* @copyright See the included NOTICE.md file for complete information.
42	42	* @link http://aws.amazon.com/elasticbeanstalk/AWS Elastic Beanstalk
—	—	@@ -91,12 +91,16 @@
92	92
93	93	if (!$key && !defined('AWS_KEY'))
94	94	{
	95	+ // @codeCoverageIgnoreStart
95	96	throw new Beanstalk_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	97	+ // @codeCoverageIgnoreEnd
96	98	}
97	99
98	100	if (!$secret_key && !defined('AWS_SECRET_KEY'))
99	101	{
	102	+ // @codeCoverageIgnoreStart
100	103	throw new Beanstalk_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	104	+ // @codeCoverageIgnoreEnd
101	105	}
102	106
103	107	return parent::__construct($key, $secret_key);
—	—	@@ -112,7 +116,7 @@
113	117	*
114	118	* @param string $cname_prefix (Required) The prefix used when this CNAME is reserved.
115	119	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
116		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	120	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
117	121	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
118	122	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
119	123	*/
—	—	@@ -141,7 +145,7 @@
142	146	* <li><code>OptionName</code> - <code>string</code> - Optional - The name of the configuration option. </li>
143	147	* </ul></li>
144	148	* </ul></li>
145		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	149	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
146	150	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
147	151	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
148	152	*/
—	—	@@ -171,7 +175,7 @@
172	176	* @param string $application_name (Required) The name of the application to delete the configuration template from.
173	177	* @param string $template_name (Required) The name of the configuration template to delete.
174	178	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
175		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	179	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
176	180	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
177	181	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
178	182	*/
—	—	@@ -209,7 +213,7 @@
210	214	* <li><code>OptionName</code> - <code>string</code> - Optional - The name of the configuration option. </li>
211	215	* </ul></li>
212	216	* </ul></li>
213		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	217	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
214	218	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
215	219	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
216	220	*/
—	—	@@ -247,7 +251,7 @@
248	252	* This location is used to store user log files.
249	253	*
250	254	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
251		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	255	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
252	256	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
253	257	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
254	258	*/
—	—	@@ -277,7 +281,7 @@
278	282	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
279	283	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment of the requested data. If no such environment is found, <code>RequestEnvironmentInfo</code> returns an <code>InvalidParameterValue</code> error. </li>
280	284	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment of the requested data. If no such environment is found, <code>RequestEnvironmentInfo</code> returns an <code>InvalidParameterValue</code> error. </li>
281		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	285	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
282	286	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
283	287	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
284	288	*/
—	—	@@ -304,7 +308,7 @@
305	309	* <li><code>S3Bucket</code> - <code>string</code> - Optional - The Amazon S3 bucket where the data is located. </li>
306	310	* <li><code>S3Key</code> - <code>string</code> - Optional - The Amazon S3 key where the data is located. </li></ul></li>
307	311	* <li><code>AutoCreateApplication</code> - <code>boolean</code> - Optional - Determines how the system behaves if the specified application for this version does not already exist: <enumValues> <value name="true"> <code>true</code>: Automatically creates the specified application for this version if it does not already exist. </value> <value name="false"> <code>false</code>: Returns an <code>InvalidParameterValue</code> if the specified application for this version does not already exist. </value> </enumValues> <ul> <li> <code>true</code> : Automatically creates the specified application for this release if it does not already exist. </li><li> <code>false</code> : Throws an <code>InvalidParameterValue</code> if the specified application for this release does not already exist. </li> </ul> Default: <code>false</code> Valid Values: <code>true</code> \| <code>false</code> </li>
308		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	312	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
309	313	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
310	314	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
311	315	*/
—	—	@@ -336,7 +340,7 @@
337	341	* @param string $version_label (Required) The label of the version to delete.
338	342	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
339	343	* <li><code>DeleteSourceBundle</code> - <code>boolean</code> - Optional - Indicates whether to delete the associated source bundle from Amazon S3: <ul> <li> <code>true</code>: An attempt is made to delete the associated Amazon S3 source bundle specified at time of creation. </li><li> <code>false</code>: No action is taken on the Amazon S3 source bundle specified at time of creation. </li> </ul> Valid Values: <code>true</code> \| <code>false</code> </li>
340		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	344	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
341	345	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
342	346	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
343	347	*/
—	—	@@ -356,7 +360,7 @@
357	361	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
358	362	* <li><code>ApplicationName</code> - <code>string</code> - Optional - If specified, AWS Elastic Beanstalk restricts the returned descriptions to only include ones that are associated with the specified application. </li>
359	363	* <li><code>VersionLabels</code> - <code>string\|array</code> - Optional - If specified, restricts the returned descriptions to only include ones that have the specified version labels. Pass a string for a single value, or an indexed array for multiple values. </li>
360		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	364	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
361	365	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
362	366	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
363	367	*/
—	—	@@ -384,7 +388,7 @@
385	389	*
386	390	* @param string $application_name (Required) The name of the application to delete.
387	391	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
388		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	392	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
389	393	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
390	394	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
391	395	*/
—	—	@@ -407,7 +411,7 @@
408	412	* @param string $version_label (Required) The name of the version to update. If no application version is found with this label, <code>UpdateApplication</code> returns an <code>InvalidParameterValue</code> error.
409	413	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
410	414	* <li><code>Description</code> - <code>string</code> - Optional - A new description for this release. </li>
411		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	415	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
412	416	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
413	417	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
414	418	*/
—	—	@@ -430,7 +434,7 @@
431	435	* @param string $application_name (Required) The name of the application. Constraint: This name must be unique within your account. If the specified name already exists, the action returns an <code>InvalidParameterValue</code> error.
432	436	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
433	437	* <li><code>Description</code> - <code>string</code> - Optional - Describes the application. </li>
434		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	438	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
435	439	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
436	440	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
437	441	*/
—	—	@@ -472,7 +476,7 @@
473	477	* <li><code>OptionName</code> - <code>string</code> - Optional - The name of the configuration option. </li>
474	478	* </ul></li>
475	479	* </ul></li>
476		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	480	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
477	481	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
478	482	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
479	483	*/
—	—	@@ -519,7 +523,7 @@
520	524	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
521	525	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the data's environment. If no such environment is found, returns an <code>InvalidParameterValue</code> error. </li>
522	526	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the data's environment. If no such environment is found, returns an <code>InvalidParameterValue</code> error. </li>
523		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	527	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
524	528	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
525	529	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
526	530	*/
—	—	@@ -536,7 +540,7 @@
537	541	* Returns a list of the available solution stack names.
538	542	*
539	543	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
540		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	544	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
541	545	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
542	546	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
543	547	*/
—	—	@@ -557,7 +561,7 @@
558	562	* @param string $application_name (Required) The name of the application to update. If no such application is found, <code>UpdateApplication</code> returns an <code>InvalidParameterValue</code> error.
559	563	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
560	564	* <li><code>Description</code> - <code>string</code> - Optional - A new description for the application. Default: If not specified, AWS Elastic Beanstalk does not update the description. </li>
561		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	565	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
562	566	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
563	567	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
564	568	*/
—	—	@@ -580,7 +584,7 @@
581	585	* <li><code>EnvironmentNames</code> - <code>string\|array</code> - Optional - If specified, AWS Elastic Beanstalk restricts the returned descriptions to include only those that have the specified names. Pass a string for a single value, or an indexed array for multiple values. </li>
582	586	* <li><code>IncludeDeleted</code> - <code>boolean</code> - Optional - Indicates whether to include deleted environments: <code>true</code>: Environments that have been deleted after <code>IncludedDeletedBackTo</code> are displayed. <code>false</code>: Do not include deleted environments. </li>
583	587	* <li><code>IncludedDeletedBackTo</code> - <code>string</code> - Optional - If specified when <code>IncludeDeleted</code> is set to <code>true</code>, then environments deleted after this date are displayed. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
584		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	588	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
585	589	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
586	590	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
587	591	*/
—	—	@@ -622,7 +626,7 @@
623	627	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
624	628	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment to retrieve AWS resource usage data. </li>
625	629	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to retrieve AWS resource usage data. </li>
626		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	630	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
627	631	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
628	632	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
629	633	*/
—	—	@@ -641,7 +645,7 @@
642	646	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment to terminate. </li>
643	647	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to terminate. </li>
644	648	* <li><code>TerminateResources</code> - <code>boolean</code> - Optional - Indicates whether the associated AWS resources should shut down when the environment is terminated: <enumValues> <value name="true"> <code>true</code>: (default) The user AWS resources (for example, the Auto Scaling group, LoadBalancer, etc.) are terminated along with the environment. </value> <value name="false"> <code>false</code>: The environment is removed from the AWS Elastic Beanstalk but the AWS resources continue to operate. </value> </enumValues> <ul> <li> <code>true</code>: The specified environment as well as the associated AWS resources, such as Auto Scaling group and LoadBalancer, are terminated. </li><li> <code>false</code>: AWS Elastic Beanstalk resource management is removed from the environment, but the AWS resources continue to operate. </li> </ul> For more information, see the AWS Elastic Beanstalk User Guide. Default: <code>true</code> Valid Values: <code>true</code> \| <code>false</code> </li>
645		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	649	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
646	650	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
647	651	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
648	652	*/
—	—	@@ -669,7 +673,7 @@
670	674	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
671	675	* <li><code>TemplateName</code> - <code>string</code> - Optional - The name of the configuration template to validate the settings against. Condition: You cannot specify both this and an environment name. </li>
672	676	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to validate the settings against. Condition: You cannot specify both this and a configuration template name. </li>
673		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	677	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
674	678	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
675	679	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
676	680	*/
—	—	@@ -693,7 +697,7 @@
694	698	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
695	699	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment to restart the server for. </li>
696	700	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to restart the server for. </li>
697		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	701	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
698	702	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
699	703	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
700	704	*/
—	—	@@ -716,7 +720,7 @@
717	721	* @param string $application_name (Required) The name of the application the environment is associated with.
718	722	* @param string $environment_name (Required) The name of the environment to delete the draft configuration from.
719	723	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
720		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	724	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
721	725	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
722	726	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
723	727	*/
—	—	@@ -759,7 +763,7 @@
760	764	* <li><code>OptionName</code> - <code>string</code> - Optional - The name of the configuration option. </li>
761	765	* </ul></li>
762	766	* </ul></li>
763		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	767	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
764	768	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
765	769	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
766	770	*/
—	—	@@ -820,7 +824,7 @@
821	825	* <li><code>Value</code> - <code>string</code> - Optional - The current value for the configuration option. </li>
822	826	* </ul></li>
823	827	* </ul></li>
824		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	828	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
825	829	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
826	830	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
827	831	*/
—	—	@@ -870,7 +874,7 @@
871	875	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
872	876	* <li><code>TemplateName</code> - <code>string</code> - Optional - The name of the configuration template to describe. </li>
873	877	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to describe. </li>
874		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	878	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
875	879	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
876	880	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
877	881	*/
—	—	@@ -888,7 +892,7 @@
889	893	*
890	894	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
891	895	* <li><code>ApplicationNames</code> - <code>string\|array</code> - Optional - If specified, AWS Elastic Beanstalk restricts the returned descriptions to only include those with the specified names. Pass a string for a single value, or an indexed array for multiple values. </li>
892		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	896	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
893	897	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
894	898	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
895	899	*/
—	—	@@ -916,7 +920,7 @@
917	921	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
918	922	* <li><code>EnvironmentId</code> - <code>string</code> - Optional - The ID of the environment to rebuild. </li>
919	923	* <li><code>EnvironmentName</code> - <code>string</code> - Optional - The name of the environment to rebuild. </li>
920		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	924	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
921	925	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
922	926	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
923	927	*/
—	—	@@ -944,7 +948,7 @@
945	949	* <li><code>StartTime</code> - <code>string</code> - Optional - If specified, AWS Elastic Beanstalk restricts the returned descriptions to those that occur on or after this time. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
946	950	* <li><code>EndTime</code> - <code>string</code> - Optional - If specified, AWS Elastic Beanstalk restricts the returned descriptions to those that occur up to, but not including, the <code>EndTime</code>. May be passed as a number of seconds since UNIX Epoch, or any string compatible with <php:strtotime()>.</li>
947	951	* <li><code>NextToken</code> - <code>string</code> - Optional - Pagination token. If specified, the events return the next batch of results. </li>
948		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	952	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
949	953	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
950	954	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
951	955	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/importexport.class.php
—	—	@@ -22,7 +22,7 @@
23	23	* Internet. For large data sets, AWS Import/Export is often faster than Internet transfer and more cost effective than upgrading your
24	24	* connectivity.
25	25	*
26		~~- * @version Tue Apr 05 15:21:13 PDT 2011~~
	26	+ * @version Tue May 10 18:29:24 PDT 2011
27	27	* @license See the included NOTICE.md file for complete information.
28	28	* @copyright See the included NOTICE.md file for complete information.
29	29	* @link http://aws.amazon.com/importexport/Amazon Import/Export Service
—	—	@@ -58,12 +58,16 @@
59	59
60	60	if (!$key && !defined('AWS_KEY'))
61	61	{
	62	+ // @codeCoverageIgnoreStart
62	63	throw new ImportExport_Exception('No account key was passed into the constructor, nor was it set in the AWS_KEY constant.');
	64	+ // @codeCoverageIgnoreEnd
63	65	}
64	66
65	67	if (!$secret_key && !defined('AWS_SECRET_KEY'))
66	68	{
	69	+ // @codeCoverageIgnoreStart
67	70	throw new ImportExport_Exception('No account secret was passed into the constructor, nor was it set in the AWS_SECRET_KEY constant.');
	71	+ // @codeCoverageIgnoreEnd
68	72	}
69	73
70	74	return parent::__construct($key, $secret_key);
—	—	@@ -84,7 +88,7 @@
85	89	* @param boolean $validate_only (Required) Validate the manifest and parameter values in the request but do not actually create a job.
86	90	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
87	91	* <li><code>ManifestAddendum</code> - <code>string</code> - Optional - For internal use only. </li>
88		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	92	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
89	93	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
90	94	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
91	95	*/
—	—	@@ -105,7 +109,7 @@
106	110	*
107	111	* @param string $job_id (Required) A unique identifier which refers to a particular job.
108	112	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
109		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	113	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
110	114	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
111	115	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
112	116	*/
—	—	@@ -124,7 +128,7 @@
125	129	*
126	130	* @param string $job_id (Required) A unique identifier which refers to a particular job.
127	131	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
128		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	132	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
129	133	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
130	134	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
131	135	*/
—	—	@@ -145,7 +149,7 @@
146	150	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
147	151	* <li><code>MaxJobs</code> - <code>integer</code> - Optional - Sets the maximum number of jobs returned in the response. If there are additional jobs that were not returned because MaxJobs was exceeded, the response contains <IsTruncated>true</IsTruncated>. To return the additional jobs, see Marker. </li>
148	152	* <li><code>Marker</code> - <code>string</code> - Optional - Specifies the JOBID to start after when listing the jobs created with your account. AWS Import/Export lists your jobs in reverse chronological order. See MaxJobs. </li>
149		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	153	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
150	154	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
151	155	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
152	156	*/
—	—	@@ -167,7 +171,7 @@
168	172	* @param string $job_type (Required) Specifies whether the job to initiate is an import or export job. [Allowed values: <code>Import</code>, <code>Export</code>]
169	173	* @param boolean $validate_only (Required) Validate the manifest and parameter values in the request but do not actually create a job.
170	174	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
171		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	175	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
172	176	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
173	177	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
174	178	*/
Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudfront.class.php
—	—	@@ -849,7 +849,7 @@
850	850	* <li><code>OriginProtocolPolicy</code> - <code>string</code> - Optional - The origin protocol policy to apply to your origin. If you specify <code>http-only</code>, CloudFront will use HTTP only to access the origin. If you specify <code>match-viewer</code>, CloudFront will fetch from your origin using HTTP or HTTPS, based on the protocol of the viewer request. [Allowed values: <code>http-only</code>, <code>match-viewer</code>]. The default value is <code>match-viewer</code>. Requires a non-S3 origin.</li>
851	851	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> creates a streaming distribution. A value of <code>false</code> creates a standard distribution. The default value is <code>false</code>.</li>
852	852	* <li><code>TrustedSigners</code> - <code>array</code> - Optional - An array of AWS account numbers for users who are trusted signers. Explicity add the value <code>Self</code> to the array to add your own account as a trusted signer.</li>
853		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	853	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
854	854	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
855	855	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
856	856	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateDistribution.html POST Distribution
—	—	@@ -876,7 +876,7 @@
877	877	* <li><code>Marker</code> - <code>string</code> - Optional - Use this setting when paginating results to indicate where in your list of distributions to begin. The results include distributions in the list that occur after the marker. To get the next page of results, set the <code>Marker</code> to the value of the <code>NextMarker</code> from the current page's response (which is also the ID of the last distribution on that page).</li>
878	878	* <li><code>MaxItems</code> - <code>integer</code> - Optional - The maximum number of distributions you want in the response body. Maximum of 100.</li>
879	879	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> will create a streaming distribution. A value of <code>false</code> will create a standard distribution. The default value is <code>false</code>.</li>
880		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	880	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
881	881	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
882	882	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
883	883	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListDistributions.html GET Distribution List
—	—	@@ -910,7 +910,7 @@
911	911	* @param string $distribution_id (Required) The distribution ID returned from <create_distribution()> or <list_distributions()>.
912	912	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
913	913	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> will create a streaming distribution. A value of <code>false</code> will create a standard distribution. The default value is <code>false</code>.</li>
914		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	914	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
915	915	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
916	916	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
917	917	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetDistribution.html GET Distribution
—	—	@@ -938,7 +938,7 @@
939	939	* @param string $etag (Required) The <code>ETag</code> header value retrieved from <get_distribution_config()>.
940	940	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
941	941	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> will create a streaming distribution. A value of <code>false</code> will create a standard distribution. The default value is <code>false</code>.</li>
942		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	942	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
943	943	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
944	944	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
945	945	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteDistribution.html DELETE Distribution
—	—	@@ -963,7 +963,7 @@
964	964	* @param string $distribution_id (Required) The distribution ID returned from <create_distribution()> or <list_distributions()>.
965	965	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
966	966	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> will create a streaming distribution. A value of <code>false</code> will create a standard distribution. The default value is <code>false</code>.</li>
967		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	967	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
968	968	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
969	969	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
970	970	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetConfig.html GET Distribution Config
—	—	@@ -990,7 +990,7 @@
991	991	* @param string $etag (Required) The ETag header value retrieved from <get_distribution_config()>.
992	992	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
993	993	* <li><code>Streaming</code> - <code>boolean</code> - Optional - Whether or not this should be for a streaming distribution. A value of <code>true</code> will create a streaming distribution. A value of <code>false</code> will create a standard distribution. The default value is <code>false</code>.</li>
994		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	994	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
995	995	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
996	996	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
997	997	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/PutConfig.html PUT Distribution Config
—	—	@@ -1017,7 +1017,7 @@
1018	1018	* @param string $caller_reference (Required) A unique identifier for the request. A timestamp-appended string is recommended.
1019	1019	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1020	1020	* <li><code>Comment</code> - <code>string</code> - Optional - A comment about the OAI.</li>
1021		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1021	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1022	1022	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1023	1023	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1024	1024	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateOAI.html POST Origin Access Identity
—	—	@@ -1040,7 +1040,7 @@
1041	1041	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1042	1042	* <li><code>Marker</code> - <code>string</code> - Optional - Use this when paginating results to indicate where in your list of distributions to begin. The results include distributions in the list that occur after the marker. To get the next page of results, set the Marker to the value of the NextMarker from the current page's response (which is also the ID of the last distribution on that page).</li>
1043	1043	* <li><code>MaxItems</code> - <code>integer</code> - Optional - The maximum number of distributions you want in the response body. Maximum of 100.</li>
1044		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1044	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1045	1045	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1046	1046	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1047	1047	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListOAIs.html GET Origin Access Identity List
—	—	@@ -1069,7 +1069,7 @@
1070	1070	*
1071	1071	* @param string $identity_id (Required) The Identity ID for an existing OAI.
1072	1072	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1073		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1073	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1074	1074	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1075	1075	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1076	1076	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetOAI.html GET Origin Access Identity
—	—	@@ -1092,7 +1092,7 @@
1093	1093	* @param string $identity_id (Required) An Identity ID for an existing OAI.
1094	1094	* @param string $etag (Required) The <code>ETag</code> header value retrieved from a call to <get_oai()>.
1095	1095	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1096		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1096	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1097	1097	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1098	1098	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1099	1099	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteOAI.html DELETE Origin Access Identity
—	—	@@ -1111,7 +1111,7 @@
1112	1112	*
1113	1113	* @param string $identity_id (Required) An Identity ID for an existing OAI.
1114	1114	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1115		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1115	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1116	1116	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1117	1117	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1118	1118	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetOAIConfig.html GET Origin Access Identity Config
—	—	@@ -1138,7 +1138,7 @@
1139	1139	* @param string $xml (Required) The configuration XML generated by <generate_oai_xml()>.
1140	1140	* @param string $etag (Required) The ETag header value retrieved from a call to <get_distribution_config()>.
1141	1141	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1142		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1142	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1143	1143	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1144	1144	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1145	1145	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/PutOAIConfig.html PUT Origin Access Identity Config
—	—	@@ -1163,7 +1163,7 @@
1164	1164	* @param string $caller_reference (Required) A unique identifier for the request. A timestamp-appended string is recommended.
1165	1165	* @param string\|array $paths (Required) One or more paths to set for invalidation. Pass a string for a single value, or an indexed array for multiple values. values.
1166	1166	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1167		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1167	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1168	1168	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1169	1169	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1170	1170	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateInvalidation.html POST Invalidation
—	—	@@ -1187,7 +1187,7 @@
1188	1188	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1189	1189	* <li><code>Marker</code> - <code>string</code> - Optional - Use this when paginating results to indicate where in the list of invalidations to begin. The results include invalidations in the list that occur after the marker. To get the next page of results, set the <code>Marker</code> parameter to the value of the <code>NextMarker</code> parameter from the current page's response, which is also the ID of the last invalidation on that page.</li>
1190	1190	* <li><code>MaxItems</code> - <code>integer</code> - Optional - The maximum number of invalidations you want in the response body. A maximum value of 100 can be used.</li>
1191		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1191	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1192	1192	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1193	1193	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1194	1194	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListInvalidation.html GET Invalidation List
—	—	@@ -1217,7 +1217,7 @@
1218	1218	* @param string $distribution_id (Required) The distribution ID returned from <create_distribution()> or <list_distributions()>.
1219	1219	* @param string $invalidation_id (Required) The invalidation ID returned from <create_invalidation()> or <list_invalidations()>.
1220	1220	* @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
1221		~~- * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <php:curl_setopt()>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>~~
	1221	+ * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li>
1222	1222	* <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul>
1223	1223	* @return CFResponse A <CFResponse> object containing a parsed HTTP response.
1224	1224	* @link http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetInvalidation.html GET Invalidation
—	—	@@ -1339,7 +1339,10 @@
1340	1340
1341	1341	$resource = '';
1342	1342	$expiration_key = 'Expires';
1343		~~- $expires = strtotime($expires);~~
	1343	+ if (is_string($expires))
	1344	+ {
	1345	+ $expires = strtotime($expires);
	1346	+ }
1344	1347	$conjunction = (strpos($filename, '?') === false ? '?' : '&');
1345	1348
1346	1349	// Determine the protocol scheme
Index: trunk/extensions/OpenStackManager/aws-sdk/lib/requestcore/requestcore.class.php
—	—	@@ -597,8 +597,6 @@
598	598	curl_setopt($curl_handle, CURLOPT_URL, $this->request_url);
599	599	curl_setopt($curl_handle, CURLOPT_FILETIME, true);
600	600	curl_setopt($curl_handle, CURLOPT_FRESH_CONNECT, false);
601		~~- curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false);~~
602		~~- curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, true);~~
603	601	curl_setopt($curl_handle, CURLOPT_CLOSEPOLICY, CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
604	602	curl_setopt($curl_handle, CURLOPT_MAXREDIRS, 5);
605	603	curl_setopt($curl_handle, CURLOPT_HEADER, true);
—	—	@@ -610,12 +608,19 @@
611	609	curl_setopt($curl_handle, CURLOPT_USERAGENT, $this->useragent);
612	610	curl_setopt($curl_handle, CURLOPT_READFUNCTION, array($this, 'streaming_read_callback'));
613	611
	612	+ // Verify security of the connection
	613	+ curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, true);
	614	+ curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, true);
	615	+ curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem'); // chmod the file as 0755
	616	+
	617	+ // Debug mode
614	618	if ($this->debug_mode)
615	619	{
616	620	curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
617	621	}
618	622
619		~~- if (!ini_get('safe_mode'))~~
	623	+ // Handle open_basedir & safe mode
	624	+ if (!ini_get('safe_mode') && !ini_get('open_basedir'))
620	625	{
621	626	curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, true);
622	627	}
Index: trunk/extensions/OpenStackManager/aws-sdk/_docs/NOTICE.md
—	—	@@ -363,3 +363,27 @@
364	364	THE SOFTWARE.
365	365
366	366	<http://opensource.org/licenses/mit-license.php>
	367	+
	368	+
	369	+## Mozilla Certificate Authority
	370	+
	371	+* <http://curl.haxx.se/ca/cacert.pem>
	372	+* <https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1>
	373	+
	374	+The contents of this file are subject to the Mozilla Public License Version
	375	+1.1 (the "License"); you may not use this file except in compliance with
	376	+the License. You may obtain a copy of the License at
	377	+http://www.mozilla.org/MPL/
	378	+
	379	+Software distributed under the License is distributed on an "AS IS" basis,
	380	+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
	381	+for the specific language governing rights and limitations under the
	382	+License.
	383	+
	384	+The Original Code is the Netscape security libraries.
	385	+
	386	+The Initial Developer of the Original Code is Netscape Communications
	387	+Corporation. Portions created by the Initial Developer are Copyright
	388	+(C) 1994-2000 the Initial Developer. All Rights Reserved.
	389	+
	390	+<http://www.mozilla.org/MPL/>
Index: trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md
—	—	@@ -1,3 +1,53 @@
	2	+# Changelog: 1.3.3 "Moogle"
	3	+
	4	+Launched Tuesday, May 10, 2011
	5	+
	6	+## Bug fixes and enhancements
	7	+* [Bug in AmazonCloudFront::get_private_object_url](https://forums.aws.amazon.com/thread.jspa?threadID=64004)
	8	+* [SDK 1.3.2 - Call to undefined function json_last_error()](https://forums.aws.amazon.com/thread.jspa?threadID=64767)
	9	+* [CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir](https://forums.aws.amazon.com/thread.jspa?threadID=61333)
	10	+
	11	+
	12	+## Service Classes
	13	+### AmazonCloudFront
	14	+* Fixed: Resolved an issue where the expires value for `get_private_object_url()` only accepted a string instead of a string or integer.
	15	+
	16	+### AmazonCloudWatch
	17	+* New: Support for CloudWatch custom user metrics has been added to the SDK.
	18	+
	19	+
	20	+## Extensions
	21	+### S3BrowserUpload
	22	+* New: Added the `S3BrowserUpload` class to the SDK. This class assists in generating the correct HTML/XHTML markup for uploading files to S3 via an HTML <form> element.
	23	+
	24	+
	25	+## Utility Classes
	26	+### CFArray
	27	+* New: Added the `init()` method which simplifies the process of instantiating and chaining a class.
	28	+
	29	+### CFHadoopBase
	30	+* New: The `CFHadoopBase` class has been extracted out of `CFHadoopStep` as a shared library.
	31	+
	32	+### CFHadoopStep
	33	+* New: The `CFHadoopBase` class has been extracted out of `CFHadoopStep` as a shared library.
	34	+* New: This class now extends from the `CFHadoopBase` class.
	35	+
	36	+### CFJSON
	37	+* Fixed: Resolved an issue where a PHP 5.3-specific function was being used.
	38	+
	39	+### CFPolicy
	40	+* New: Added the init() method which simplifies the process of instantiating and chaining a class.
	41	+
	42	+### CFSimpleXML
	43	+* New: Added the init() method which simplifies the process of instantiating and chaining a class.
	44	+
	45	+### RequestCore
	46	+* Fixed: Improvements to running in PHP environments with open_basedir enabled.
	47	+* Fixed: RequestCore now uses an up-to-date `cacert.pem` file from Mozilla instead of the Certificate Authority that libcurl or libopenssl was compiled with, which should resolve certain issues with making SSL connections to AWS services.
	48	+
	49	+
	50	+----
	51	+
2	52	# Changelog: 1.3.2 "Luna"
3	53
4	54	Launched Tuesday, April 5, 2011
—	—	@@ -7,6 +57,7 @@
8	58	* Bug fixes and enhancements:
9	59	* [AmazonCloudWatch get_metric_statistics returns gzipped body](https://forums.aws.amazon.com/thread.jspa?threadID=62625)
10	60
	61	+
11	62	## Service Classes
12	63	### AmazonCloudWatch
13	64	* Fixed: Worked around an issue where when CloudWatch sends back `Content-Encoding: gzip`, it really means `deflate`. When CloudWatch sends back `Content-Encoding: deflate`, it really means the data isn't encoded at all.
—	—	@@ -29,6 +80,7 @@
30	81	* [Cannot send email](https://forums.aws.amazon.com/thread.jspa?threadID=62833)
31	82	* [AmazonCloudWatch get_metric_statistics returns gzipped body](https://forums.aws.amazon.com/thread.jspa?threadID=62625)
32	83
	84	+
33	85	## Utility Classes
34	86	### CFArray
35	87	* New: The `to_json()` and `to_yaml()` methoda have been added to the class.
Index: trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php
—	—	@@ -102,9 +102,9 @@
103	103	// INTERMEDIARY CONSTANTS
104	104
105	105	define('CFRUNTIME_NAME', 'aws-sdk-php');
106		~~-define('CFRUNTIME_VERSION', '1.3.2');~~
	106	+define('CFRUNTIME_VERSION', '1.3.3');
107	107	// define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release.
108		~~-define('CFRUNTIME_BUILD', '20110405215944');~~
	108	+define('CFRUNTIME_BUILD', '20110510205648');
109	109	define('CFRUNTIME_USERAGENT', CFRUNTIME_NAME . '/' . CFRUNTIME_VERSION . ' PHP/' . PHP_VERSION . ' ' . php_uname('s') . '/' . php_uname('r') . ' Arch/' . php_uname('m') . ' SAPI/' . php_sapi_name() . ' Integer/' . PHP_INT_MAX . ' Build/' . CFRUNTIME_BUILD . __aws_sdk_ua_callback());
110	110
111	111
—	—	@@ -115,7 +115,7 @@
116	116	* Core functionality and default settings shared across all SDK classes. All methods and properties in this
117	117	* class are inherited by the service-specific classes.
118	118	*
119		~~- * @version 2011.03.25~~
	119	+ * @version 2011.05.10
120	120	* @license See the included NOTICE.md file for more information.
121	121	* @copyright See the included NOTICE.md file for more information.
122	122	* @link http://aws.amazon.com/php/ PHP Developer Center
Index: trunk/extensions/OpenStackManager/aws-sdk/utilities/policy.class.php
—	—	@@ -21,14 +21,13 @@
22	22	/**
23	23	* Simplifies the process of signing JSON policy documents.
24	24	*
25		~~- * @version 2010.08.31~~
	25	+ * @version 2011.04.25
26	26	* @license See the included NOTICE.md file for more information.
27	27	* @copyright See the included NOTICE.md file for more information.
28	28	* @link http://aws.amazon.com/php/ PHP Developer Center
29	29	*/
30	30	class CFPolicy
31	31	{
32		-
33	32	/**
34	33	* Stores the object that contains the authentication credentials.
35	34	*/
—	—	@@ -65,6 +64,24 @@
66	65	}
67	66
68	67	/**
	68	+ * Alternate approach to constructing a new instance. Supports chaining.
	69	+ *
	70	+ * @param CFRuntime $auth (Required) An instance of any authenticated AWS object that is an instance of <CFRuntime> (e.g. <AmazonEC2>, <AmazonS3>).
	71	+ * @param string\|array $policy (Required) The associative array representing the S3 policy to use, or a string of JSON content.
	72	+ * @return $this A reference to the current instance.
	73	+ */
	74	+ public static function init($auth, $policy)
	75	+ {
	76	+ if (version_compare(PHP_VERSION, '5.3.0', '<'))
	77	+ {
	78	+ throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
	79	+ }
	80	+
	81	+ $self = get_called_class();
	82	+ return new $self($auth, $policy);
	83	+ }
	84	+
	85	+ /**
69	86	* Get the key from the authenticated instance.
70	87	*
71	88	* @return string The key from the authenticated instance.
Index: trunk/extensions/OpenStackManager/aws-sdk/utilities/hadoopstep.class.php
—	—	@@ -21,59 +21,15 @@
22	22	/**
23	23	* Contains a set of pre-built Amazon EMR Hadoop steps.
24	24	*
25		~~- * @version 2010.11.16~~
	25	+ * @version 2011.05.03
26	26	* @license See the included NOTICE.md file for more information.
27	27	* @copyright See the included NOTICE.md file for more information.
28	28	* @link http://aws.amazon.com/php/ PHP Developer Center
29	29	* @link http://hadoop.apache.org Apache Hadoop
30	30	*/
31		~~-class CFHadoopStep~~
	31	+class CFHadoopStep extends CFHadoopBase
32	32	{
33		-
34		~~- /%****************************************************************************************%/~~
35		~~- // CORE METHODS~~
36		-
37	33	/**
38		~~- * Runs a specified script on the master node of your cluster.~~
39		- *
40		~~- * @param string $script (Required) The script to run with `script-runner.jar`.~~
41		~~- * @param array $args (Optional) An indexed array of arguments to pass to the script.~~
42		~~- * @return array A standard array that is intended to be passed into a <CFStepConfig> object.~~
43		~~- */~~
44		~~- protected static function script_runner($script, $args = null)~~
45		~~- {~~
46		~~- if (!$args) $args = array();~~
47		~~- array_unshift($args, $script);~~
48		-
49		~~- return array(~~
50		~~- 'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',~~
51		~~- 'Args' => $args~~
52		~~- );~~
53		~~- }~~
54		-
55		- /**
56		~~- * Prepares a Hive or Pig script before passing it to the script runner.~~
57		- *
58		~~- * @param string $type (Required) The type of script to run. [Allowed values: `hive`, `pig`].~~
59		~~- * @param array $args (Optional) An indexed array of arguments to pass to the script.~~
60		~~- * @return array A standard array that is intended to be passed into a <CFStepConfig> object.~~
61		~~- * @link http://hive.apache.org Apache Hive~~
62		~~- * @link http://pig.apache.org Apache Pig~~
63		~~- */~~
64		~~- protected static function hive_pig_script($type, $args = null)~~
65		~~- {~~
66		~~- if (!$args) $args = array();~~
67		~~- $args = is_array($args) ? $args : array($args);~~
68		~~- $args = array_merge(array('--base-path', 's3://us-east-1.elasticmapreduce/libs/' . $type . '/'), $args);~~
69		-
70		~~- return self::script_runner('s3://us-east-1.elasticmapreduce/libs/' . $type . '/' . $type . '-script', $args);~~
71		~~- }~~
72		-
73		-
74		~~- /%****************************************************************************************%/~~
75		~~- // USER-FACING METHODS~~
76		-
77		- /**
78	34	* When ran as the first step in your job flow, enables the Hadoop debugging UI in the AWS
79	35	* Management Console.
80	36	*
Index: trunk/extensions/OpenStackManager/aws-sdk/utilities/json.class.php
—	—	@@ -49,21 +49,28 @@
50	50	{
51	51	$json = json_decode($json, true);
52	52
53		~~- // Did we encounter an error?~~
54		~~- switch (json_last_error())~~
	53	+ if (function_exists('json_last_error'))
55	54	{
56		~~- case JSON_ERROR_DEPTH:~~
57		~~- throw new JSON_Exception('Maximum stack depth exceeded');~~
	55	+ // Did we encounter an error?
	56	+ switch (json_last_error())
	57	+ {
	58	+ case JSON_ERROR_DEPTH:
	59	+ throw new JSON_Exception('Maximum stack depth exceeded.');
58	60
59		~~- case JSON_ERROR_CTRL_CHAR:~~
60		~~- throw new JSON_Exception('Unexpected control character found');~~
	61	+ case JSON_ERROR_CTRL_CHAR:
	62	+ throw new JSON_Exception('Unexpected control character found.');
61	63
62		~~- case JSON_ERROR_SYNTAX:~~
63		~~- throw new JSON_Exception('Syntax error; Malformed JSON');~~
	64	+ case JSON_ERROR_SYNTAX:
	65	+ throw new JSON_Exception('Syntax error; Malformed JSON.');
64	66
65		~~- case JSON_ERROR_STATE_MISMATCH:~~
66		~~- throw new JSON_Exception('Invalid or malformed JSON');~~
	67	+ case JSON_ERROR_STATE_MISMATCH:
	68	+ throw new JSON_Exception('Invalid or malformed JSON.');
	69	+ }
67	70	}
	71	+ else
	72	+ {
	73	+ throw new JSON_Exception('Unknown JSON error. Be sure to validate your JSON and read the notes on http://php.net/json_decode.');
	74	+ }
68	75	}
69	76
70	77	// Hand off for the recursive work
Index: trunk/extensions/OpenStackManager/aws-sdk/utilities/simplexml.class.php
—	—	@@ -22,7 +22,7 @@
23	23	* Wraps the underlying `SimpleXMLIterator` class with enhancements for rapidly traversing the DOM tree,
24	24	* converting types, and comparisons.
25	25	*
26		~~- * @version 2011.03.25~~
	26	+ * @version 2011.04.25
27	27	* @license See the included NOTICE.md file for more information.
28	28	* @copyright See the included NOTICE.md file for more information.
29	29	* @link http://aws.amazon.com/php/ PHP Developer Center
—	—	@@ -77,7 +77,28 @@
78	78	return $results;
79	79	}
80	80
	81	+ /**
	82	+ * Alternate approach to constructing a new instance. Supports chaining.
	83	+ *
	84	+ * @param string $data (Required) A well-formed XML string or the path or URL to an XML document if $data_is_url is <code>true</code>.
	85	+ * @param integer $options (Optional) Used to specify additional LibXML parameters. The default value is <code>0</code>.
	86	+ * @param boolean $data_is_url (Optional) Specify a value of <code>true</code> to specify that data is a path or URL to an XML document instead of string data. The default value is <code>false</code>.
	87	+ * @param string $ns (Optional) The XML namespace to return values for.
	88	+ * @param boolean $is_prefix (Optional) (No description provided by PHP.net.)
	89	+ * @return CFSimpleXML Creates a new <CFSimpleXML> element.
	90	+ */
	91	+ public static function init($data, $options = 0, $data_is_url, $ns, $is_prefix = false)
	92	+ {
	93	+ if (version_compare(PHP_VERSION, '5.3.0', '<'))
	94	+ {
	95	+ throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
	96	+ }
81	97
	98	+ $self = get_called_class();
	99	+ return new $self($data, $options, $data_is_url, $ns, $is_prefix);
	100	+ }
	101	+
	102	+
82	103	/%****************************************************************************************%/
83	104	// TRAVERSAL
84	105
Index: trunk/extensions/OpenStackManager/aws-sdk/utilities/array.class.php
—	—	@@ -23,7 +23,7 @@
24	24	* rapidly manipulating array data. Specifically, the `CFArray` object is intended for working with
25	25	* <CFResponse> and <CFSimpleXML> objects that are returned by AWS services.
26	26	*
27		~~- * @version 2010.12.06~~
	27	+ * @version 2011.04.25
28	28	* @license See the included NOTICE.md file for more information.
29	29	* @copyright See the included NOTICE.md file for more information.
30	30	* @link http://aws.amazon.com/php/ PHP Developer Center
—	—	@@ -45,6 +45,25 @@
46	46	}
47	47
48	48	/**
	49	+ * Alternate approach to constructing a new instance. Supports chaining.
	50	+ *
	51	+ * @param mixed $input (Optional) The input parameter accepts an array or an Object. The default value is an empty array.
	52	+ * @param integer $flags (Optional) Flags to control the behavior of the ArrayObject object. Defaults to <STD_PROP_LIST>.
	53	+ * @param string $iterator_class (Optional) Specify the class that will be used for iteration of the <php:ArrayObject> object. <php:ArrayIterator> is the default class used.
	54	+ * @return mixed Either an array of matches, or a single <CFSimpleXML> element.
	55	+ */
	56	+ public static function init($input = array(), $flags = self::STD_PROP_LIST, $iterator_class = 'ArrayIterator')
	57	+ {
	58	+ if (version_compare(PHP_VERSION, '5.3.0', '<'))
	59	+ {
	60	+ throw new Exception('PHP 5.3 or newer is required to instantiate a new class with CLASS::init().');
	61	+ }
	62	+
	63	+ $self = get_called_class();
	64	+ return new $self($input, $flags, $iterator_class);
	65	+ }
	66	+
	67	+ /**
49	68	* Handles how the object is rendered when cast as a string.
50	69	*
51	70	* @return string The word "Array".

Follow-up revisions

Revision	Commit summary	Author	Date
r89092	Followup r88598, seems 2 files didn't get commited	reedy	12:12, 29 May 2011

Status & tagging log

17:58, 26 May 2011 Reedy (talk | contribs) changed the status of r88598 [removed: new added: deferred]