ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: Fix aws_route53_record 0-2 migration (#7907) 

When migrating the state of an `aws_route53_record`, a v0 state was
never upgraded to v2, and a typo in a unit test masked this. This commit
fixes the migration by chaining the invocation of the migration
function, and corrects the test.
This commit is contained in:
James Nugent 2016-08-01 18:54:17 -05:00 committed by Paul Stack
parent 8c4b4edd2f
commit f76c1ec921
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/aws/resource_aws_route53_record_migrate.go
View File

@ -12,8 +12,12 @@ func resourceAwsRoute53RecordMigrateState(
v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) { v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) {
switch v { switch v {
case 0: case 0:
log.Println("[INFO] Found AWS Route53 Record State v0; migrating to v1") log.Println("[INFO] Found AWS Route53 Record State v0; migrating to v1 then v2")
return migrateRoute53RecordStateV0toV1(is) v1InstanceState, err := migrateRoute53RecordStateV0toV1(is)
if err != nil {
return v1InstanceState, err
}
return migrateRoute53RecordStateV1toV2(v1InstanceState)
case 1: case 1:
log.Println("[INFO] Found AWS Route53 Record State v1; migrating to v2") log.Println("[INFO] Found AWS Route53 Record State v1; migrating to v2")
return migrateRoute53RecordStateV1toV2(is) return migrateRoute53RecordStateV1toV2(is)

2
builtin/providers/aws/resource_aws_route53_record_migrate_test.go
View File

@ -79,7 +79,7 @@ func TestAWSRoute53RecordMigrateStateV1toV2(t *testing.T) {
}, },
}, },
"v0_2": { "v0_2": {
StateVersion: 1, StateVersion: 0,
Attributes: map[string]string{ Attributes: map[string]string{
"weight": "-1", "weight": "-1",
}, },