iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move clone builder to a separate module

This commit is contained in:
Andrei Tonkikh 2018-01-24 14:04:39 +03:00
parent 448809aa1e
commit e91ac3ef1b
18 changed files with 77 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

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

32
builder.go → clone/builder.go
View File

@ -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{
config: &b.config.ConnectConfig,
&common.StepConnect{
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,
SSHConfig: sshConfig,
Host: common.CommHost,
SSHConfig: common.SshConfig,
},
&common.StepProvision{},
&StepShutdown{
config: &b.config.ShutdownConfig,
&packerCommon.StepProvision{},
&common.StepShutdown{
Config: &b.config.ShutdownConfig,
},
)
}
steps = append(steps,
&StepCreateSnapshot{
createSnapshot: b.config.CreateSnapshot,
&common.StepCreateSnapshot{
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),
}

9
builder_acc_test.go → clone/builder_acc_test.go
View File

@ -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 {

2
builder_test.go → clone/builder_test.go
View File

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

21
config.go → clone/config.go
View File

@ -1,22 +1,23 @@
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"`
ConnectConfig `mapstructure:",squash"`
CloneConfig `mapstructure:",squash"`
HardwareConfig `mapstructure:",squash"`
Comm communicator.Config `mapstructure:",squash"`
ShutdownConfig `mapstructure:",squash"`
CreateSnapshot bool `mapstructure:"create_snapshot"`
ConvertToTemplate bool `mapstructure:"convert_to_template"`
packerCommon.PackerConfig `mapstructure:",squash"`
common.ConnectConfig `mapstructure:",squash"`
CloneConfig `mapstructure:",squash"`
HardwareConfig `mapstructure:",squash"`
Comm communicator.Config `mapstructure:",squash"`
common.ShutdownConfig `mapstructure:",squash"`
CreateSnapshot bool `mapstructure:"create_snapshot"`
ConvertToTemplate bool `mapstructure:"convert_to_template"`
ctx interpolate.Context
}

2
config_test.go → clone/config_test.go
View File

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

2
main.go → clone/main.go
View File

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

2
step_clone.go → clone/step_clone.go
View File

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

2
step_hardware.go → clone/step_hardware.go
View File

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

4
clone/test.sh Executable file
View File

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

2
artifact.go → common/artifact.go
View File

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

19
ssh.go → common/ssh.go
View File

@ -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) {
config := state.Get("config").(*Config)
func SshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
comm := state.Get("comm").(*communicator.Config)
var auth []ssh.AuthMethod
if config.Comm.SSHPrivateKey != "" {
privateKey, err := ioutil.ReadFile(config.Comm.SSHPrivateKey)
if 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

14
step_connect.go → common/step_connect.go
View File

@ -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,
Username: s.config.Username,
Password: s.config.Password,
InsecureConnection: s.config.InsecureConnection,
Datacenter: s.config.Datacenter,
VCenterServer: s.Config.VCenterServer,
Username: s.Config.Username,
Password: s.Config.Password,
InsecureConnection: s.Config.InsecureConnection,
Datacenter: s.Config.Datacenter,
})
if err != nil {
state.Put("error", err)

2
step_run.go → common/step_run.go
View File

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

14
step_shutdown.go → common/step_shutdown.go
View File

@ -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)
err := vm.WaitForShutdown(s.config.Timeout)
log.Printf("Waiting max %s for shutdown to complete", s.Config.Timeout)
err := vm.WaitForShutdown(s.Config.Timeout)
if err != nil {
state.Put("error", err)
return multistep.ActionHalt

6
step_snapshot.go → common/step_snapshot.go
View File

@ -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")

2
step_template.go → common/step_template.go
View File

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

4
test.sh
View File

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