Merge pull request #2351 from mitchellh/f-winrm-debug

builder/amazon: output WinRM password for debug mode [GH-2336]

builder/amazon/common/step_get_password.go

@@ -19,6 +19,7 @@ import (
 // StepGetPassword reads the password from a Windows server and sets it
 // on the WinRM config.
 type StepGetPassword struct {
+	Debug   bool
 	Comm    *communicator.Config
 	Timeout time.Duration
 }
@@ -85,6 +86,13 @@ WaitLoop:
 			}
 		}
 	}
+
+	// In debug-mode, we output the password
+	if s.Debug {
+		ui.Message(fmt.Sprintf(
+			"Password (since debug is enabled): %s", s.Comm.WinRMPassword))
+	}
+
 	return multistep.ActionContinue
 }
 

builder/amazon/ebs/builder.go

@@ -119,6 +119,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Tags:                     b.config.RunTags,
 		},
 		&awscommon.StepGetPassword{
+			Debug:   b.config.PackerDebug,
 			Comm:    &b.config.RunConfig.Comm,
 			Timeout: b.config.WindowsPasswordTimeout,
 		},

builder/amazon/instance/builder.go

@@ -204,6 +204,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Tags:                     b.config.RunTags,
 		},
 		&awscommon.StepGetPassword{
+			Debug:   b.config.PackerDebug,
 			Comm:    &b.config.RunConfig.Comm,
 			Timeout: b.config.WindowsPasswordTimeout,
 		},