Skip to content

Commit

Permalink
Allow attaching and detaching disks from instances (#636)
Browse files Browse the repository at this point in the history 
* allow updating attached disks

* check for scratch and update comment
  • Loading branch information
@danawillow
danawillow authored Nov 2, 2017
1 parent c551cb9 commit 51ed0b7
Show file tree
Hide file tree
Showing 2 changed files with 288 additions and 25 deletions.
143 changes: 124 additions & 19 deletions google/resource_compute_instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import (

"regexp"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/mitchellh/hashstructure"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
Expand Down Expand Up @@ -204,7 +206,6 @@ func resourceComputeInstance() *schema.Resource {
"attached_disk": &schema.Schema{
Type: schema.TypeList,
Optional: true,
ForceNew: true, // TODO(danawillow): Remove this, support attaching/detaching
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"source": &schema.Schema{
Expand All @@ -223,7 +224,6 @@ func resourceComputeInstance() *schema.Resource {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
ForceNew: true,
},

"disk_encryption_key_sha256": &schema.Schema{
Expand Down Expand Up @@ -623,27 +623,13 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
attachedDisksCount := d.Get("attached_disk.#").(int)

for i := 0; i < attachedDisksCount; i++ {
prefix := fmt.Sprintf("attached_disk.%d", i)
source, err := ParseDiskFieldValue(d.Get(prefix+".source").(string), d, config)
diskConfig := d.Get(fmt.Sprintf("attached_disk.%d", i)).(map[string]interface{})
disk, err := expandAttachedDisk(diskConfig, d, config)
if err != nil {
return err
}
disk := computeBeta.AttachedDisk{
Source: source.RelativeLink(),
AutoDelete: false, // Don't allow autodelete; let terraform handle disk deletion
}

if v, ok := d.GetOk(prefix + ".device_name"); ok {
disk.DeviceName = v.(string)
}

if v, ok := d.GetOk(prefix + ".disk_encryption_key_raw"); ok {
disk.DiskEncryptionKey = &computeBeta.CustomerEncryptionKey{
RawKey: v.(string),
}
}

disks = append(disks, &disk)
disks = append(disks, disk)
}

// Build up the list of networkInterfaces
Expand Down Expand Up @@ -1164,6 +1150,101 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
}
}
}
d.SetPartial("network_interface")
}

if d.HasChange("attached_disk") {
o, n := d.GetChange("attached_disk")

// Keep track of disks currently in the instance. Because the google_compute_disk resource
// can detach disks, it's possible that there are fewer disks currently attached than there
// were at the time we ran terraform plan.
currDisks := map[string]struct{}{}
for _, disk := range instance.Disks {
if !disk.Boot && disk.Type != "SCRATCH" {
currDisks[disk.DeviceName] = struct{}{}
}
}

// Keep track of disks currently in state.
// Since changing any field within the disk needs to detach+reattach it,
// keep track of the hash of the full disk.
oDisks := map[uint64]string{}
for _, disk := range o.([]interface{}) {
diskConfig := disk.(map[string]interface{})
computeDisk, err := expandAttachedDisk(diskConfig, d, config)
if err != nil {
return err
}
hash, err := hashstructure.Hash(*computeDisk, nil)
if err != nil {
return err
}
if _, ok := currDisks[computeDisk.DeviceName]; ok {
oDisks[hash] = computeDisk.DeviceName
}
}

// Keep track of new config's disks.
// Since changing any field within the disk needs to detach+reattach it,
// keep track of the hash of the full disk.
// If a disk with a certain hash is only in the new config, it should be attached.
nDisks := map[uint64]struct{}{}
var attach []*compute.AttachedDisk
for _, disk := range n.([]interface{}) {
diskConfig := disk.(map[string]interface{})
computeDisk, err := expandAttachedDisk(diskConfig, d, config)
if err != nil {
return err
}
hash, err := hashstructure.Hash(*computeDisk, nil)
if err != nil {
return err
}
nDisks[hash] = struct{}{}

if _, ok := oDisks[hash]; !ok {
computeDiskV1 := &compute.AttachedDisk{}
err = Convert(computeDisk, computeDiskV1)
if err != nil {
return err
}
attach = append(attach, computeDiskV1)
}
}

// If a source is only in the old config, it should be detached.
// Detach the old disks.
for hash, deviceName := range oDisks {
if _, ok := nDisks[hash]; !ok {
op, err := config.clientCompute.Instances.DetachDisk(project, zone, instance.Name, deviceName).Do()
if err != nil {
return errwrap.Wrapf("Error detaching disk: %s", err)
}

opErr := computeOperationWait(config.clientCompute, op, project, "detaching disk")
if opErr != nil {
return opErr
}
log.Printf("[DEBUG] Successfully detached disk %s", deviceName)
}
}

// Attach the new disks
for _, disk := range attach {
op, err := config.clientCompute.Instances.AttachDisk(project, zone, instance.Name, disk).Do()
if err != nil {
return errwrap.Wrapf("Error attaching disk : {{err}}", err)
}

opErr := computeOperationWait(config.clientCompute, op, project, "attaching disk")
if opErr != nil {
return opErr
}
log.Printf("[DEBUG] Successfully attached disk %s", disk.Source)
}

d.SetPartial("attached_disk")
}

// We made it, disable partial mode
Expand All @@ -1172,6 +1253,30 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
return resourceComputeInstanceRead(d, meta)
}

func expandAttachedDisk(diskConfig map[string]interface{}, d *schema.ResourceData, meta interface{}) (*computeBeta.AttachedDisk, error) {
config := meta.(*Config)

source, err := ParseDiskFieldValue(diskConfig["source"].(string), d, config)
if err != nil {
return nil, err
}

disk := &computeBeta.AttachedDisk{
Source: source.RelativeLink(),
}

if v, ok := diskConfig["device_name"]; ok {
disk.DeviceName = v.(string)
}

if v, ok := diskConfig["disk_encryption_key_raw"]; ok {
disk.DiskEncryptionKey = &computeBeta.CustomerEncryptionKey{
RawKey: v.(string),
}
}
return disk, nil
}

func resourceComputeInstanceDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)

