Page MenuHomePhabricator

D18575.diff
No OneTemporary

D18575.diff

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -90,6 +90,7 @@
'Phobject' => 'object/Phobject.php',
'PhobjectTestCase' => 'object/__tests__/PhobjectTestCase.php',
'PhutilAPCKeyValueCache' => 'cache/PhutilAPCKeyValueCache.php',
+ 'PhutilAWSCloudFormationFuture' => 'future/aws/PhutilAWSCloudFormationFuture.php',
'PhutilAWSEC2Future' => 'future/aws/PhutilAWSEC2Future.php',
'PhutilAWSException' => 'future/aws/PhutilAWSException.php',
'PhutilAWSFuture' => 'future/aws/PhutilAWSFuture.php',
@@ -695,6 +696,7 @@
'Phobject' => 'Iterator',
'PhobjectTestCase' => 'PhutilTestCase',
'PhutilAPCKeyValueCache' => 'PhutilKeyValueCache',
+ 'PhutilAWSCloudFormationFuture' => 'PhutilAWSFuture',
'PhutilAWSEC2Future' => 'PhutilAWSFuture',
'PhutilAWSException' => 'Exception',
'PhutilAWSFuture' => 'FutureProxy',
diff --git a/src/future/aws/PhutilAWSCloudFormationFuture.php b/src/future/aws/PhutilAWSCloudFormationFuture.php
new file mode 100644
--- /dev/null
+++ b/src/future/aws/PhutilAWSCloudFormationFuture.php
@@ -0,0 +1,20 @@
+<?php
+
+final class PhutilAWSCloudFormationFuture extends PhutilAWSFuture {
+
+ private $parameters = array();
+
+ public function setParameters($parameters) {
+ $this->parameters = $parameters;
+ return $this;
+ }
+
+ protected function getParameters() {
+ return $this->parameters;
+ }
+
+ public function getServiceName() {
+ return 'cloudformation';
+ }
+
+}
diff --git a/src/future/aws/PhutilAWSException.php b/src/future/aws/PhutilAWSException.php
--- a/src/future/aws/PhutilAWSException.php
+++ b/src/future/aws/PhutilAWSException.php
@@ -16,17 +16,23 @@
$desc[] = pht('AWS Request Failed');
$desc[] = pht('HTTP Status Code: %d', $http_status);
+ $found_error = false;
if ($this->requestID) {
$desc[] = pht('AWS Request ID: %s', $this->requestID);
$errors = idx($params, 'Errors');
+
if ($errors) {
$desc[] = pht('AWS Errors:');
foreach ($errors as $error) {
list($code, $message) = $error;
+ if ($code) {
+ $found_error = true;
+ }
$desc[] = " - {$code}: {$message}\n";
}
}
- } else {
+ }
+ if (!$found_error) {
$desc[] = pht('Response Body: %s', idx($params, 'body'));
}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 6:08 PM (14 h, 1 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7123086
Default Alt Text
D18575.diff (2 KB)

Event Timeline