Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Juicedata
JuiceFS
提交
995edd31
JuiceFS
项目概览
Juicedata
/
JuiceFS
通知
10
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
JuiceFS
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
995edd31
编写于
12月 21, 2020
作者:
C
chnliyong
提交者:
Davies Liu
1月 28, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add support for s3 compatible storage using scheme s3:// (#85)
上级
c94df2b1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
37 addition
and
16 deletion
+37
-16
object/s3.go
object/s3.go
+37
-16
未找到文件。
object/s3.go
浏览文件 @
995edd31
...
...
@@ -261,28 +261,45 @@ func newS3(endpoint, accessKey, secretKey string) ObjectStorage {
logger
.
Fatalf
(
"Invalid endpoint %s: %s"
,
endpoint
,
err
.
Error
())
}
hostParts
:=
strings
.
SplitN
(
uri
.
Host
,
"."
,
2
)
bucketName
:=
hostParts
[
0
]
var
region
string
var
(
bucketName
string
region
string
ep
string
)
if
len
(
hostParts
)
==
1
{
// take endpoint as bucketname
bucketName
=
hostParts
[
0
]
if
region
,
err
=
autoS3Region
(
bucketName
,
accessKey
,
secretKey
);
err
!=
nil
{
logger
.
Fatalf
(
"Can't guess your region for bucket %s: %s"
,
bucketName
,
err
)
}
}
else
{
// get region in endpoint
hostParts
=
strings
.
SplitN
(
uri
.
Host
,
".s3"
,
2
)
bucketName
=
hostParts
[
0
]
endpoint
=
"s3"
+
hostParts
[
1
]
if
strings
.
HasPrefix
(
endpoint
,
"s3-"
)
||
strings
.
HasPrefix
(
endpoint
,
"s3."
)
{
endpoint
=
endpoint
[
3
:
]
}
if
strings
.
HasPrefix
(
endpoint
,
"dualstack"
)
{
endpoint
=
endpoint
[
len
(
"dualstack."
)
:
]
}
if
endpoint
==
"amazonaws.com"
{
endpoint
=
"us-east-1."
+
endpoint
}
region
=
strings
.
Split
(
endpoint
,
"."
)[
0
]
if
region
==
"external-1"
{
if
strings
.
Contains
(
uri
.
Host
,
".amazonaws.com"
)
{
// standard s3
// [BUCKET].s3-[REGION].[REST_OF_ENDPOINT]
// [BUCKET].s3.[REGION].amazonaws.com[.cn]
hostParts
=
strings
.
SplitN
(
uri
.
Host
,
".s3"
,
2
)
bucketName
=
hostParts
[
0
]
endpoint
=
"s3"
+
hostParts
[
1
]
if
strings
.
HasPrefix
(
endpoint
,
"s3-"
)
||
strings
.
HasPrefix
(
endpoint
,
"s3."
)
{
endpoint
=
endpoint
[
3
:
]
}
if
strings
.
HasPrefix
(
endpoint
,
"dualstack"
)
{
endpoint
=
endpoint
[
len
(
"dualstack."
)
:
]
}
if
endpoint
==
"amazonaws.com"
{
endpoint
=
"us-east-1."
+
endpoint
}
region
=
strings
.
Split
(
endpoint
,
"."
)[
0
]
if
region
==
"external-1"
{
region
=
"us-east-1"
}
}
else
{
// compatible s3
// [BUCKET].[ENDPOINT]
hostParts
:=
strings
.
SplitN
(
uri
.
Host
,
"."
,
2
)
bucketName
=
hostParts
[
0
]
ep
=
hostParts
[
1
]
region
=
"us-east-1"
}
}
...
...
@@ -296,6 +313,10 @@ func newS3(endpoint, accessKey, secretKey string) ObjectStorage {
if
accessKey
!=
""
{
awsConfig
.
Credentials
=
credentials
.
NewStaticCredentials
(
accessKey
,
secretKey
,
""
)
}
if
ep
!=
""
{
awsConfig
.
Endpoint
=
aws
.
String
(
ep
)
awsConfig
.
S3ForcePathStyle
=
aws
.
Bool
(
true
)
}
ses
,
err
:=
session
.
NewSession
(
awsConfig
)
//.WithLogLevel(aws.LogDebugWithHTTPBody))
if
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录