Merge pull request #14 from heskymatic/master

Read region from config when init s3 bucket
schickling · Dec 13, 2015 · e60b427 · e60b427
2 parents ecbaa95 + d902d83
commit e60b427
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/GitS3/Console/Application.php b/src/GitS3/Console/Application.php
@@ -79,7 +79,7 @@ private function getCurrentHash()
 
 	private function initBucket()
 	{
-		$this->bucket = new Bucket($this->config->getKey(), $this->config->getSecret(), $this->config->getBucket());
+		$this->bucket = new Bucket($this->config->getKey(), $this->config->getSecret(), $this->config->getBucket(), $this->config->getRegion());
 	}
 
 	private function initRepository()

diff --git a/src/GitS3/Wrapper/Bucket.php b/src/GitS3/Wrapper/Bucket.php
@@ -12,7 +12,7 @@ class Bucket
 	private $client;
 	private $name;
 
-	public function __construct($key, $secret, $name)
+	public function __construct($key, $secret, $name, $region = 'eu-west-1')
 	{
 		$this->name = $name;
 
@@ -22,11 +22,14 @@ public function __construct($key, $secret, $name)
 
 		//If keys are not valid, try a role.
 		if(!$validKey || !$validSecret)
-			$this->client = S3Client::factory(array());
+			$this->client = S3Client::factory(array(
+				'region' => $region,
+			));
 		else
 			$this->client = S3Client::factory(array(
-				'key'		=> $key,
-				'secret'	=> $secret,
+				'key'    => $key,
+				'secret' => $secret,
+				'region' => $region,
 			));
 	}
 

diff --git a/tests/Console/ApplicationTest.php b/tests/Console/ApplicationTest.php
@@ -45,6 +45,7 @@ public function testGetBucket()
 		$this->configMock->shouldReceive('getKey')->once();
 		$this->configMock->shouldReceive('getSecret')->once();
 		$this->configMock->shouldReceive('getBucket')->once();
+		$this->configMock->shouldReceive('getRegion')->once();
 
 		$this->assertInstanceOf('GitS3\Wrapper\Bucket', $this->application->getBucket());
 	}