Move clone builder to a separate module

build.sh

@@ -8,6 +8,6 @@ export GOARCH=amd64
 mkdir -p bin
 rm -f bin/*
 
-GOOS=darwin  go build -o bin/packer-builder-vsphere.macos
+GOOS=darwin  go build -o bin/packer-builder-vsphere-clone.macos ./clone
-GOOS=linux   go build -o bin/packer-builder-vsphere.linux
+GOOS=linux   go build -o bin/packer-builder-vsphere-clone.linux ./clone
-GOOS=windows go build -o bin/packer-builder-vsphere.exe
+GOOS=windows go build -o bin/packer-builder-vsphere-clone.exe   ./clone

clone/builder.go

@@ -1,11 +1,12 @@
-package main
+package clone
 
 import (
 	"errors"
 
-	"github.com/hashicorp/packer/common"
+	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer"
+	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"github.com/mitchellh/multistep"
 )
@@ -28,14 +29,15 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
 	state := new(multistep.BasicStateBag)
 	state.Put("config", b.config)
+	state.Put("comm", &b.config.Comm)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
 
 	var steps []multistep.Step
 
 	steps = append(steps,
-		&StepConnect{
+		&common.StepConnect{
-			config: &b.config.ConnectConfig,
+			Config: &b.config.ConnectConfig,
 		},
 		&StepCloneVM{
 			config: &b.config.CloneConfig,
@@ -47,30 +49,30 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 
 	if b.config.Comm.Type != "none" {
 		steps = append(steps,
-			&StepRun{},
+			&common.StepRun{},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      commHost,
+				Host:      common.CommHost,
-				SSHConfig: sshConfig,
+				SSHConfig: common.SshConfig,
 			},
-			&common.StepProvision{},
+			&packerCommon.StepProvision{},
-			&StepShutdown{
+			&common.StepShutdown{
-				config: &b.config.ShutdownConfig,
+				Config: &b.config.ShutdownConfig,
 			},
 		)
 	}
 
 	steps = append(steps,
-		&StepCreateSnapshot{
+		&common.StepCreateSnapshot{
-			createSnapshot: b.config.CreateSnapshot,
+			CreateSnapshot: b.config.CreateSnapshot,
 		},
-		&StepConvertToTemplate{
+		&common.StepConvertToTemplate{
 			ConvertToTemplate: b.config.ConvertToTemplate,
 		},
 	)
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(state)
 
 	// If there was an error, return that
@@ -87,7 +89,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		return nil, errors.New("Build was halted.")
 	}
 
-	artifact := &Artifact{
+	artifact := &common.Artifact{
 		Name: b.config.VMName,
 		VM:   state.Get("vm").(*driver.VirtualMachine),
 	}

clone/builder_acc_test.go

@@ -1,10 +1,11 @@
-package main
+package clone
 
 import (
 	"encoding/json"
 	"fmt"
 	builderT "github.com/hashicorp/packer/helper/builder/testing"
 	"github.com/hashicorp/packer/packer"
+	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"
 	"math/rand"
 	"testing"
@@ -111,7 +112,7 @@ func checkArtifact(t *testing.T) builderT.TestCheckFunc {
 		}
 
 		artifactRaw := artifacts[0]
-		_, ok := artifactRaw.(*Artifact)
+		_, ok := artifactRaw.(*common.Artifact)
 		if !ok {
 			t.Fatalf("unknown artifact: %#v", artifactRaw)
 		}
@@ -388,7 +389,7 @@ func TestBuilderAcc_sshKey(t *testing.T) {
 func sshKeyConfig() string {
 	config := defaultConfig()
 	config["ssh_password"] = ""
-	config["ssh_private_key_file"] = "test-key.pem"
+	config["ssh_private_key_file"] = "../test-key.pem"
 	config["linked_clone"] = true // speed up
 	return renderConfig(config)
 }
@@ -490,7 +491,7 @@ func testConn(t *testing.T) *driver.Driver {
 
 func getVM(t *testing.T, d *driver.Driver, artifacts []packer.Artifact) *driver.VirtualMachine {
 	artifactRaw := artifacts[0]
-	artifact, _ := artifactRaw.(*Artifact)
+	artifact, _ := artifactRaw.(*common.Artifact)
 
 	vm, err := d.FindVM(artifact.Name)
 	if err != nil {

clone/builder_test.go

@@ -1,4 +1,4 @@
-package main
+package clone
 
 import (
 	"github.com/hashicorp/packer/packer"

clone/config.go

@@ -1,20 +1,21 @@
-package main
+package clone
 
 import (
-	"github.com/hashicorp/packer/common"
+	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/jetbrains-infra/packer-builder-vsphere/common"
 )
 
 type Config struct {
-	common.PackerConfig 	`mapstructure:",squash"`
+	packerCommon.PackerConfig `mapstructure:",squash"`
-	ConnectConfig 			`mapstructure:",squash"`
+	common.ConnectConfig      `mapstructure:",squash"`
 	CloneConfig               `mapstructure:",squash"`
 	HardwareConfig            `mapstructure:",squash"`
 	Comm                      communicator.Config `mapstructure:",squash"`
-	ShutdownConfig         	`mapstructure:",squash"`
+	common.ShutdownConfig     `mapstructure:",squash"`
 	CreateSnapshot            bool `mapstructure:"create_snapshot"`
 	ConvertToTemplate         bool `mapstructure:"convert_to_template"`
 

clone/config_test.go

@@ -1,4 +1,4 @@
-package main
+package clone
 
 import (
 	"testing"

clone/main.go

@@ -1,4 +1,4 @@
-package main
+package clone
 
 import "github.com/hashicorp/packer/packer/plugin"
 

clone/step_clone.go

@@ -1,4 +1,4 @@
-package main
+package clone
 
 import (
 	"github.com/mitchellh/multistep"

clone/step_hardware.go

@@ -1,4 +1,4 @@
-package main
+package clone
 
 import (
 	"github.com/mitchellh/multistep"

clone/test.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export PACKER_ACC=1
+go test -v "$@"

common/artifact.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/jetbrains-infra/packer-builder-vsphere/driver"

common/ssh.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"
@@ -7,19 +7,20 @@ import (
 	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
 	"golang.org/x/crypto/ssh"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
-func commHost(state multistep.StateBag) (string, error) {
+func CommHost(state multistep.StateBag) (string, error) {
 	return state.Get("ip").(string), nil
 }
 
-func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
+func SshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
-	config := state.Get("config").(*Config)
+	comm := state.Get("comm").(*communicator.Config)
 
 	var auth []ssh.AuthMethod
 
-	if config.Comm.SSHPrivateKey != "" {
+	if comm.SSHPrivateKey != "" {
-		privateKey, err := ioutil.ReadFile(config.Comm.SSHPrivateKey)
+		privateKey, err := ioutil.ReadFile(comm.SSHPrivateKey)
 		if err != nil {
 			return nil, fmt.Errorf("Error loading configured private key file: %s", err)
 		}
@@ -32,14 +33,14 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
 		auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
 	} else {
 		auth = []ssh.AuthMethod{
-			ssh.Password(config.Comm.SSHPassword),
+			ssh.Password(comm.SSHPassword),
 			ssh.KeyboardInteractive(
-				packerssh.PasswordKeyboardInteractive(config.Comm.SSHPassword)),
+				packerssh.PasswordKeyboardInteractive(comm.SSHPassword)),
 		}
 	}
 
 	clientConfig := &ssh.ClientConfig{
-		User:            config.Comm.SSHUsername,
+		User:            comm.SSHUsername,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
 	clientConfig.Auth = auth

common/step_connect.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/mitchellh/multistep"
@@ -31,16 +31,16 @@ func (c *ConnectConfig) Prepare() []error {
 }
 
 type StepConnect struct {
-	config *ConnectConfig
+	Config *ConnectConfig
 }
 
 func (s *StepConnect) Run(state multistep.StateBag) multistep.StepAction {
 	d, err := driver.NewDriver(&driver.ConnectConfig{
-		VCenterServer:      s.config.VCenterServer,
+		VCenterServer:      s.Config.VCenterServer,
-		Username:           s.config.Username,
+		Username:           s.Config.Username,
-		Password:           s.config.Password,
+		Password:           s.Config.Password,
-		InsecureConnection: s.config.InsecureConnection,
+		InsecureConnection: s.Config.InsecureConnection,
-		Datacenter:         s.config.Datacenter,
+		Datacenter:         s.Config.Datacenter,
 	})
 	if err != nil {
 		state.Put("error", err)

common/step_run.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/mitchellh/multistep"

common/step_shutdown.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/mitchellh/multistep"
@@ -34,7 +34,7 @@ func (c *ShutdownConfig) Prepare() []error {
 }
 
 type StepShutdown struct {
-	config *ShutdownConfig
+	Config *ShutdownConfig
 }
 
 func (s *StepShutdown) Run(state multistep.StateBag) multistep.StepAction {
@@ -42,13 +42,13 @@ func (s *StepShutdown) Run(state multistep.StateBag) multistep.StepAction {
 	comm := state.Get("communicator").(packer.Communicator)
 	vm := state.Get("vm").(*driver.VirtualMachine)
 
-	if s.config.Command != "" {
+	if s.Config.Command != "" {
 		ui.Say("Executing shutdown command...")
-		log.Printf("Shutdown command: %s", s.config.Command)
+		log.Printf("Shutdown command: %s", s.Config.Command)
 
 		var stdout, stderr bytes.Buffer
 		cmd := &packer.RemoteCmd{
-			Command: s.config.Command,
+			Command: s.Config.Command,
 			Stdout:  &stdout,
 			Stderr:  &stderr,
 		}
@@ -67,8 +67,8 @@ func (s *StepShutdown) Run(state multistep.StateBag) multistep.StepAction {
 		}
 	}
 
-	log.Printf("Waiting max %s for shutdown to complete", s.config.Timeout)
+	log.Printf("Waiting max %s for shutdown to complete", s.Config.Timeout)
-	err := vm.WaitForShutdown(s.config.Timeout)
+	err := vm.WaitForShutdown(s.Config.Timeout)
 	if err != nil {
 		state.Put("error", err)
 		return multistep.ActionHalt

common/step_snapshot.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/mitchellh/multistep"
@@ -7,14 +7,14 @@ import (
 )
 
 type StepCreateSnapshot struct{
-	createSnapshot bool
+	CreateSnapshot bool
 }
 
 func (s *StepCreateSnapshot) Run(state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
 	vm := state.Get("vm").(*driver.VirtualMachine)
 
-	if s.createSnapshot {
+	if s.CreateSnapshot {
 		ui.Say("Creating snapshot...")
 
 		err := vm.CreateSnapshot("Created by Packer")

common/step_template.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/mitchellh/multistep"

test.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-export PACKER_ACC=1
+(cd driver && ./test.sh)
-go test -v "$@"
+(cd clone && ./test.sh)