From 779c7184a27e0a109c1cd003e3f1e195ce2d53cd Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Fri, 9 May 2014 21:12:14 -0700 Subject: [PATCH] go fmt --- builder/vmware/common/step_prepare_tools.go | 6 +- builder/vmware/common/step_upload_tools.go | 8 +-- builder/vmware/common/tools_config.go | 4 +- builder/vmware/iso/builder.go | 70 ++++++++++----------- builder/vmware/vmx/builder.go | 10 +-- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/builder/vmware/common/step_prepare_tools.go b/builder/vmware/common/step_prepare_tools.go index 8ddd2d452..070220a5c 100644 --- a/builder/vmware/common/step_prepare_tools.go +++ b/builder/vmware/common/step_prepare_tools.go @@ -6,10 +6,10 @@ import ( "os" ) -type StepPrepareTools struct{ +type StepPrepareTools struct { RemoteType string `mapstructure:"remote_type"` - ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` - ToolsUploadPath string `mapstructure:"tools_upload_path"` + ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` + ToolsUploadPath string `mapstructure:"tools_upload_path"` } func (c *StepPrepareTools) Run(state multistep.StateBag) multistep.StepAction { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index 7e1e27eaf..6225ecf2b 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -11,11 +11,11 @@ type toolsUploadPathTemplate struct { Flavor string } -type StepUploadTools struct{ +type StepUploadTools struct { RemoteType string `mapstructure:"remote_type"` - ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` - ToolsUploadPath string `mapstructure:"tools_upload_path"` - Tpl *packer.ConfigTemplate + ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` + ToolsUploadPath string `mapstructure:"tools_upload_path"` + Tpl *packer.ConfigTemplate } func (c *StepUploadTools) Run(state multistep.StateBag) multistep.StepAction { diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go index d98da3f58..c50c22e6b 100644 --- a/builder/vmware/common/tools_config.go +++ b/builder/vmware/common/tools_config.go @@ -8,8 +8,8 @@ import ( ) type ToolsConfig struct { - ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` - ToolsUploadPath string `mapstructure:"tools_upload_path"` + ToolsUploadFlavor string `mapstructure:"tools_upload_flavor"` + ToolsUploadPath string `mapstructure:"tools_upload_path"` } func (c *ToolsConfig) Prepare(t *packer.ConfigTemplate) []error { diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index 2c03fe8eb..b933202a5 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -32,23 +32,23 @@ type config struct { vmwcommon.ToolsConfig `mapstructure:",squash"` vmwcommon.VMXConfig `mapstructure:",squash"` - DiskName string `mapstructure:"vmdk_name"` - DiskSize uint `mapstructure:"disk_size"` - DiskTypeId string `mapstructure:"disk_type_id"` - FloppyFiles []string `mapstructure:"floppy_files"` - GuestOSType string `mapstructure:"guest_os_type"` - ISOChecksum string `mapstructure:"iso_checksum"` - ISOChecksumType string `mapstructure:"iso_checksum_type"` - ISOUrls []string `mapstructure:"iso_urls"` - VMName string `mapstructure:"vm_name"` - HTTPDir string `mapstructure:"http_directory"` - HTTPPortMin uint `mapstructure:"http_port_min"` - HTTPPortMax uint `mapstructure:"http_port_max"` - BootCommand []string `mapstructure:"boot_command"` - SkipCompaction bool `mapstructure:"skip_compaction"` - VMXTemplatePath string `mapstructure:"vmx_template_path"` - VNCPortMin uint `mapstructure:"vnc_port_min"` - VNCPortMax uint `mapstructure:"vnc_port_max"` + DiskName string `mapstructure:"vmdk_name"` + DiskSize uint `mapstructure:"disk_size"` + DiskTypeId string `mapstructure:"disk_type_id"` + FloppyFiles []string `mapstructure:"floppy_files"` + GuestOSType string `mapstructure:"guest_os_type"` + ISOChecksum string `mapstructure:"iso_checksum"` + ISOChecksumType string `mapstructure:"iso_checksum_type"` + ISOUrls []string `mapstructure:"iso_urls"` + VMName string `mapstructure:"vm_name"` + HTTPDir string `mapstructure:"http_directory"` + HTTPPortMin uint `mapstructure:"http_port_min"` + HTTPPortMax uint `mapstructure:"http_port_max"` + BootCommand []string `mapstructure:"boot_command"` + SkipCompaction bool `mapstructure:"skip_compaction"` + VMXTemplatePath string `mapstructure:"vmx_template_path"` + VNCPortMin uint `mapstructure:"vnc_port_min"` + VNCPortMax uint `mapstructure:"vnc_port_max"` RemoteType string `mapstructure:"remote_type"` RemoteDatastore string `mapstructure:"remote_datastore"` @@ -145,19 +145,19 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { // Errors templates := map[string]*string{ - "disk_name": &b.config.DiskName, - "guest_os_type": &b.config.GuestOSType, - "http_directory": &b.config.HTTPDir, - "iso_checksum": &b.config.ISOChecksum, - "iso_checksum_type": &b.config.ISOChecksumType, - "iso_url": &b.config.RawSingleISOUrl, - "vm_name": &b.config.VMName, - "vmx_template_path": &b.config.VMXTemplatePath, - "remote_type": &b.config.RemoteType, - "remote_host": &b.config.RemoteHost, - "remote_datastore": &b.config.RemoteDatastore, - "remote_user": &b.config.RemoteUser, - "remote_password": &b.config.RemotePassword, + "disk_name": &b.config.DiskName, + "guest_os_type": &b.config.GuestOSType, + "http_directory": &b.config.HTTPDir, + "iso_checksum": &b.config.ISOChecksum, + "iso_checksum_type": &b.config.ISOChecksumType, + "iso_url": &b.config.RawSingleISOUrl, + "vm_name": &b.config.VMName, + "vmx_template_path": &b.config.VMXTemplatePath, + "remote_type": &b.config.RemoteType, + "remote_host": &b.config.RemoteHost, + "remote_datastore": &b.config.RemoteDatastore, + "remote_user": &b.config.RemoteUser, + "remote_password": &b.config.RemotePassword, } for n, ptr := range templates { @@ -310,9 +310,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe steps := []multistep.Step{ &vmwcommon.StepPrepareTools{ - RemoteType: b.config.RemoteType, + RemoteType: b.config.RemoteType, ToolsUploadFlavor: b.config.ToolsUploadFlavor, - ToolsUploadPath: b.config.ToolsUploadPath, + ToolsUploadPath: b.config.ToolsUploadPath, }, &common.StepDownload{ Checksum: b.config.ISOChecksum, @@ -357,10 +357,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe NoPty: b.config.SSHSkipRequestPty, }, &vmwcommon.StepUploadTools{ - RemoteType: b.config.RemoteType, + RemoteType: b.config.RemoteType, ToolsUploadFlavor: b.config.ToolsUploadFlavor, - ToolsUploadPath: b.config.ToolsUploadPath, - Tpl: b.config.tpl, + ToolsUploadPath: b.config.ToolsUploadPath, + Tpl: b.config.tpl, }, &common.StepProvision{}, &vmwcommon.StepShutdown{ diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index 69b3e43b5..015acbe97 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -53,9 +53,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe // Build the steps. steps := []multistep.Step{ &vmwcommon.StepPrepareTools{ - RemoteType: b.config.RemoteType, + RemoteType: b.config.RemoteType, ToolsUploadFlavor: b.config.ToolsUploadFlavor, - ToolsUploadPath: b.config.ToolsUploadPath, + ToolsUploadPath: b.config.ToolsUploadPath, }, &vmwcommon.StepOutputDir{ Force: b.config.PackerForce, @@ -84,10 +84,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe NoPty: b.config.SSHSkipRequestPty, }, &vmwcommon.StepUploadTools{ - RemoteType: b.config.RemoteType, + RemoteType: b.config.RemoteType, ToolsUploadFlavor: b.config.ToolsUploadFlavor, - ToolsUploadPath: b.config.ToolsUploadPath, - Tpl: b.config.tpl, + ToolsUploadPath: b.config.ToolsUploadPath, + Tpl: b.config.tpl, }, &common.StepProvision{}, &vmwcommon.StepShutdown{