| Index: trunk/extensions/OpenStackManager/aws-sdk/services/cloudformation.class.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | * Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a specific AWS product, you can |
| 50 | 50 | * find the product's technical documentation at <a href="http://aws.amazon.com/documentation/">http://aws.amazon.com/documentation/</a>. |
| 51 | 51 | * |
| 52 | | - * @version Thu Sep 01 21:17:41 PDT 2011 |
| | 52 | + * @version Fri Sep 30 16:15:37 PDT 2011 |
| 53 | 53 | * @license See the included NOTICE.md file for complete information. |
| 54 | 54 | * @copyright See the included NOTICE.md file for complete information. |
| 55 | 55 | * @link http://aws.amazon.com/cloudformation/Amazon CloudFormation |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| 185 | 185 | * <li><code>TemplateBody</code> - <code>string</code> - Optional - Structure containing the template body. (For more information, go to the AWS CloudFormation User Guide.) Condition: You must pass <code>TemplateBody</code> or <code>TemplateURL</code>. If both are passed, only <code>TemplateBody</code> is used. </li> |
| 186 | 186 | * <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> |
| 187 | | - * <li><code>Parameters</code> - <code>array</code> - Optional - A list of <code>Parameter</code> structures. <ul> |
| | 187 | + * <li><code>Parameters</code> - <code>array</code> - Optional - A list of <code>Parameter</code> structures that specify input parameters for the stack. <ul> |
| 188 | 188 | * <li><code>x</code> - <code>array</code> - This represents a simple array index. <ul> |
| 189 | 189 | * <li><code>ParameterKey</code> - <code>string</code> - Optional - The key associated with the parameter. </li> |
| 190 | 190 | * <li><code>ParameterValue</code> - <code>string</code> - Optional - The value associated with the parameter. </li> |
| — | — | @@ -192,6 +192,7 @@ |
| 193 | 193 | * <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> |
| 194 | 194 | * <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> |
| 195 | 195 | * <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> |
| | 196 | + * <li><code>Capabilities</code> - <code>array</code>- Optional - The list of capabilities that you want to allow in the stack. If your template contains IAM resources, you must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an InsufficientCapabilities error. IAM resources are the following: AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::Policy, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.</li> |
| 196 | 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> |
| 197 | 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> |
| 198 | 199 | * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| — | — | @@ -219,6 +220,15 @@ |
| 220 | 221 | unset($opt['NotificationARNs']); |
| 221 | 222 | } |
| 222 | 223 | |
| | 224 | + // Optional parameter |
| | 225 | + if (isset($opt['Capabilities'])) |
| | 226 | + { |
| | 227 | + $opt = array_merge($opt, CFComplexType::map(array( |
| | 228 | + 'Capabilities' => $opt['Capabilities'] |
| | 229 | + ), 'member')); |
| | 230 | + unset($opt['Capabilities']); |
| | 231 | + } |
| | 232 | + |
| 223 | 233 | return $this->authenticate('CreateStack', $opt, $this->hostname); |
| 224 | 234 | } |
| 225 | 235 | |
| — | — | @@ -394,6 +404,51 @@ |
| 395 | 405 | |
| 396 | 406 | return $this->authenticate('DescribeStackResources', $opt, $this->hostname); |
| 397 | 407 | } |
| | 408 | + |
| | 409 | + /** |
| | 410 | + * Updates a stack as specified in the template. After the call completes successfully, the stack update starts. You can check the status of |
| | 411 | + * the stack via the DescribeStacks action. |
| | 412 | + * |
| | 413 | + * To get a copy of the template for an existing stack, you can use the GetTemplate action. |
| | 414 | + * |
| | 415 | + * For more information about creating an update template, updating a stack, and monitoring the progress of the update, see <a |
| | 416 | + * href="http://docs.amazonwebservices.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks.html">Updating a Stack</a>. |
| | 417 | + * |
| | 418 | + * @param string $stack_name (Required) The name or stack ID of the stack to update. Must contain only alphanumeric characters (case sensitive) and start with an alpha character. Maximum length of the name is 255 characters. |
| | 419 | + * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| | 420 | + * <li><code>TemplateBody</code> - <code>string</code> - Optional - Structure containing the template body. (For more information, go to the AWS CloudFormation User Guide.) Condition: You must pass <code>TemplateBody</code> or <code>TemplateURL</code>. If both are passed, only <code>TemplateBody</code> is used. </li> |
| | 421 | + * <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> |
| | 422 | + * <li><code>Parameters</code> - <code>array</code> - Optional - A list of <code>Parameter</code> structures that specify input parameters for the stack.</li> |
| | 423 | + * <li><code>Capabilities</code> - <code>array</code>- Optional - The list of capabilities that you want to allow in the stack. If your stack contains IAM resources, you must specify the CAPABILITY_IAM value for this parameter; otherwise, this action returns an InsufficientCapabilities error. IAM resources are the following: AWS::IAM::AccessKey, AWS::IAM::Group, AWS::IAM::Policy, AWS::IAM::User, and AWS::IAM::UserToGroupAddition.</li> |
| | 424 | + * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li> |
| | 425 | + * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul> |
| | 426 | + * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| | 427 | + */ |
| | 428 | + public function update_stack($stack_name, $opt = null) |
| | 429 | + { |
| | 430 | + if (!$opt) $opt = array(); |
| | 431 | + $opt['StackName'] = $stack_name; |
| | 432 | + |
| | 433 | + // Optional parameter |
| | 434 | + if (isset($opt['Parameters'])) |
| | 435 | + { |
| | 436 | + $opt = array_merge($opt, CFComplexType::map(array( |
| | 437 | + 'Parameters' => $opt['Parameters'] |
| | 438 | + ), 'member')); |
| | 439 | + unset($opt['Parameters']); |
| | 440 | + } |
| | 441 | + |
| | 442 | + // Optional parameter |
| | 443 | + if (isset($opt['Capabilities'])) |
| | 444 | + { |
| | 445 | + $opt = array_merge($opt, CFComplexType::map(array( |
| | 446 | + 'Capabilities' => $opt['Capabilities'] |
| | 447 | + ), 'member')); |
| | 448 | + unset($opt['Capabilities']); |
| | 449 | + } |
| | 450 | + |
| | 451 | + return $this->authenticate('UpdateStack', $opt, $this->hostname); |
| | 452 | + } |
| 398 | 453 | } |
| 399 | 454 | |
| 400 | 455 | |
| Index: trunk/extensions/OpenStackManager/aws-sdk/services/s3.class.php |
| — | — | @@ -287,7 +287,7 @@ |
| 288 | 288 | return parent::session_based_auth($key, $secret_key, $token); |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | | - return parent::__construct($key, $secret_key); |
| | 291 | + return parent::__construct($key, $secret_key, $token); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | |
| Index: trunk/extensions/OpenStackManager/aws-sdk/_docs/CHANGELOG.md |
| — | — | @@ -1,3 +1,18 @@ |
| | 2 | +# Changelog: 1.4.3 "Ultros" |
| | 3 | +<http://finalfantasy.wikia.com/wiki/Ultros> |
| | 4 | + |
| | 5 | +Launched Friday, September 30, 2011 |
| | 6 | + |
| | 7 | +## Service Classes |
| | 8 | +### AmazonCloudFormation |
| | 9 | +* **New:** Support for new features in CloudFormation have been added to the SDK. |
| | 10 | + |
| | 11 | +### AmazonS3 |
| | 12 | +* **Fixed:** Setting the default cache configuration no longer causes authentication errors in `AmazonS3`. |
| | 13 | + |
| | 14 | + |
| | 15 | +---- |
| | 16 | + |
| 2 | 17 | # Changelog: 1.4.2.1 "Tiamat, Part II" |
| 3 | 18 | <http://finalfantasy.wikia.com/wiki/Tiamat> |
| 4 | 19 | |
| Index: trunk/extensions/OpenStackManager/aws-sdk/sdk.class.php |
| — | — | @@ -125,9 +125,9 @@ |
| 126 | 126 | // INTERMEDIARY CONSTANTS |
| 127 | 127 | |
| 128 | 128 | define('CFRUNTIME_NAME', 'aws-sdk-php'); |
| 129 | | -define('CFRUNTIME_VERSION', '1.4.2'); |
| | 129 | +define('CFRUNTIME_VERSION', '1.4.3'); |
| 130 | 130 | // define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release. |
| 131 | | -define('CFRUNTIME_BUILD', '20110901191027'); |
| | 131 | +define('CFRUNTIME_BUILD', '20110930191027'); |
| 132 | 132 | define('CFRUNTIME_USERAGENT', CFRUNTIME_NAME . '/' . CFRUNTIME_VERSION . ' PHP/' . PHP_VERSION . ' ' . str_replace(' ', '_', php_uname('s')) . '/' . str_replace(' ', '_', php_uname('r')) . ' Arch/' . php_uname('m') . ' SAPI/' . php_sapi_name() . ' Integer/' . PHP_INT_MAX . ' Build/' . CFRUNTIME_BUILD . __aws_sdk_ua_callback()); |
| 133 | 133 | |
| 134 | 134 | |
| — | — | @@ -376,6 +376,7 @@ |
| 377 | 377 | // Set default values |
| 378 | 378 | $this->key = null; |
| 379 | 379 | $this->secret_key = null; |
| | 380 | + $this->auth_token = $token; |
| 380 | 381 | |
| 381 | 382 | // If both a key and secret key are passed in, use those. |
| 382 | 383 | if ($key && $secret_key) |