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

changing route53_zone.name_servers back to list

This commit is contained in:
Luke Amdor 2015-04-22 13:27:20 -05:00
parent f0c8ae7d3f
commit 6b5138328f
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/aws/resource_aws_route53_zone.go
View File

@ -6,7 +6,6 @@ import (
"strings"
"time"
"github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
@ -34,12 +33,9 @@ func resourceAwsRoute53Zone() *schema.Resource {
},
"name_servers": &schema.Schema{
Type: schema.TypeSet,
Type: schema.TypeList,
Elem: &schema.Schema{Type: schema.TypeString},
Computed: true,
Set: func(v interface{}) int {
return hashcode.String(v.(string))
},
},
"tags": tagsSchema(),

5
builtin/providers/aws/resource_aws_route53_zone_test.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"testing"
"github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
@ -116,8 +115,8 @@ func testAccCheckRoute53ZoneExists(n string, zone *route53.HostedZone) resource.
return fmt.Errorf("Hosted zone err: %v", err)
}
for _, ns := range resp.DelegationSet.NameServers {
attribute := fmt.Sprintf("name_servers.%d", hashcode.String(*ns))
for idx, ns := range resp.DelegationSet.NameServers {
attribute := fmt.Sprintf("name_servers.%d", idx)
dsns := rs.Primary.Attributes[attribute]
if dsns != *ns {
return fmt.Errorf("Got: %v for %v, Expected: %v", dsns, attribute, ns)