sorting the name_server entries

hashicorp · Apr 23, 2015 · fe2d9ea · fe2d9ea
1 parent 6b51383
commit fe2d9ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/builtin/providers/aws/resource_aws_route53_zone.go b/builtin/providers/aws/resource_aws_route53_zone.go
@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"log"
+	"sort"
 	"strings"
 	"time"
 
@@ -101,6 +102,7 @@ func resourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) error
 	for i := range zone.DelegationSet.NameServers {
 		ns[i] = *zone.DelegationSet.NameServers[i]
 	}
+	sort.Strings(ns)
 	if err := d.Set("name_servers", ns); err != nil {
 		return fmt.Errorf("[DEBUG] Error setting name servers for: %s, error: %#v", d.Id(), err)
 	}

diff --git a/builtin/providers/aws/resource_aws_route53_zone_test.go b/builtin/providers/aws/resource_aws_route53_zone_test.go
@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"sort"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -115,10 +116,15 @@ func testAccCheckRoute53ZoneExists(n string, zone *route53.HostedZone) resource.
 			return fmt.Errorf("Hosted zone err: %v", err)
 		}
 
-		for idx, ns := range resp.DelegationSet.NameServers {
+		sorted_ns := make([]string, len(resp.DelegationSet.NameServers))
+		for i, ns := range resp.DelegationSet.NameServers {
+			sorted_ns[i] = *ns
+		}
+		sort.Strings(sorted_ns)
+		for idx, ns := range sorted_ns {
 			attribute := fmt.Sprintf("name_servers.%d", idx)
 			dsns := rs.Primary.Attributes[attribute]
-			if dsns != *ns {
+			if dsns != ns {
 				return fmt.Errorf("Got: %v for %v, Expected: %v", dsns, attribute, ns)
 			}
 		}