providers/aws: rework instance block devices #1045
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/hashcode" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func resourceAwsInstanceMigrateState( | ||
| v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) { | ||
| switch v { | ||
| case 0: | ||
| log.Println("[INFO] Found AWS Instance State v0; migrating to v1") | ||
| return migrateStateV0toV1(is) | ||
| default: | ||
| return is, fmt.Errorf("Unexpected schema version: %d", v) | ||
| } | ||
|
|
||
| return is, nil | ||
| } | ||
|
|
||
| func migrateStateV0toV1(is *terraform.InstanceState) (*terraform.InstanceState, error) { | ||
| log.Printf("[DEBUG] Attributes before migration: %#v", is.Attributes) | ||
| // Delete old count | ||
| delete(is.Attributes, "block_device.#") | ||
|
|
||
| oldBds, err := readV0BlockDevices(is) | ||
| if err != nil { | ||
| return is, err | ||
| } | ||
| // seed count fields for new types | ||
| is.Attributes["ebs_block_device.#"] = "0" | ||
| is.Attributes["ephemeral_block_device.#"] = "0" | ||
| // depending on if state was v0.3.7 or an earlier version, it might have | ||
| // root_block_device defined already | ||
| if _, ok := is.Attributes["root_block_device.#"]; !ok { | ||
| is.Attributes["root_block_device.#"] = "0" | ||
| } | ||
| for _, oldBd := range oldBds { | ||
| if err := writeV1BlockDevice(is, oldBd); err != nil { | ||
| return is, err | ||
| } | ||
| } | ||
| log.Printf("[DEBUG] Attributes after migration: %#v", is.Attributes) | ||
| return is, nil | ||
| } | ||
|
|
||
| func readV0BlockDevices(is *terraform.InstanceState) (map[string]map[string]string, error) { | ||
| oldBds := make(map[string]map[string]string) | ||
| for k, v := range is.Attributes { | ||
| if !strings.HasPrefix(k, "block_device.") { | ||
| continue | ||
| } | ||
| path := strings.Split(k, ".") | ||
| if len(path) != 3 { | ||
| return oldBds, fmt.Errorf("Found unexpected block_device field: %#v", k) | ||
| } | ||
| hashcode, attribute := path[1], path[2] | ||
| oldBd, ok := oldBds[hashcode] | ||
| if !ok { | ||
| oldBd = make(map[string]string) | ||
| oldBds[hashcode] = oldBd | ||
| } | ||
| oldBd[attribute] = v | ||
| delete(is.Attributes, k) | ||
| } | ||
| return oldBds, nil | ||
| } | ||
|
|
||
| func writeV1BlockDevice( | ||
| is *terraform.InstanceState, oldBd map[string]string) error { | ||
| code := hashcode.String(oldBd["device_name"]) | ||
| bdType := "ebs_block_device" | ||
| if vn, ok := oldBd["virtual_name"]; ok && strings.HasPrefix(vn, "ephemeral") { | ||
| bdType = "ephemeral_block_device" | ||
| } else if dn, ok := oldBd["device_name"]; ok && dn == "/dev/sda1" { | ||
| bdType = "root_block_device" | ||
| } | ||
|
|
||
| switch bdType { | ||
| case "ebs_block_device": | ||
| delete(oldBd, "virtual_name") | ||
| case "root_block_device": | ||
| delete(oldBd, "virtual_name") | ||
| delete(oldBd, "encrypted") | ||
| delete(oldBd, "snapshot_id") | ||
| case "ephemeral_block_device": | ||
| delete(oldBd, "delete_on_termination") | ||
| delete(oldBd, "encrypted") | ||
| delete(oldBd, "iops") | ||
| delete(oldBd, "volume_size") | ||
| delete(oldBd, "volume_type") | ||
| } | ||
| for attr, val := range oldBd { | ||
| attrKey := fmt.Sprintf("%s.%d.%s", bdType, code, attr) | ||
| is.Attributes[attrKey] = val | ||
| } | ||
|
|
||
| countAttr := fmt.Sprintf("%s.#", bdType) | ||
| count, _ := strconv.Atoi(is.Attributes[countAttr]) | ||
| is.Attributes[countAttr] = strconv.Itoa(count + 1) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAWSInstanceMigrateState(t *testing.T) { | ||
| cases := map[string]struct { | ||
| StateVersion int | ||
| Attributes map[string]string | ||
| Expected map[string]string | ||
| Meta interface{} | ||
| }{ | ||
| "v0.3.6 and earlier": { | ||
| StateVersion: 0, | ||
| Attributes: map[string]string{ | ||
| // EBS | ||
| "block_device.#": "2", | ||
| "block_device.3851383343.delete_on_termination": "true", | ||
| "block_device.3851383343.device_name": "/dev/sdx", | ||
| "block_device.3851383343.encrypted": "false", | ||
| "block_device.3851383343.snapshot_id": "", | ||
| "block_device.3851383343.virtual_name": "", | ||
| "block_device.3851383343.volume_size": "5", | ||
| "block_device.3851383343.volume_type": "standard", | ||
| // Ephemeral | ||
| "block_device.3101711606.delete_on_termination": "false", | ||
| "block_device.3101711606.device_name": "/dev/sdy", | ||
| "block_device.3101711606.encrypted": "false", | ||
| "block_device.3101711606.snapshot_id": "", | ||
| "block_device.3101711606.virtual_name": "ephemeral0", | ||
| "block_device.3101711606.volume_size": "", | ||
| "block_device.3101711606.volume_type": "", | ||
| // Root | ||
| "block_device.56575650.delete_on_termination": "true", | ||
| "block_device.56575650.device_name": "/dev/sda1", | ||
| "block_device.56575650.encrypted": "false", | ||
| "block_device.56575650.snapshot_id": "", | ||
| "block_device.56575650.volume_size": "10", | ||
| "block_device.56575650.volume_type": "standard", | ||
| }, | ||
| Expected: map[string]string{ | ||
| "ebs_block_device.#": "1", | ||
| "ebs_block_device.3851383343.delete_on_termination": "true", | ||
| "ebs_block_device.3851383343.device_name": "/dev/sdx", | ||
| "ebs_block_device.3851383343.encrypted": "false", | ||
| "ebs_block_device.3851383343.snapshot_id": "", | ||
| "ebs_block_device.3851383343.volume_size": "5", | ||
| "ebs_block_device.3851383343.volume_type": "standard", | ||
| "ephemeral_block_device.#": "1", | ||
| "ephemeral_block_device.2458403513.device_name": "/dev/sdy", | ||
| "ephemeral_block_device.2458403513.virtual_name": "ephemeral0", | ||
| "root_block_device.#": "1", | ||
| "root_block_device.3018388612.delete_on_termination": "true", | ||
| "root_block_device.3018388612.device_name": "/dev/sda1", | ||
| "root_block_device.3018388612.snapshot_id": "", | ||
| "root_block_device.3018388612.volume_size": "10", | ||
| "root_block_device.3018388612.volume_type": "standard", | ||
| }, | ||
| }, | ||
| "v0.3.7": { | ||
| StateVersion: 0, | ||
| Attributes: map[string]string{ | ||
| // EBS | ||
| "block_device.#": "2", | ||
| "block_device.3851383343.delete_on_termination": "true", | ||
| "block_device.3851383343.device_name": "/dev/sdx", | ||
| "block_device.3851383343.encrypted": "false", | ||
| "block_device.3851383343.snapshot_id": "", | ||
| "block_device.3851383343.virtual_name": "", | ||
| "block_device.3851383343.volume_size": "5", | ||
| "block_device.3851383343.volume_type": "standard", | ||
| "block_device.3851383343.iops": "", | ||
| // Ephemeral | ||
| "block_device.3101711606.delete_on_termination": "false", | ||
| "block_device.3101711606.device_name": "/dev/sdy", | ||
| "block_device.3101711606.encrypted": "false", | ||
| "block_device.3101711606.snapshot_id": "", | ||
| "block_device.3101711606.virtual_name": "ephemeral0", | ||
| "block_device.3101711606.volume_size": "", | ||
| "block_device.3101711606.volume_type": "", | ||
| "block_device.3101711606.iops": "", | ||
| // Root | ||
| "root_block_device.#": "1", | ||
| "root_block_device.3018388612.delete_on_termination": "true", | ||
| "root_block_device.3018388612.device_name": "/dev/sda1", | ||
| "root_block_device.3018388612.snapshot_id": "", | ||
| "root_block_device.3018388612.volume_size": "10", | ||
| "root_block_device.3018388612.volume_type": "io1", | ||
| "root_block_device.3018388612.iops": "1000", | ||
| }, | ||
| Expected: map[string]string{ | ||
| "ebs_block_device.#": "1", | ||
| "ebs_block_device.3851383343.delete_on_termination": "true", | ||
| "ebs_block_device.3851383343.device_name": "/dev/sdx", | ||
| "ebs_block_device.3851383343.encrypted": "false", | ||
| "ebs_block_device.3851383343.snapshot_id": "", | ||
| "ebs_block_device.3851383343.volume_size": "5", | ||
| "ebs_block_device.3851383343.volume_type": "standard", | ||
| "ephemeral_block_device.#": "1", | ||
| "ephemeral_block_device.2458403513.device_name": "/dev/sdy", | ||
| "ephemeral_block_device.2458403513.virtual_name": "ephemeral0", | ||
| "root_block_device.#": "1", | ||
| "root_block_device.3018388612.delete_on_termination": "true", | ||
| "root_block_device.3018388612.device_name": "/dev/sda1", | ||
| "root_block_device.3018388612.snapshot_id": "", | ||
| "root_block_device.3018388612.volume_size": "10", | ||
| "root_block_device.3018388612.volume_type": "io1", | ||
| "root_block_device.3018388612.iops": "1000", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for tn, tc := range cases { | ||
| is := &terraform.InstanceState{ | ||
| Attributes: tc.Attributes, | ||
| } | ||
| is, err := resourceAwsInstanceMigrateState( | ||
| tc.StateVersion, is, tc.Meta) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("bad: %s, err: %#v", tn, err) | ||
| } | ||
|
|
||
| for k, v := range tc.Expected { | ||
| if is.Attributes[k] != v { | ||
| t.Fatalf( | ||
| "bad: %s\n\n expected: %#v -> %#v\n got: %#v -> %#v\n in: %#v", | ||
| tn, k, v, k, is.Attributes[k], is.Attributes) | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This whole file is great.