Add AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY

d66c3d86 · Justin Campbell · 382fcef2 · d66c3d86
Commit d66c3d86 authored Jun 29, 2013 by Justin Campbell
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

builder/amazonebs/builder.go builder/amazonebs/builder.go +8 -0

No files found.
--- a/builder/amazonebs/builder.go
+++ b/builder/amazonebs/builder.go
@@ -58,10 +58,18 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		}
 	}

+	if b.config.AccessKey == "" {
+		b.config.AccessKey = os.Getenv("AWS_ACCESS_KEY_ID")
+	}
+
 	if b.config.AccessKey == "" {
 		b.config.AccessKey = os.Getenv("AWS_ACCESS_KEY")
 	}

+	if b.config.SecretKey == "" {
+		b.config.SecretKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
+	}
+
 	if b.config.SecretKey == "" {
 		b.config.SecretKey = os.Getenv("AWS_SECRET_KEY")
 	}