D8311.id19762.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8311.id19762.diff
View Options

	Index: src/future/aws/PhutilAWSEC2Future.php
	===================================================================
	--- src/future/aws/PhutilAWSEC2Future.php
	+++ src/future/aws/PhutilAWSEC2Future.php
	@@ -5,9 +5,8 @@
	*/
	final class PhutilAWSEC2Future extends PhutilAWSFuture {

	- public function getHost() {
	- return 'ec2.us-west-1.amazonaws.com';
	+ public function getServiceName() {
	+ return 'ec2';
	}

	}
	-
	Index: src/future/aws/PhutilAWSFuture.php
	===================================================================
	--- src/future/aws/PhutilAWSFuture.php
	+++ src/future/aws/PhutilAWSFuture.php
	@@ -8,10 +8,11 @@
	private $future;
	private $awsAccessKey;
	private $awsPrivateKey;
	+ private $awsRegion;
	private $builtRequest;
	private $params;

	- abstract public function getHost();
	+ abstract public function getServiceName();

	public function __construct() {
	parent::__construct(null);
	@@ -31,16 +32,26 @@
	return $this->awsPrivateKey;
	}

	+ public function getAWSRegion() {
	+ return $this->awsRegion;
	+ }
	+
	+ public function setAWSRegion($region) {
	+ $this->awsRegion = $region;
	+ return $this;
	+ }
	+
	+ public function getHost() {
	+ $host = $this->getServiceName().'.'.$this->awsRegion.'.amazonaws.com';
	+ return $host;
	+ }
	+
	public function setRawAWSQuery($action, array $params = array()) {
	$this->params = $params;
	$this->params['Action'] = $action;
	return $this;
	}

	- public function getAWSKeys() {
	- return $this->AWSKeys;
	- }
	-
	protected function getProxiedFuture() {
	if (!$this->future) {
	$params = $this->params;