From 5e28b9345e33b9a828f56a677eb2445a7dfbf104 Mon Sep 17 00:00:00 2001 From: Ryan Parman Date: Wed, 9 Nov 2011 15:45:37 -0800 Subject: [PATCH] 1.4.7 release. https://aws.amazon.com/releasenotes/PHP/1407995226377381 --- _docs/CHANGELOG.md | 50 +++++++++++++++++++++++++++++++ package.xml | 16 +++++----- sdk.class.php | 4 +-- services/as.class.php | 23 ++++++++------ services/cloudformation.class.php | 23 ++++++++------ services/cloudwatch.class.php | 34 +++++++++++++-------- services/ec2.class.php | 34 +++++++++++++-------- services/elb.class.php | 23 ++++++++------ services/emr.class.php | 29 ++++++++++-------- services/iam.class.php | 5 ++++ services/rds.class.php | 23 ++++++++------ services/s3.class.php | 26 +++++++++------- services/sdb.class.php | 23 ++++++++------ services/sns.class.php | 23 ++++++++------ services/sqs.class.php | 5 ++++ 15 files changed, 231 insertions(+), 110 deletions(-) diff --git a/_docs/CHANGELOG.md b/_docs/CHANGELOG.md index 00fb7ef..66a32b3 100644 --- a/_docs/CHANGELOG.md +++ b/_docs/CHANGELOG.md @@ -1,3 +1,53 @@ +# Changelog: 1.4.7 "Yuna" + + +Launched Wednesday, November 9, 2011 + +## Service Classes +### AmazonAS +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonCloudFormation +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonCloudWatch +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. +* **New:** Support for the US GovCloud region has been added to the SDK. + +### AmazonEC2 +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. +* **New:** Support for the US GovCloud region has been added to the SDK. + +### AmazonELB +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonEMR +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonIAM +* **New:** Support for the US GovCloud region has been added to the SDK. + +### AmazonRDS +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonS3 +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. +* **Fixed:** Resolved an issue where certain bits of metadata were not maintained during a copy operation. +* **Fixed:** Resolved an issue where an unsuccessful lookup of an existing content-type would throw a warning. +* **Fixed:** Resolved an issue where an exception would be thrown when a filesize lookup was attempted on an object that didn't exist. + +### AmazonSDB +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonSNS +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + +### AmazonSQS +* **New:** Support for the US-West 2 (Oregon) region has been added to the SDK. + + +---- + # Changelog: 1.4.6 "Xezat" diff --git a/package.xml b/package.xml index 9822e76..edd2dc4 100644 --- a/package.xml +++ b/package.xml @@ -10,11 +10,11 @@ rparman@amazon.com yes - 2011-11-03 - + 2011-11-09 + - 1.4.6 - 1.4.6 + 1.4.7 + 1.4.7 stable @@ -23,7 +23,7 @@ Apache 2.0 - - + @@ -39,14 +39,14 @@ - 1.4.6 - 1.4.6 + 1.4.7 + 1.4.7 stable stable - 2011-11-03 + 2011-11-09 Apache 2.0 - diff --git a/sdk.class.php b/sdk.class.php index 1f63f82..3c2d5b4 100644 --- a/sdk.class.php +++ b/sdk.class.php @@ -125,9 +125,9 @@ function __aws_sdk_ua_callback() // INTERMEDIARY CONSTANTS define('CFRUNTIME_NAME', 'aws-sdk-php'); -define('CFRUNTIME_VERSION', '1.4.6'); +define('CFRUNTIME_VERSION', '1.4.7'); // define('CFRUNTIME_BUILD', gmdate('YmdHis', filemtime(__FILE__))); // @todo: Hardcode for release. -define('CFRUNTIME_BUILD', '20111103191027'); +define('CFRUNTIME_BUILD', '20111109191027'); 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()); diff --git a/services/as.class.php b/services/as.class.php index 7b43297..a3b20d8 100644 --- a/services/as.class.php +++ b/services/as.class.php @@ -51,35 +51,40 @@ class AmazonAS extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'autoscaling.us-east-1.amazonaws.com'; + const REGION_US_E1 = 'autoscaling.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'autoscaling.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'autoscaling.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'autoscaling.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'autoscaling.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'autoscaling.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'autoscaling.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/cloudformation.class.php b/services/cloudformation.class.php index 2124240..7fc2567 100644 --- a/services/cloudformation.class.php +++ b/services/cloudformation.class.php @@ -61,35 +61,40 @@ class AmazonCloudFormation extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'cloudformation.us-east-1.amazonaws.com'; + const REGION_US_E1 = 'cloudformation.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'cloudformation.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'cloudformation.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'cloudformation.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'cloudformation.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'cloudformation.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'cloudformation.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/cloudwatch.class.php b/services/cloudwatch.class.php index 7d03a82..6f6de04 100644 --- a/services/cloudwatch.class.php +++ b/services/cloudwatch.class.php @@ -60,34 +60,44 @@ class AmazonCloudWatch extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'monitoring.amazonaws.com'; + const REGION_US_E1 = 'monitoring.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = 'us-east-1'; + const REGION_US_W1 = 'monitoring.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'us-west-1'; + const REGION_US_W2 = 'monitoring.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ - const REGION_EU_W1 = 'eu-west-1'; + const REGION_EU_W1 = 'monitoring.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ - const REGION_APAC_SE1 = 'ap-southeast-1'; + const REGION_APAC_SE1 = 'monitoring.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ - const REGION_APAC_NE1 = 'ap-northeast-1'; + const REGION_APAC_NE1 = 'monitoring.ap-northeast-1.amazonaws.com'; + + /** + * Specify the queue URL for the United States GovCloud Region. + */ + const REGION_US_GOV1 = 'monitoring.us-gov-west-1.amazonaws.com'; + + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; /*%******************************************************************************************%*/ diff --git a/services/ec2.class.php b/services/ec2.class.php index 5d0af7d..af06166 100644 --- a/services/ec2.class.php +++ b/services/ec2.class.php @@ -40,34 +40,44 @@ class AmazonEC2 extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'ec2.amazonaws.com'; + const REGION_US_E1 = 'ec2.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = 'us-east-1'; + const REGION_US_W1 = 'ec2.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'us-west-1'; + const REGION_US_W2 = 'ec2.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ - const REGION_EU_W1 = 'eu-west-1'; + const REGION_EU_W1 = 'ec2.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ - const REGION_APAC_SE1 = 'ap-southeast-1'; + const REGION_APAC_SE1 = 'ec2.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ - const REGION_APAC_NE1 = 'ap-northeast-1'; + const REGION_APAC_NE1 = 'ec2.ap-northeast-1.amazonaws.com'; + + /** + * Specify the queue URL for the United States GovCloud Region. + */ + const REGION_US_GOV1 = 'ec2.us-gov-west-1.amazonaws.com'; + + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; /** * The "pending" state code of an EC2 instance. Useful for conditionals. diff --git a/services/elb.class.php b/services/elb.class.php index 1c12351..6c419ba 100644 --- a/services/elb.class.php +++ b/services/elb.class.php @@ -34,35 +34,40 @@ class AmazonELB extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'elasticloadbalancing.us-east-1.amazonaws.com'; + const REGION_US_E1 = 'elasticloadbalancing.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'elasticloadbalancing.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'elasticloadbalancing.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'elasticloadbalancing.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'elasticloadbalancing.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'elasticloadbalancing.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'elasticloadbalancing.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/emr.class.php b/services/emr.class.php index 62db9cb..242374d 100644 --- a/services/emr.class.php +++ b/services/emr.class.php @@ -36,34 +36,39 @@ class AmazonEMR extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'us-east-1.elasticmapreduce.amazonaws.com'; + const REGION_US_E1 = 'elasticmapreduce.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'elasticmapreduce.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'us-west-1.elasticmapreduce.amazonaws.com'; + const REGION_US_W2 = 'elasticmapreduce.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ - const REGION_EU_W1 = 'eu-west-1.elasticmapreduce.amazonaws.com'; + const REGION_EU_W1 = 'elasticmapreduce.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ - const REGION_APAC_SE1 = 'ap-southeast-1.elasticmapreduce.amazonaws.com'; + const REGION_APAC_SE1 = 'elasticmapreduce.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ - const REGION_APAC_NE1 = 'ap-northeast-1.elasticmapreduce.amazonaws.com'; + const REGION_APAC_NE1 = 'elasticmapreduce.ap-northeast-1.amazonaws.com'; + + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; /*%******************************************************************************************%*/ diff --git a/services/iam.class.php b/services/iam.class.php index 35278ec..1e8ed70 100644 --- a/services/iam.class.php +++ b/services/iam.class.php @@ -51,6 +51,11 @@ class AmazonIAM extends CFRuntime */ const REGION_US_E1 = 'iam.amazonaws.com'; + /** + * Specify the queue URL for the United States GovCloud Region. + */ + const REGION_US_GOV1 = 'iam.us-gov.amazonaws.com'; + /** * Default service endpoint. */ diff --git a/services/rds.class.php b/services/rds.class.php index 6d67667..531d92c 100644 --- a/services/rds.class.php +++ b/services/rds.class.php @@ -40,35 +40,40 @@ class AmazonRDS extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'rds.us-east-1.amazonaws.com'; + const REGION_US_E1 = 'rds.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'rds.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'rds.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'rds.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'rds.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'rds.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'rds.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/s3.class.php b/services/s3.class.php index f0ebcc9..f9adc8b 100644 --- a/services/s3.class.php +++ b/services/s3.class.php @@ -49,7 +49,7 @@ class S3_Exception extends Exception {} * * Visit for more information. * - * @version 2011.05.18 + * @version 2011.11.09 * @license See the included NOTICE.md file for more information. * @copyright See the included NOTICE.md file for more information. * @link http://aws.amazon.com/s3/ Amazon Simple Storage Service @@ -75,6 +75,11 @@ class AmazonS3 extends CFRuntime */ const REGION_US_W1 = 'us-west-1'; + /** + * Specify the queue URL for the US-West (Oregon) Region. + */ + const REGION_US_W2 = 'us-west-2'; + /** * Specify the queue URL for the EU (Ireland) Region. */ @@ -1450,11 +1455,7 @@ public function copy_object($source, $dest, $opt = null) } // Handle metadata directive - $opt['headers']['x-amz-metadata-directive'] = 'COPY'; - if ($source['bucket'] === $dest['bucket'] && $source['filename'] === $dest['filename']) - { - $opt['headers']['x-amz-metadata-directive'] = 'REPLACE'; - } + $opt['headers']['x-amz-metadata-directive'] = 'REPLACE'; if (isset($opt['metadataDirective'])) { $opt['headers']['x-amz-metadata-directive'] = $opt['metadataDirective']; @@ -1936,7 +1937,7 @@ public function get_bucket_object_count($bucket) * * @param string $bucket (Required) The name of the bucket to use. * @param boolean $friendly_format (Optional) A value of true will format the return value to 2 decimal points using the largest possible unit (i.e., 3.42 GB). A value of false will format the return value as the raw number of bytes. - * @return integer|string The number of bytes as an integer, or the friendly format as a string. + * @return integer|string The number of bytes as an integer, or the friendly format as a string. If the bucket does not exist, the filesize will be 0. */ public function get_bucket_filesize($bucket, $friendly_format = false) { @@ -1980,7 +1981,7 @@ public function get_bucket_filesize($bucket, $friendly_format = false) * @param string $bucket (Required) The name of the bucket to use. * @param string $filename (Required) The file name for the object. * @param boolean $friendly_format (Optional) A value of true will format the return value to 2 decimal points using the largest possible unit (i.e., 3.42 GB). A value of false will format the return value as the raw number of bytes. - * @return integer|string The number of bytes as an integer, or the friendly format as a string. + * @return integer|string The number of bytes as an integer, or the friendly format as a string. If the object does not exist, the filesize will be 0. */ public function get_object_filesize($bucket, $filename, $friendly_format = false) { @@ -1989,8 +1990,13 @@ public function get_object_filesize($bucket, $filename, $friendly_format = false throw new S3_Exception(__FUNCTION__ . '() cannot be batch requested'); } + $filesize = 0; $object = $this->get_object_headers($bucket, $filename); - $filesize = (integer) $object->header['content-length']; + + if (isset($object->header['content-length'])) + { + $filesize = (integer) $object->header['content-length']; + } if ($friendly_format) { @@ -2352,7 +2358,7 @@ public function get_object_metadata($bucket, $filename, $opt = null) ); // Add the content type - $data['ContentType'] = (string) $response[1]->header['content-type']; + $data['ContentType'] = isset($response[1]->header['content-type']) ? (string) $response[1]->header['content-type'] : ''; // Add the other metadata (including storage type) $contents = json_decode(json_encode($response[2]->body->query('descendant-or-self::Contents')->first()), true); diff --git a/services/sdb.class.php b/services/sdb.class.php index 3cc977b..dc13818 100644 --- a/services/sdb.class.php +++ b/services/sdb.class.php @@ -44,35 +44,40 @@ class AmazonSDB extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'sdb.amazonaws.com'; + const REGION_US_E1 = 'sdb.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'sdb.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'sdb.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'sdb.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'sdb.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'sdb.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'sdb.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/sns.class.php b/services/sns.class.php index 68dd171..c897294 100644 --- a/services/sns.class.php +++ b/services/sns.class.php @@ -30,35 +30,40 @@ class AmazonSNS extends CFRuntime // CLASS CONSTANTS /** - * Specify the default queue URL. + * Specify the queue URL for the United States East (Northern Virginia) Region. */ - const DEFAULT_URL = 'sns.us-east-1.amazonaws.com'; + const REGION_US_E1 = 'sns.us-east-1.amazonaws.com'; /** - * Specify the queue URL for the US-East (Northern Virginia) Region. + * Specify the queue URL for the United States West (Northern California) Region. */ - const REGION_US_E1 = self::DEFAULT_URL; + const REGION_US_W1 = 'sns.us-west-1.amazonaws.com'; /** - * Specify the queue URL for the US-West (Northern California) Region. + * Specify the queue URL for the United States West (Oregon) Region. */ - const REGION_US_W1 = 'sns.us-west-1.amazonaws.com'; + const REGION_US_W2 = 'sns.us-west-2.amazonaws.com'; /** - * Specify the queue URL for the EU (Ireland) Region. + * Specify the queue URL for the Europe West (Ireland) Region. */ const REGION_EU_W1 = 'sns.eu-west-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Singapore) Region. + * Specify the queue URL for the Asia Pacific Southeast (Singapore) Region. */ const REGION_APAC_SE1 = 'sns.ap-southeast-1.amazonaws.com'; /** - * Specify the queue URL for the Asia Pacific (Japan) Region. + * Specify the queue URL for the Asia Pacific Northeast (Tokyo) Region. */ const REGION_APAC_NE1 = 'sns.ap-northeast-1.amazonaws.com'; + /** + * Default service endpoint. + */ + const DEFAULT_URL = self::REGION_US_E1; + /*%******************************************************************************************%*/ // SETTERS diff --git a/services/sqs.class.php b/services/sqs.class.php index 36855a7..a1be6c4 100644 --- a/services/sqs.class.php +++ b/services/sqs.class.php @@ -51,6 +51,11 @@ class AmazonSQS extends CFRuntime */ const REGION_US_W1 = 'sqs.us-west-1.amazonaws.com'; + /** + * Specify the queue URL for the United States West (Oregon) Region. + */ + const REGION_US_W2 = 'sqs.us-west-2.amazonaws.com'; + /** * Specify the queue URL for the Europe West (Ireland) Region. */