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

Allow use of LITESTREAM prefixed environment variables

Browse Source 
This commit adds optional `LITESTREAM_ACCESS_KEY_ID` and
`LITESTREAM_SECRET_ACCESS_KEY` environment variables that can
be used instead of their `AWS` counterparts. The AWS-prefixed
variables have caused some confusion with users who were not
using AWS S3.
This commit is contained in:
Ben Johnson
2021-04-22 15:58:17 -06:00
parent ad4b84410d
commit 7f4325e814
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/litestream/main.go
View File

@@ -61,6 +61,9 @@ func (m *Main) Run(ctx context.Context, args []string) (err error) {
return runWindowsService(ctx) return runWindowsService(ctx)
} }
// Copy "LITESTEAM" environment credentials.
applyLitestreamEnv()
// Extract command name. // Extract command name.
var cmd string var cmd string
if len(args) > 0 { if len(args) > 0 {
@@ -427,6 +430,22 @@ func newS3ReplicaFromConfig(c *ReplicaConfig, db *litestream.DB) (_ *s3.Replica,
return r, nil return r, nil
} }
// applyLitestreamEnv copies "LITESTREAM" prefixed environment variables to
// their AWS counterparts as the "AWS" prefix can be confusing when using a
// non-AWS S3-compatible service.
func applyLitestreamEnv() {
if v, ok := os.LookupEnv("LITESTREAM_ACCESS_KEY_ID"); ok {
if _, ok := os.LookupEnv("AWS_ACCESS_KEY_ID"); !ok {
os.Setenv("AWS_ACCESS_KEY_ID", v)
}
}
if v, ok := os.LookupEnv("LITESTREAM_SECRET_ACCESS_KEY"); ok {
if _, ok := os.LookupEnv("AWS_SECRET_ACCESS_KEY"); !ok {
os.Setenv("AWS_SECRET_ACCESS_KEY", v)
}
}
}
// ParseReplicaURL parses a replica URL. // ParseReplicaURL parses a replica URL.
func ParseReplicaURL(s string) (scheme, host, urlpath string, err error) { func ParseReplicaURL(s string) (scheme, host, urlpath string, err error) {
u, err := url.Parse(s) u, err := url.Parse(s)