Skip to content

Commit 067e622

Browse files
committed
fix(boto): don't set AWS env vars when they're empty
For using EC2 IAM credentials for S3 access, we must not set AWS_ACCESS_KEY_ID AND AWS_SECRET_ACCESS_KEY
1 parent 0d3081b commit 067e622

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

main.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ func main() {
3737
log.Fatal(err)
3838
} else {
3939
os.Setenv("REGISTRY_STORAGE_S3_ACCESSKEY", string(accesskey))
40-
os.Setenv("AWS_ACCESS_KEY_ID", string(accesskey))
40+
if len(accesskey) != 0 {
41+
os.Setenv("AWS_ACCESS_KEY_ID", string(accesskey))
42+
}
4143
}
4244

4345
if secretkey, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/secretkey"); err != nil {
4446
log.Fatal(err)
4547
} else {
4648
os.Setenv("REGISTRY_STORAGE_S3_SECRETKEY", string(secretkey))
47-
os.Setenv("AWS_SECRET_ACCESS_KEY", string(secretkey))
49+
if len(secretkey) != 0 {
50+
os.Setenv("AWS_SECRET_ACCESS_KEY", string(secretkey))
51+
}
4852
}
4953

5054
if region, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/region"); err != nil {

0 commit comments

Comments
 (0)