rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120 from benbjohnson/default-force-path-style

Browse Source 
Default to force path style if endpoint set
This commit is contained in:
Ben Johnson
2021-03-11 15:29:18 -07:00
committed by GitHub
parent 2e7a6ae715 929a66314c
commit 16c50d1d2e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/litestream/main.go
View File

@@ -271,7 +271,7 @@ type ReplicaConfig struct {
Region string `yaml:"region"` Region string `yaml:"region"`
Bucket string `yaml:"bucket"` Bucket string `yaml:"bucket"`
Endpoint string `yaml:"endpoint"` Endpoint string `yaml:"endpoint"`
ForcePathStyle bool `yaml:"force-path-style"` ForcePathStyle *bool `yaml:"force-path-style"`
} }
// NewReplicaFromConfig instantiates a replica for a DB based on a config. // NewReplicaFromConfig instantiates a replica for a DB based on a config.
@@ -343,7 +343,14 @@ func newS3ReplicaFromConfig(c *ReplicaConfig, db *litestream.DB) (_ *s3.Replica,
} }
bucket, path := c.Bucket, c.Path bucket, path := c.Bucket, c.Path
region, endpoint, forcePathStyle := c.Region, c.Endpoint, c.ForcePathStyle region, endpoint := c.Region, c.Endpoint
// Use path style if an endpoint is explicitly set. This works because the
// only service to not use path style is AWS which does not use an endpoint.
forcePathStyle := (endpoint != "")
if v := c.ForcePathStyle; v != nil {
forcePathStyle = *v
}
// Apply settings from URL, if specified. // Apply settings from URL, if specified.
if c.URL != "" { if c.URL != "" {