extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 08:23:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

s3: Fix Arvancloud Domain and region changes and alphabetise the provider

Browse Source
This commit is contained in:
Ehsan Tadayon 2023-06-17 15:17:23 +03:30 committed by Nick Craig-Wood
parent 998d1d1727
commit 2dd2072cdb
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -25,12 +25,12 @@ Rclone *("rsync for cloud storage")* is a command-line program to sync files and
* Alibaba Cloud (Aliyun) Object Storage System (OSS) [:page_facing_up:](https://rclone.org/s3/#alibaba-oss) * Alibaba Cloud (Aliyun) Object Storage System (OSS) [:page_facing_up:](https://rclone.org/s3/#alibaba-oss)
* Amazon Drive [:page_facing_up:](https://rclone.org/amazonclouddrive/) ([See note](https://rclone.org/amazonclouddrive/#status)) * Amazon Drive [:page_facing_up:](https://rclone.org/amazonclouddrive/) ([See note](https://rclone.org/amazonclouddrive/#status))
* Amazon S3 [:page_facing_up:](https://rclone.org/s3/) * Amazon S3 [:page_facing_up:](https://rclone.org/s3/)
* ArvanCloud Object Storage (AOS) [:page_facing_up:](https://rclone.org/s3/#arvan-cloud-object-storage-aos)
* Backblaze B2 [:page_facing_up:](https://rclone.org/b2/) * Backblaze B2 [:page_facing_up:](https://rclone.org/b2/)
* Box [:page_facing_up:](https://rclone.org/box/) * Box [:page_facing_up:](https://rclone.org/box/)
* Ceph [:page_facing_up:](https://rclone.org/s3/#ceph) * Ceph [:page_facing_up:](https://rclone.org/s3/#ceph)
* China Mobile Ecloud Elastic Object Storage (EOS) [:page_facing_up:](https://rclone.org/s3/#china-mobile-ecloud-eos) * China Mobile Ecloud Elastic Object Storage (EOS) [:page_facing_up:](https://rclone.org/s3/#china-mobile-ecloud-eos)
* Cloudflare R2 [:page_facing_up:](https://rclone.org/s3/#cloudflare-r2) * Cloudflare R2 [:page_facing_up:](https://rclone.org/s3/#cloudflare-r2)
* Arvan Cloud Object Storage (AOS) [:page_facing_up:](https://rclone.org/s3/#arvan-cloud-object-storage-aos)
* Citrix ShareFile [:page_facing_up:](https://rclone.org/sharefile/) * Citrix ShareFile [:page_facing_up:](https://rclone.org/sharefile/)
* DigitalOcean Spaces [:page_facing_up:](https://rclone.org/s3/#digitalocean-spaces) * DigitalOcean Spaces [:page_facing_up:](https://rclone.org/s3/#digitalocean-spaces)
* Digi Storage [:page_facing_up:](https://rclone.org/koofr/#digi-storage) * Digi Storage [:page_facing_up:](https://rclone.org/koofr/#digi-storage)

34
backend/s3/s3.go
View File

@ -66,7 +66,7 @@ import (
func init() { func init() {
fs.Register(&fs.RegInfo{ fs.Register(&fs.RegInfo{
Name: "s3", Name: "s3",
Description: "Amazon S3 Compliant Storage Providers including AWS, Alibaba, Ceph, China Mobile, Cloudflare, GCS, ArvanCloud, DigitalOcean, Dreamhost, Huawei OBS, IBM COS, IDrive e2, IONOS Cloud, Liara, Lyve Cloud, Minio, Netease, Petabox, RackCorp, Scaleway, SeaweedFS, StackPath, Storj, Tencent COS, Qiniu and Wasabi", Description: "Amazon S3 Compliant Storage Providers including AWS, Alibaba, ArvanCloud, Ceph, China Mobile, Cloudflare, GCS, DigitalOcean, Dreamhost, Huawei OBS, IBM COS, IDrive e2, IONOS Cloud, Liara, Lyve Cloud, Minio, Netease, Petabox, RackCorp, Scaleway, SeaweedFS, StackPath, Storj, Tencent COS, Qiniu and Wasabi",
NewFs: NewFs, NewFs: NewFs,
CommandHelp: commandHelp, CommandHelp: commandHelp,
Config: func(ctx context.Context, name string, m configmap.Mapper, config fs.ConfigIn) (*fs.ConfigOut, error) { Config: func(ctx context.Context, name string, m configmap.Mapper, config fs.ConfigIn) (*fs.ConfigOut, error) {
@ -91,6 +91,9 @@ func init() {
}, { }, {
Value: "Alibaba", Value: "Alibaba",
Help: "Alibaba Cloud Object Storage System (OSS) formerly Aliyun", Help: "Alibaba Cloud Object Storage System (OSS) formerly Aliyun",
}, {
Value: "ArvanCloud",
Help: "Arvan Cloud Object Storage (AOS)",
}, { }, {
Value: "Ceph", Value: "Ceph",
Help: "Ceph Object Storage", Help: "Ceph Object Storage",
@ -100,9 +103,6 @@ func init() {
}, { }, {
Value: "Cloudflare", Value: "Cloudflare",
Help: "Cloudflare R2 Storage", Help: "Cloudflare R2 Storage",
}, {
Value: "ArvanCloud",
Help: "Arvan Cloud Object Storage (AOS)",
}, { }, {
Value: "DigitalOcean", Value: "DigitalOcean",
Help: "DigitalOcean Spaces", Help: "DigitalOcean Spaces",
@ -466,7 +466,7 @@ func init() {
}, { }, {
Name: "region", Name: "region",
Help: "Region to connect to.\n\nLeave blank if you are using an S3 clone and you don't have a region.", Help: "Region to connect to.\n\nLeave blank if you are using an S3 clone and you don't have a region.",
Provider: "!AWS,Alibaba,ChinaMobile,Cloudflare,IONOS,Petabox,ArvanCloud,Liara,Qiniu,RackCorp,Scaleway,Storj,TencentCOS,HuaweiOBS,IDrive", Provider: "!AWS,Alibaba,ArvanCloud,ChinaMobile,Cloudflare,IONOS,Petabox,Liara,Qiniu,RackCorp,Scaleway,Storj,TencentCOS,HuaweiOBS,IDrive",
Examples: []fs.OptionExample{{ Examples: []fs.OptionExample{{
Value: "", Value: "",
Help: "Use this if unsure.\nWill use v4 signatures and an empty region.", Help: "Use this if unsure.\nWill use v4 signatures and an empty region.",
@ -575,15 +575,15 @@ func init() {
Help: "Anhui China (Huainan)", Help: "Anhui China (Huainan)",
}}, }},
}, { }, {
// ArvanCloud endpoints: https://www.arvancloud.com/en/products/cloud-storage // ArvanCloud endpoints: https://www.arvancloud.ir/en/products/cloud-storage
Name: "endpoint", Name: "endpoint",
Help: "Endpoint for Arvan Cloud Object Storage (AOS) API.", Help: "Endpoint for Arvan Cloud Object Storage (AOS) API.",
Provider: "ArvanCloud", Provider: "ArvanCloud",
Examples: []fs.OptionExample{{ Examples: []fs.OptionExample{{
Value: "s3.ir-thr-at1.arvanstorage.com", Value: "s3.ir-thr-at1.arvanstorage.ir",
Help: "The default endpoint - a good choice if you are unsure.\nTehran Iran (Asiatech)", Help: "The default endpoint - a good choice if you are unsure.\nTehran Iran (Simin)",
}, { }, {
Value: "s3.ir-tbz-sh1.arvanstorage.com", Value: "s3.ir-tbz-sh1.arvanstorage.ir",
Help: "Tabriz Iran (Shahriar)", Help: "Tabriz Iran (Shahriar)",
}}, }},
}, { }, {
@ -1156,7 +1156,7 @@ func init() {
}, { }, {
Name: "endpoint", Name: "endpoint",
Help: "Endpoint for S3 API.\n\nRequired when using an S3 clone.", Help: "Endpoint for S3 API.\n\nRequired when using an S3 clone.",
Provider: "!AWS,IBMCOS,IDrive,IONOS,TencentCOS,HuaweiOBS,Alibaba,ChinaMobile,GCS,Liara,ArvanCloud,Scaleway,StackPath,Storj,RackCorp,Qiniu,Petabox", Provider: "!AWS,ArvanCloud,IBMCOS,IDrive,IONOS,TencentCOS,HuaweiOBS,Alibaba,ChinaMobile,GCS,Liara,Scaleway,StackPath,Storj,RackCorp,Qiniu,Petabox",
Examples: []fs.OptionExample{{ Examples: []fs.OptionExample{{
Value: "objects-us-east-1.dream.io", Value: "objects-us-east-1.dream.io",
Help: "Dream Objects endpoint", Help: "Dream Objects endpoint",
@ -1258,8 +1258,12 @@ func init() {
Help: "Liara Iran endpoint", Help: "Liara Iran endpoint",
Provider: "Liara", Provider: "Liara",
}, { }, {
Value: "s3.ir-thr-at1.arvanstorage.com", Value: "s3.ir-thr-at1.arvanstorage.ir",
Help: "ArvanCloud Tehran Iran (Asiatech) endpoint", Help: "ArvanCloud Tehran Iran (Simin) endpoint",
Provider: "ArvanCloud",
}, {
Value: "s3.ir-tbz-sh1.arvanstorage.ir",
Help: "ArvanCloud Tabriz Iran (Shahriar) endpoint",
Provider: "ArvanCloud", Provider: "ArvanCloud",
}}, }},
}, { }, {
@ -1443,7 +1447,7 @@ func init() {
Provider: "ArvanCloud", Provider: "ArvanCloud",
Examples: []fs.OptionExample{{ Examples: []fs.OptionExample{{
Value: "ir-thr-at1", Value: "ir-thr-at1",
Help: "Tehran Iran (Asiatech)", Help: "Tehran Iran (Simin)",
}, { }, {
Value: "ir-tbz-sh1", Value: "ir-tbz-sh1",
Help: "Tabriz Iran (Shahriar)", Help: "Tabriz Iran (Shahriar)",
@ -1640,7 +1644,7 @@ func init() {
}, { }, {
Name: "location_constraint", Name: "location_constraint",
Help: "Location constraint - must be set to match the Region.\n\nLeave blank if not sure. Used when creating buckets only.", Help: "Location constraint - must be set to match the Region.\n\nLeave blank if not sure. Used when creating buckets only.",
Provider: "!AWS,Alibaba,HuaweiOBS,ChinaMobile,Cloudflare,IBMCOS,IDrive,IONOS,Liara,ArvanCloud,Qiniu,RackCorp,Scaleway,StackPath,Storj,TencentCOS,Petabox", Provider: "!AWS,Alibaba,ArvanCloud,HuaweiOBS,ChinaMobile,Cloudflare,IBMCOS,IDrive,IONOS,Liara,Qiniu,RackCorp,Scaleway,StackPath,Storj,TencentCOS,Petabox",
}, { }, {
Name: "acl", Name: "acl",
Help: `Canned ACL used when creating buckets and storing or copying objects. Help: `Canned ACL used when creating buckets and storing or copying objects.
@ -1883,7 +1887,7 @@ If you leave it blank, this is calculated automatically from the sse_customer_ke
Help: "Standard storage class", Help: "Standard storage class",
}}, }},
}, { }, {
// Mapping from here: https://www.arvancloud.com/en/products/cloud-storage // Mapping from here: https://www.arvancloud.ir/en/products/cloud-storage
Name: "storage_class", Name: "storage_class",
Help: "The storage class to use when storing new objects in ArvanCloud.", Help: "The storage class to use when storing new objects in ArvanCloud.",
Provider: "ArvanCloud", Provider: "ArvanCloud",

2
docs/content/_index.md
View File

@ -113,7 +113,7 @@ WebDAV or S3, that work out of the box.)
{{< provider name="Box" home="https://www.box.com/" config="/box/" >}} {{< provider name="Box" home="https://www.box.com/" config="/box/" >}}
{{< provider name="Ceph" home="http://ceph.com/" config="/s3/#ceph" >}} {{< provider name="Ceph" home="http://ceph.com/" config="/s3/#ceph" >}}
{{< provider name="China Mobile Ecloud Elastic Object Storage (EOS)" home="https://ecloud.10086.cn/home/product-introduction/eos/" config="/s3/#china-mobile-ecloud-eos" >}} {{< provider name="China Mobile Ecloud Elastic Object Storage (EOS)" home="https://ecloud.10086.cn/home/product-introduction/eos/" config="/s3/#china-mobile-ecloud-eos" >}}
{{< provider name="Arvan Cloud Object Storage (AOS)" home="https://www.arvancloud.com/en/products/cloud-storage" config="/s3/#arvan-cloud-object-storage-aos" >}} {{< provider name="Arvan Cloud Object Storage (AOS)" home="https://www.arvancloud.ir/en/products/cloud-storage" config="/s3/#arvan-cloud-object-storage-aos" >}}
{{< provider name="Citrix ShareFile" home="http://sharefile.com/" config="/sharefile/" >}} {{< provider name="Citrix ShareFile" home="http://sharefile.com/" config="/sharefile/" >}}
{{< provider name="Cloudflare R2" home="https://blog.cloudflare.com/r2-open-beta/" config="/s3/#cloudflare-r2" >}} {{< provider name="Cloudflare R2" home="https://blog.cloudflare.com/r2-open-beta/" config="/s3/#cloudflare-r2" >}}
{{< provider name="DigitalOcean Spaces" home="https://www.digitalocean.com/products/object-storage/" config="/s3/#digitalocean-spaces" >}} {{< provider name="DigitalOcean Spaces" home="https://www.digitalocean.com/products/object-storage/" config="/s3/#digitalocean-spaces" >}}

2
docs/content/authors.md
View File

@ -587,7 +587,7 @@ put them back in again.` >}}
* Leroy van Logchem <lr.vanlogchem@gmail.com> * Leroy van Logchem <lr.vanlogchem@gmail.com>
* Zsolt Ero <zsolt.ero@gmail.com> * Zsolt Ero <zsolt.ero@gmail.com>
* Lesmiscore <nao20010128@gmail.com> * Lesmiscore <nao20010128@gmail.com>
* ehsantdy <ehsan.tadayon@arvancloud.com> * ehsantdy <ehsan.tadayon@arvancloud.com> <ehsantadayon85@gmail.com>
* SwazRGB <65694696+swazrgb@users.noreply.github.com> * SwazRGB <65694696+swazrgb@users.noreply.github.com>
* Mateusz Puczyński <mati6095@gmail.com> * Mateusz Puczyński <mati6095@gmail.com>
* Michael C Tiernan - MIT-Research Computing Project <mtiernan@mit.edu> * Michael C Tiernan - MIT-Research Computing Project <mtiernan@mit.edu>