Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
skyzyx authored and amazonwebservices committed Aug 23, 2011
1 parent 4f1f76e commit a220e63
Show file tree
Hide file tree
Showing 19 changed files with 861 additions and 61 deletions.
21 changes: 21 additions & 0 deletions _docs/CHANGELOG.md
@@ -1,3 +1,24 @@
# Changelog: 1.4.1 "Sephiroth"
<http://finalfantasy.wikia.com/wiki/Sephiroth>

## Service Classes
### AmazonElastiCache
* **New:** Support for Amazon ElastiCache has been added to the SDK.

### AmazonEMR
* **New:** Support for Hadoop Bootstrap Actions has been added to the SDK.
* **New:** Support for Amazon Elastic MapReduce on Spot Instances has been added to the SDK.
* **New:** Support for Termination Protection has been added to the SDK.
* **Changed:** For the <code>add_instance_groups()</code> method, the <code>$instance_groups</code> and <code>$job_flow_id</code> parameters have been reversed.

## Utility Classes
### CFHadoopBootstrap
* **New:** The `CFHadoopBootstrap` class has been added to the SDK. Simplifies the process of working with Hadoop system and daemon configurations in Amazon EMR.
* **New:** This class extends from the `CFHadoopBase` class.


----

# Changelog: 1.4 "Rikku"
<http://finalfantasy.wikia.com/wiki/Rikku>

Expand Down
16 changes: 8 additions & 8 deletions package.xml

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions sdk.class.php
Expand Up @@ -125,9 +125,9 @@ function __aws_sdk_ua_callback()
// INTERMEDIARY CONSTANTS

define('CFRUNTIME_NAME', 'aws-sdk-php');
define('CFRUNTIME_VERSION', '1.4');
define('CFRUNTIME_VERSION', '1.4.1');
// define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release.
define('CFRUNTIME_BUILD', '20110803172558');
define('CFRUNTIME_BUILD', '20110823204245');
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());


Expand Down Expand Up @@ -415,7 +415,8 @@ public function session_based_auth($key = null, $secret_key = null, $token = nul
// Use 'em if we've got 'em
if ($key && $secret_key && $token)
{
$this->__construct($key, $secret_key);
$this->key = $key;
$this->secret_key = $secret_key;
$this->auth_token = $token;
return true;
}
Expand Down Expand Up @@ -458,20 +459,12 @@ public function session_based_auth($key = null, $secret_key = null, $token = nul
$this->auth_token = $session_credentials['SessionToken'];

// If both a key and secret key are passed in, use those.
if ($session_credentials['AccessKeyId'] && $session_credentials['SecretAccessKey'])
if (isset($session_credentials['AccessKeyId']) && isset($session_credentials['SecretAccessKey']))
{
$this->key = $session_credentials['AccessKeyId'];
$this->secret_key = $session_credentials['SecretAccessKey'];
return true;
}
// If neither are passed in, look for the constants instead.
elseif (defined('AWS_KEY') && defined('AWS_SECRET_KEY'))
{
$this->key = AWS_KEY;
$this->secret_key = AWS_SECRET_KEY;
return true;
}

// Otherwise set the values to blank and return false.
else
{
Expand All @@ -480,6 +473,13 @@ public function session_based_auth($key = null, $secret_key = null, $token = nul
}
}

/**
* The callback function that is executed while caching the session credentials.
*
* @param string $key (Optional) Your AWS key, or a session key. If blank, it will look for the <code>AWS_KEY</code> constant.
* @param string $secret_key (Optional) Your AWS secret key, or a session secret key. If blank, it will look for the <code>AWS_SECRET_KEY</code> constant.
* @return mixed The data to be cached or null.
*/
public function cache_token($key, $secret_key)
{
$token = new AmazonSTS($key, $secret_key);
Expand Down Expand Up @@ -1365,7 +1365,7 @@ public function parse_callback($response, $headers = null)
case 'deflate':
if (strpos($headers['_info']['url'], 'monitoring.') !== false)
{
// CloudWatch incorrectly does nothing when they say deflate.
// CloudWatchWatch incorrectly does nothing when they say deflate.
continue;
}
else
Expand Down
2 changes: 1 addition & 1 deletion services/as.class.php
Expand Up @@ -38,7 +38,7 @@
* href="http://docs.amazonwebservices.com/general/latest/gr/index.html?rande.html">Regions and Endpoints</a> in the Amazon Web Services
* General Reference.
*
* @version Wed Aug 03 10:07:42 PDT 2011
* @version Tue Aug 23 12:45:05 PDT 2011
* @license See the included NOTICE.md file for complete information.
* @copyright See the included NOTICE.md file for complete information.
* @link http://aws.amazon.com/autoscaling/Amazon Auto-Scaling
Expand Down
2 changes: 1 addition & 1 deletion services/cloudformation.class.php
Expand Up @@ -48,7 +48,7 @@
* Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a specific AWS product, you can
* find the product's technical documentation at <a href="http://aws.amazon.com/documentation/">http://aws.amazon.com/documentation/</a>.
*
* @version Wed Aug 03 10:08:29 PDT 2011
* @version Tue Aug 23 12:45:39 PDT 2011
* @license See the included NOTICE.md file for complete information.
* @copyright See the included NOTICE.md file for complete information.
* @link http://aws.amazon.com/cloudformation/Amazon CloudFormation
Expand Down
2 changes: 1 addition & 1 deletion services/cloudwatch.class.php
Expand Up @@ -47,7 +47,7 @@
*
* </ul>
*
* @version Wed Aug 03 10:09:00 PDT 2011
* @version Tue Aug 23 12:46:08 PDT 2011
* @license See the included NOTICE.md file for complete information.
* @copyright See the included NOTICE.md file for complete information.
* @link http://aws.amazon.com/cloudwatch/Amazon CloudWatch
Expand Down
2 changes: 1 addition & 1 deletion services/ec2.class.php
Expand Up @@ -27,7 +27,7 @@
*
* Visit <a href="http://aws.amazon.com/ec2/">http://aws.amazon.com/ec2/</a> for more information.
*
* @version Wed Aug 03 10:10:05 PDT 2011
* @version Tue Aug 23 12:47:35 PDT 2011
* @license See the included NOTICE.md file for complete information.
* @copyright See the included NOTICE.md file for complete information.
* @link http://aws.amazon.com/ec2/Amazon Elastic Compute Cloud
Expand Down

0 comments on commit a220e63

Please sign in to comment.