Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/virtual_machine: Continue logging for oldconfig #661

Merged
merged 1 commit into from
Nov 28, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions vsphere/virtual_machine_config_structure.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ package vsphere

import (
"fmt"
"io/ioutil"
"log"
"reflect"

"github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/hashicorp/terraform/terraform"
Expand Down Expand Up @@ -846,15 +844,13 @@ func expandVirtualMachineConfigSpecChanged(d *schema.ResourceData, client *govmo
// Read state back in. This is necessary to ensure GetChange calls work
// correctly.
oldData = resourceVSphereVirtualMachine().Data(oldData.State())
// Get both specs. Silence the logging for oldSpec to suppress fake
// reboot_required log messages.
log.SetOutput(ioutil.Discard)
// Get both specs.
log.Printf("[DEBUG] %s: Expanding old config. Ignore reboot_required messages", resourceVSphereVirtualMachineIDString(d))
oldSpec, err := expandVirtualMachineConfigSpec(oldData, client)
if err != nil {
return types.VirtualMachineConfigSpec{}, false, err
}

logging.SetOutput()
log.Printf("[DEBUG] %s: Expanding of old config complete", resourceVSphereVirtualMachineIDString(d))

newSpec, err := expandVirtualMachineConfigSpec(d, client)
if err != nil {
Expand Down