Merge pull request #6303 from hashicorp/do_5871
add get windows default credentials to oci builder
This commit is contained in:
commit
31c7374869
|
@ -58,6 +58,11 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
||||||
},
|
},
|
||||||
&stepCreateInstance{},
|
&stepCreateInstance{},
|
||||||
&stepInstanceInfo{},
|
&stepInstanceInfo{},
|
||||||
|
&stepGetDefaultCredentials{
|
||||||
|
Debug: b.config.PackerDebug,
|
||||||
|
Comm: &b.config.Comm,
|
||||||
|
BuildName: b.config.PackerBuildName,
|
||||||
|
},
|
||||||
&communicator.StepConnect{
|
&communicator.StepConnect{
|
||||||
Config: &b.config.Comm,
|
Config: &b.config.Comm,
|
||||||
Host: ocommon.CommHost,
|
Host: ocommon.CommHost,
|
||||||
|
|
|
@ -112,6 +112,17 @@ func (d *driverOCI) GetInstanceIP(id string) (string, error) {
|
||||||
return *vnic.PublicIp, nil
|
return *vnic.PublicIp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *driverOCI) GetInstanceInitialCredentials(id string) (string, string, error) {
|
||||||
|
credentials, err := d.computeClient.GetWindowsInstanceInitialCredentials(context.TODO(), core.GetWindowsInstanceInitialCredentialsRequest{
|
||||||
|
InstanceId: &id,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return *credentials.InstanceCredentials.Username, *credentials.InstanceCredentials.Password, err
|
||||||
|
}
|
||||||
|
|
||||||
// TerminateInstance terminates a compute instance.
|
// TerminateInstance terminates a compute instance.
|
||||||
func (d *driverOCI) TerminateInstance(id string) error {
|
func (d *driverOCI) TerminateInstance(id string) error {
|
||||||
_, err := d.computeClient.TerminateInstance(context.TODO(), core.TerminateInstanceRequest{
|
_, err := d.computeClient.TerminateInstance(context.TODO(), core.TerminateInstanceRequest{
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
package oci
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
commonhelper "github.com/hashicorp/packer/helper/common"
|
||||||
|
"github.com/hashicorp/packer/helper/communicator"
|
||||||
|
"github.com/hashicorp/packer/helper/multistep"
|
||||||
|
"github.com/hashicorp/packer/packer"
|
||||||
|
)
|
||||||
|
|
||||||
|
type stepGetDefaultCredentials struct {
|
||||||
|
Debug bool
|
||||||
|
Comm *communicator.Config
|
||||||
|
BuildName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepGetDefaultCredentials) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
|
||||||
|
var (
|
||||||
|
driver = state.Get("driver").(*driverOCI)
|
||||||
|
ui = state.Get("ui").(packer.Ui)
|
||||||
|
id = state.Get("instance_id").(string)
|
||||||
|
)
|
||||||
|
|
||||||
|
// Skip if we're not using winrm
|
||||||
|
if s.Comm.Type != "winrm" {
|
||||||
|
log.Printf("[INFO] Not using winrm communicator, skipping get password...")
|
||||||
|
return multistep.ActionContinue
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we already have a password, skip it
|
||||||
|
if s.Comm.WinRMPassword != "" {
|
||||||
|
ui.Say("Skipping waiting for password since WinRM password set...")
|
||||||
|
return multistep.ActionContinue
|
||||||
|
}
|
||||||
|
|
||||||
|
username, password, err := driver.GetInstanceInitialCredentials(id)
|
||||||
|
if err != nil {
|
||||||
|
err = fmt.Errorf("Error getting instance's credentials: %s", err)
|
||||||
|
ui.Error(err.Error())
|
||||||
|
state.Put("error", err)
|
||||||
|
return multistep.ActionHalt
|
||||||
|
}
|
||||||
|
s.Comm.WinRMPassword = password
|
||||||
|
s.Comm.WinRMUser = username
|
||||||
|
|
||||||
|
if s.Debug {
|
||||||
|
ui.Message(fmt.Sprintf(
|
||||||
|
"[DEBUG] (OCI default credentials): Credentials (since debug is enabled): %s", password))
|
||||||
|
}
|
||||||
|
|
||||||
|
// store so that we can access this later during provisioning
|
||||||
|
commonhelper.SetSharedState("winrm_password", s.Comm.WinRMPassword, s.BuildName)
|
||||||
|
|
||||||
|
return multistep.ActionContinue
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepGetDefaultCredentials) Cleanup(state multistep.StateBag) {
|
||||||
|
// no cleanup
|
||||||
|
}
|
Loading…
Reference in New Issue