Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor 28 generic s3 #45

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

Refactor 28 generic s3 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
52dcf11
bla
shimonewman Apr 6, 2022
6092942
S3 adapter refactor
shimonewman Apr 7, 2022
2f25d8a
tidy
shimonewman Apr 7, 2022
196d8af
add generic test
shimonewman Apr 7, 2022
8a22dec
changed blackBlase region
shimonewman Apr 27, 2022
687be2f
changed s3 region
shimonewman May 1, 2022
e769380
changed s3 region
shimonewman May 2, 2022
47b6355
test fix
shimonewman May 2, 2022
f30737c
wasabi
shimonewman May 2, 2022
270c875
wasabi test
shimonewman May 2, 2022
8e74e82
wasabi test
shimonewman May 2, 2022
49c9afe
wasabi test
shimonewman May 2, 2022
ab04452
preceding slash fix
shimonewman May 3, 2022
16a82a4
Wasabi
shimonewman May 3, 2022
d53e4b0
remove leading /
shimonewman May 8, 2022
7dee353
run all test
shimonewman May 8, 2022
3d4fbf6
Update src/Storage/Device/Linode.php
shimonewman May 9, 2022
4f6adbd
Switched generic to s3
shimonewman May 10, 2022
de30808
Merge remote-tracking branch 'origin/refactor-28-genericS3' into refa…
shimonewman May 10, 2022
8b4e607
resolve conflict
shimonewman May 10, 2022
50fec00
resolve conflict
shimonewman May 10, 2022
edfcaec
resolve conflict
shimonewman May 10, 2022
d546db8
backblaze storage adapter renaming
shimonewman May 17, 2022
fd571d2
backblaze storage adapter renaming
shimonewman May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/vendor/
/.vscode/
.phpunit.result.cache
tests/chunk.php
tests/chunk.php
/.idea

2 changes: 1 addition & 1 deletion src/Storage/Device.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ abstract public function getRoot(): string;
* Each device hold a complex directory structure that is being build in this method.
*
* @param string $filename
* @param string $prefix
* @param string|null $prefix
*
* @return string
*/
Expand Down
13 changes: 7 additions & 6 deletions src/Storage/Device/BackBlaze.php → src/Storage/Device/Backblaze.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

use Utopia\Storage\Device\S3;

class BackBlaze extends S3

class Backblaze extends S3
{
/**
* Regions constants
Expand All @@ -20,7 +21,7 @@ class BackBlaze extends S3
const EU_CENTRAL_004 = 'eu-central-004';

/**
* BackBlaze Constructor
* Backblaze Constructor
*
* @param string $root
* @param string $accessKey
Expand All @@ -31,23 +32,23 @@ class BackBlaze extends S3
*/
public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::US_WEST_004, string $acl = self::ACL_PRIVATE)
{
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl);
$this->headers['host'] = $bucket . '.' . 's3' . '.' . $region . '.backblazeb2.com';
$hostName = $bucket . '.' . 's3' . '.' . $region . '.backblazeb2.com';
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl, $hostName);
}

/**
* @return string
*/
public function getName(): string
{
return 'BackBlaze B2 Storage';
return 'Backblaze B2 Storage';
}

/**
* @return string
*/
public function getDescription(): string
{
return 'BackBlaze B2 Storage';
return 'Backblaze B2 Storage';
}
}
5 changes: 3 additions & 2 deletions src/Storage/Device/DOSpaces.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Utopia\Storage\Device\S3;


class DOSpaces extends S3
{
/**
Expand All @@ -29,8 +30,8 @@ class DOSpaces extends S3
*/
public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::NYC3, string $acl = self::ACL_PRIVATE)
{
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl);
$this->headers['host'] = $bucket . '.' . $region . '.digitaloceanspaces.com';
$hostName = $bucket . '.' . $region . '.digitaloceanspaces.com';
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl, $hostName);
}

/**
Expand Down
13 changes: 7 additions & 6 deletions src/Storage/Device/Linode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@

use Utopia\Storage\Device\S3;


class Linode extends S3
{
/**
* Regions constants
*
*/
const EU_CENTRAL_1='eu-central-1';
const US_SOUTHEAST_1='us-southeast-1';
const US_EAST_1='us-east-1';
const AP_SOUTH_1='ap-south-1';
const EU_CENTRAL_1 = 'eu-central-1';
const US_SOUTHEAST_1 = 'us-southeast-1';
const US_EAST_1 = 'us-east-1';
const AP_SOUTH_1 = 'ap-south-1';


/**
Expand All @@ -28,8 +29,8 @@ class Linode extends S3
*/
public function __construct(string $root, string $accessKey, string $secretKey, string $bucket, string $region = self::EU_CENTRAL_1, string $acl = self::ACL_PRIVATE)
{
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl);
$this->headers['host'] = $bucket.'.'.$region.'.'.'linodeobjects.com';
$hostName = $bucket.'.'.$region.'.linodeobjects.com';
parent::__construct($root, $accessKey, $secretKey, $bucket, $region, $acl, $hostName);
}

/**
Expand Down
Loading