Merge pull request #110 from benbjohnson/digitalocean

Add support for DigitalOcean Spaces replica URLs
This commit is contained in:
Ben Johnson
2021-03-07 08:29:23 -07:00
committed by GitHub

View File

@@ -1138,6 +1138,10 @@ func ParseHost(s string) (bucket, region, endpoint string, forcePathStyle bool)
} else if a := gcsRegex.FindStringSubmatch(host); a != nil { } else if a := gcsRegex.FindStringSubmatch(host); a != nil {
bucket, region = a[1], "us-east-1" bucket, region = a[1], "us-east-1"
endpoint = "storage.googleapis.com" endpoint = "storage.googleapis.com"
} else if a := digitalOceanRegex.FindStringSubmatch(host); a != nil {
bucket = a[1]
region = a[2]
endpoint = fmt.Sprintf("%s.digitaloceanspaces.com", a[2])
} else if a := backblazeRegex.FindStringSubmatch(host); a != nil { } else if a := backblazeRegex.FindStringSubmatch(host); a != nil {
bucket = a[1] bucket = a[1]
region = a[2] region = a[2]
@@ -1161,9 +1165,10 @@ func ParseHost(s string) (bucket, region, endpoint string, forcePathStyle bool)
} }
var ( var (
localhostRegex = regexp.MustCompile(`^(?:(.+)\.)?localhost$`) localhostRegex = regexp.MustCompile(`^(?:(.+)\.)?localhost$`)
backblazeRegex = regexp.MustCompile(`^(?:(.+)\.)?s3.([^.]+)\.backblazeb2.com$`) digitalOceanRegex = regexp.MustCompile(`^(?:(.+)\.)?([^.]+)\.digitaloceanspaces.com$`)
gcsRegex = regexp.MustCompile(`^(?:(.+)\.)?storage.googleapis.com$`) backblazeRegex = regexp.MustCompile(`^(?:(.+)\.)?s3.([^.]+)\.backblazeb2.com$`)
gcsRegex = regexp.MustCompile(`^(?:(.+)\.)?storage.googleapis.com$`)
) )
// S3 metrics. // S3 metrics.