|
@@ -146,6 +157,8 @@ An implementation of the `storagedriver.StorageDriver` interface which uses Amaz
`region`: The name of the aws region in which you would like to store objects (for example `us-east-1`). For a list of regions, you can look at http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
+`regionendpoint`: (optional) Endpoint URL for S3 compatible APIs. This should not be provided when using Amazon S3.
+
`bucket`: The name of your S3 bucket where you wish to store objects. The bucket must exist prior to the driver initialization.
`encrypt`: (optional) Whether you would like your data encrypted on the server side (defaults to false if not specified).
diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
index 0e113680..5496311d 100644
--- a/registry/storage/driver/s3-aws/s3.go
+++ b/registry/storage/driver/s3-aws/s3.go
@@ -56,16 +56,17 @@ var validRegions = map[string]struct{}{}
//DriverParameters A struct that encapsulates all of the driver parameters after all values have been set
type DriverParameters struct {
- AccessKey string
- SecretKey string
- Bucket string
- Region string
- Encrypt bool
- Secure bool
- ChunkSize int64
- RootDirectory string
- StorageClass string
- UserAgent string
+ AccessKey string
+ SecretKey string
+ Bucket string
+ Region string
+ RegionEndpoint string
+ Encrypt bool
+ Secure bool
+ ChunkSize int64
+ RootDirectory string
+ StorageClass string
+ UserAgent string
}
func init() {
@@ -153,6 +154,11 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
return nil, fmt.Errorf("No bucket parameter provided")
}
+ regionEndpoint := parameters["regionendpoint"]
+ if regionEndpoint == nil {
+ regionEndpoint = ""
+ }
+
encryptBool := false
encrypt := parameters["encrypt"]
switch encrypt := encrypt.(type) {
@@ -240,6 +246,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
fmt.Sprint(secretKey),
fmt.Sprint(bucket),
region,
+ fmt.Sprint(regionEndpoint),
encryptBool,
secureBool,
chunkSize,
@@ -255,22 +262,37 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
// bucketName
func New(params DriverParameters) (*Driver, error) {
awsConfig := aws.NewConfig()
- creds := credentials.NewChainCredentials([]credentials.Provider{
- &credentials.StaticProvider{
- Value: credentials.Value{
- AccessKeyID: params.AccessKey,
- SecretAccessKey: params.SecretKey,
+ var creds *credentials.Credentials
+ if params.RegionEndpoint == "" {
+ creds = credentials.NewChainCredentials([]credentials.Provider{
+ &credentials.StaticProvider{
+ Value: credentials.Value{
+ AccessKeyID: params.AccessKey,
+ SecretAccessKey: params.SecretKey,
+ },
},
- },
- &credentials.EnvProvider{},
- &credentials.SharedCredentialsProvider{},
- &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
- })
+ &credentials.EnvProvider{},
+ &credentials.SharedCredentialsProvider{},
+ &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
+ })
+
+ } else {
+ creds = credentials.NewChainCredentials([]credentials.Provider{
+ &credentials.StaticProvider{
+ Value: credentials.Value{
+ AccessKeyID: params.AccessKey,
+ SecretAccessKey: params.SecretKey,
+ },
+ },
+ &credentials.EnvProvider{},
+ })
+ awsConfig.WithS3ForcePathStyle(true)
+ awsConfig.WithEndpoint(params.RegionEndpoint)
+ }
awsConfig.WithCredentials(creds)
awsConfig.WithRegion(params.Region)
awsConfig.WithDisableSSL(!params.Secure)
- // awsConfig.WithMaxRetries(10)
if params.UserAgent != "" {
awsConfig.WithHTTPClient(&http.Client{
diff --git a/registry/storage/driver/s3-aws/s3_test.go b/registry/storage/driver/s3-aws/s3_test.go
index 1137b3e2..f12297bf 100644
--- a/registry/storage/driver/s3-aws/s3_test.go
+++ b/registry/storage/driver/s3-aws/s3_test.go
@@ -30,6 +30,7 @@ func init() {
secure := os.Getenv("S3_SECURE")
region := os.Getenv("AWS_REGION")
root, err := ioutil.TempDir("", "driver-")
+ regionEndpoint := os.Getenv("REGION_ENDPOINT")
if err != nil {
panic(err)
}
@@ -57,6 +58,7 @@ func init() {
secretKey,
bucket,
region,
+ regionEndpoint,
encryptBool,
secureBool,
minChunkSize,
|