builder/amazon/*,builder/openstack: properly scrub sensitive [GH-554]

CHANGELOG.md

@@ -8,6 +8,9 @@ FEATURES:
 BUG FIXES:
 
 * core: Won't panic when writing to a bad pipe. [GH-560]
+* builder/amazon/all: Properly scrub access key and secret key from logs.
+  [GH-554]
+* builder/openstack: Properly scrub password from logs [GH-554]
 * common/uuid: Use cryptographically secure PRNG when generating
   UUIDs. [GH-552]
 

builder/amazon/chroot/builder.go

@@ -143,7 +143,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return errs
 	}
 
-	log.Println(common.ScrubConfig(b.config), b.config.AccessKey, b.config.SecretKey)
+	log.Println(common.ScrubConfig(b.config, b.config.AccessKey, b.config.SecretKey))
 	return nil
 }
 

builder/amazon/ebs/builder.go

@@ -56,7 +56,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return errs
 	}
 
-	log.Println(common.ScrubConfig(b.config), b.config.AccessKey, b.config.SecretKey)
+	log.Println(common.ScrubConfig(b.config, b.config.AccessKey, b.config.SecretKey))
 	return nil
 }
 

builder/amazon/instance/builder.go

@@ -159,7 +159,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return errs
 	}
 
-	log.Println(common.ScrubConfig(b.config), b.config.AccessKey, b.config.SecretKey)
+	log.Println(common.ScrubConfig(b.config, b.config.AccessKey, b.config.SecretKey))
 	return nil
 }
 

builder/openstack/builder.go

@@ -51,7 +51,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		return errs
 	}
 
-	log.Println(common.ScrubConfig(b.config), b.config.Password)
+	log.Println(common.ScrubConfig(b.config, b.config.Password))
 	return nil
 }