builder/googlecompute: StepCreateImage

builder/googlecompute/builder.go

@@ -59,9 +59,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		},
 		new(common.StepProvision),
 		new(StepUpdateGsutil),
+		new(StepCreateImage),
 	}
 	/*
-		new(stepCreateImage),
 		new(stepUploadImage),
 		new(stepRegisterImage),
 	}*/

builder/googlecompute/step_create_image.go

@@ -8,39 +8,45 @@ import (
 	"github.com/mitchellh/packer/packer"
 )
 
-// stepCreateImage represents a Packer build step that creates GCE machine
+// StepCreateImage represents a Packer build step that creates GCE machine
 // images.
-type stepCreateImage int
+type StepCreateImage int
 
 // Run executes the Packer build step that creates a GCE machine image.
 //
 // Currently the only way to create a GCE image is to run the gcimagebundle
 // command on the running GCE instance.
-func (s *stepCreateImage) Run(state multistep.StateBag) multistep.StepAction {
-	var (
-		config     = state.Get("config").(*Config)
-		comm       = state.Get("communicator").(packer.Communicator)
-		sudoPrefix = ""
-		ui         = state.Get("ui").(packer.Ui)
-	)
-	ui.Say("Creating image...")
+func (s *StepCreateImage) Run(state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	comm := state.Get("communicator").(packer.Communicator)
+	ui := state.Get("ui").(packer.Ui)
+
+	sudoPrefix := ""
 	if config.SSHUsername != "root" {
 		sudoPrefix = "sudo "
 	}
+
 	imageFilename := fmt.Sprintf("%s.tar.gz", config.ImageName)
 	imageBundleCmd := "/usr/bin/gcimagebundle -d /dev/sda -o /tmp/"
+
+	ui.Say("Creating image...")
 	cmd := new(packer.RemoteCmd)
 	cmd.Command = fmt.Sprintf("%s%s --output_file_name %s",
 		sudoPrefix, imageBundleCmd, imageFilename)
 	err := cmd.StartWithUi(comm, ui)
+	if err == nil && cmd.ExitStatus != 0 {
+		err = fmt.Errorf(
+			"gcimagebundle exited with non-zero exit status: %d", cmd.ExitStatus)
+	}
 	if err != nil {
 		err := fmt.Errorf("Error creating image: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
+
 	state.Put("image_file_name", filepath.Join("/tmp", imageFilename))
 	return multistep.ActionContinue
 }
 
-func (s *stepCreateImage) Cleanup(state multistep.StateBag) {}
+func (s *StepCreateImage) Cleanup(state multistep.StateBag) {}

builder/googlecompute/step_create_image_test.go

+package googlecompute
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/mitchellh/multistep"
+	"github.com/mitchellh/packer/packer"
+)
+
+func TestStepCreateImage_impl(t *testing.T) {
+	var _ multistep.Step = new(StepCreateImage)
+}
+
+func TestStepCreateImage(t *testing.T) {
+	state := testState(t)
+	step := new(StepCreateImage)
+	defer step.Cleanup(state)
+
+	comm := new(packer.MockCommunicator)
+	state.Put("communicator", comm)
+
+	// run the step
+	if action := step.Run(state); action != multistep.ActionContinue {
+		t.Fatalf("bad action: %#v", action)
+	}
+
+	// Verify
+	if !comm.StartCalled {
+		t.Fatal("start should be called")
+	}
+	if strings.HasPrefix(comm.StartCmd.Command, "sudo") {
+		t.Fatal("should not sudo")
+	}
+	if !strings.Contains(comm.StartCmd.Command, "gcimagebundle") {
+		t.Fatalf("bad command: %#v", comm.StartCmd.Command)
+	}
+
+	if _, ok := state.GetOk("image_file_name"); !ok {
+		t.Fatal("should have image")
+	}
+}
+
+func TestStepCreateImage_badExitStatus(t *testing.T) {
+	state := testState(t)
+	step := new(StepCreateImage)
+	defer step.Cleanup(state)
+
+	comm := new(packer.MockCommunicator)
+	comm.StartExitStatus = 12
+	state.Put("communicator", comm)
+
+	// run the step
+	if action := step.Run(state); action != multistep.ActionHalt {
+		t.Fatalf("bad action: %#v", action)
+	}
+
+	if _, ok := state.GetOk("error"); !ok {
+		t.Fatal("should have error")
+	}
+	if _, ok := state.GetOk("image_file_name"); ok {
+		t.Fatal("should NOT have image")
+	}
+}
+
+func TestStepCreateImage_nonRoot(t *testing.T) {
+	state := testState(t)
+	step := new(StepCreateImage)
+	defer step.Cleanup(state)
+
+	comm := new(packer.MockCommunicator)
+	state.Put("communicator", comm)
+
+	config := state.Get("config").(*Config)
+	config.SSHUsername = "bob"
+
+	// run the step
+	if action := step.Run(state); action != multistep.ActionContinue {
+		t.Fatalf("bad action: %#v", action)
+	}
+
+	// Verify
+	if !comm.StartCalled {
+		t.Fatal("start should be called")
+	}
+	if !strings.HasPrefix(comm.StartCmd.Command, "sudo") {
+		t.Fatal("should sudo")
+	}
+	if !strings.Contains(comm.StartCmd.Command, "gcimagebundle") {
+		t.Fatalf("bad command: %#v", comm.StartCmd.Command)
+	}
+
+	if _, ok := state.GetOk("image_file_name"); !ok {
+		t.Fatal("should have image")
+	}
+}