Expand Down
170 changes: 164 additions & 6 deletions google/resource_compute_instance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,59 @@ func TestAccComputeInstance_attachedDisk_sourceUrl(t *testing.T) {
})
}

func TestAccComputeInstance_attachedDiskUpdate(t *testing.T) {
t.Parallel()

var instance compute.Instance
var instanceName = fmt.Sprintf("instance-test-%s", acctest.RandString(10))
var diskName = fmt.Sprintf("instance-testd-%s", acctest.RandString(10))
var diskName2 = fmt.Sprintf("instance-testd-%s", acctest.RandString(10))

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeInstanceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeInstance_attachedDisk(diskName, instanceName),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
testAccCheckComputeInstanceDisk(&instance, diskName, false, false),
),
},
// check attaching
resource.TestStep{
Config: testAccComputeInstance_addAttachedDisk(diskName, diskName2, instanceName),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
testAccCheckComputeInstanceDisk(&instance, diskName, false, false),
testAccCheckComputeInstanceDisk(&instance, diskName2, false, false),
),
},
// check detaching
resource.TestStep{
Config: testAccComputeInstance_detachDisk(diskName, diskName2, instanceName),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
testAccCheckComputeInstanceDisk(&instance, diskName, false, false),
),
},
// check updating
resource.TestStep{
Config: testAccComputeInstance_updateAttachedDiskEncryptionKey(diskName, instanceName),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
testAccCheckComputeInstanceDisk(&instance, diskName, false, false),
),
},
},
})
}

func TestAccComputeInstance_bootDisk_source(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -1605,10 +1658,6 @@ resource "google_compute_instance" "foobar" {
network_interface {
network = "default"
}
metadata {
foo = "bar"
}
}
`, disk, instance)
}
Expand Down Expand Up @@ -1640,9 +1689,118 @@ resource "google_compute_instance" "foobar" {
network_interface {
network = "default"
}
}
`, disk, instance)
}

metadata {
foo = "bar"
func testAccComputeInstance_addAttachedDisk(disk, disk2, instance string) string {
return fmt.Sprintf(`
resource "google_compute_disk" "foobar" {
name = "%s"
size = 10
type = "pd-ssd"
zone = "us-central1-a"
}
resource "google_compute_disk" "foobar2" {
name = "%s"
size = 10
type = "pd-ssd"
zone = "us-central1-a"
}
resource "google_compute_instance" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
zone = "us-central1-a"
boot_disk {
initialize_params {
image = "debian-8-jessie-v20160803"
}
}
attached_disk {
source = "${google_compute_disk.foobar.name}"
}
attached_disk {
source = "${google_compute_disk.foobar2.self_link}"
}
network_interface {
network = "default"
}
}
`, disk, disk2, instance)
}

func testAccComputeInstance_detachDisk(disk, disk2, instance string) string {
return fmt.Sprintf(`
resource "google_compute_disk" "foobar" {
name = "%s"
size = 10
type = "pd-ssd"
zone = "us-central1-a"
}
resource "google_compute_disk" "foobar2" {
name = "%s"
size = 10
type = "pd-ssd"
zone = "us-central1-a"
}
resource "google_compute_instance" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
zone = "us-central1-a"
boot_disk {
initialize_params {
image = "debian-8-jessie-v20160803"
}
}
attached_disk {
source = "${google_compute_disk.foobar.name}"
}
network_interface {
network = "default"
}
}
`, disk, disk2, instance)
}

func testAccComputeInstance_updateAttachedDiskEncryptionKey(disk, instance string) string {
return fmt.Sprintf(`
resource "google_compute_disk" "foobar" {
name = "%s"
size = 10
type = "pd-ssd"
zone = "us-central1-a"
disk_encryption_key_raw = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
}
resource "google_compute_instance" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
zone = "us-central1-a"
boot_disk {
initialize_params {
image = "debian-8-jessie-v20160803"
}
}
attached_disk {
source = "${google_compute_disk.foobar.name}"
disk_encryption_key_raw = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
}
network_interface {
network = "default"
}
}
`, disk, instance)
Expand Down

0 comments on commit 51ed0b7

Please sign in to comment.