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

wrong place for differentiation between ssh and winrm

This commit is contained in:
Megan Marsh 2018-02-08 13:21:21 -08:00
parent ad2e5f1f08
commit ff717c5784
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builder/oracle/classic/step_list_images.go
View File

@ -11,10 +11,11 @@ import (
type stepListImages struct{} type stepListImages struct{}
func (s *stepListImages) listForSSH(state multistep.StateBag) multistep.StepAction { func (s *stepListImages) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
client := state.Get("client").(*compute.ComputeClient) // get variables from state
config := state.Get("config").(*Config)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
config := state.Get("config").(*Config)
client := state.Get("client").(*compute.ComputeClient)
ui.Say("Adding image to image list...") ui.Say("Adding image to image list...")
imageListClient := client.ImageList() imageListClient := client.ImageList()
@ -97,29 +98,6 @@ func (s *stepListImages) listForSSH(state multistep.StateBag) multistep.StepActi
return multistep.ActionContinue return multistep.ActionContinue
} }
func (s *stepListImages) listForWinRM(state multistep.StateBag) multistep.StepAction {
// This is a placeholder function; we will never reach this because we already
// return an error when winRM is set when validating the Packer config.
ui := state.Get("ui").(packer.Ui)
err := fmt.Errorf("The Oracle Classic builder does not currently support winRM.")
ui.Error(err.Error())
state.Put("error", err)
return multistep.ActionHalt
}
func (s *stepListImages) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
// get variables from state
config := state.Get("config").(*Config)
var action multistep.StepAction
if config.Comm.Type == "winrm" {
action = s.listForWinRM(state)
} else if config.Comm.Type == "ssh" {
action = s.listForSSH(state)
}
return action
}
func (s *stepListImages) Cleanup(state multistep.StateBag) { func (s *stepListImages) Cleanup(state multistep.StateBag) {
// Nothing to do // Nothing to do
return return