avoid unnecessary diffs in members

See issue #17 Turn Lists into Sets, so the order doesn't matter
zerotier · Oct 18, 2022 · 80dafac · 80dafac
1 parent 231cfa4
commit 80dafac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pkg/zerotier/converters.go b/pkg/zerotier/converters.go
@@ -44,6 +44,10 @@ func fetchStringList(d *schema.ResourceData, attr string) *[]string {
 	return toStringList(d.Get(attr).([]interface{})).(*[]string)
 }
 
+func fetchStringSet(d *schema.ResourceData, attr string) *[]string {
+	return toStringList(d.Get(attr).(*schema.Set).List()).(*[]string)
+}
+
 func toStringList(i interface{}) interface{} {
 	ray := &[]string{}
 	for _, x := range i.([]interface{}) {
@@ -56,6 +60,10 @@ func fetchIntList(d *schema.ResourceData, attr string) *[]int {
 	return toIntList(d.Get(attr).([]interface{})).(*[]int)
 }
 
+func fetchIntSet(d *schema.ResourceData, attr string) *[]int {
+	return toIntList(d.Get(attr).(*schema.Set).List()).(*[]int)
+}
+
 func fetchTags(d []interface{}) *[][]int {
 	tags := [][]int{}
 

diff --git a/pkg/zerotier/member.go b/pkg/zerotier/member.go
@@ -59,7 +59,7 @@ var MemberSchema = map[string]*schema.Schema{
 		Description: "Exempt this member from the IP auto assignment pool on a Network",
 	},
 	"ip_assignments": {
-		Type:     schema.TypeList,
+		Type:     schema.TypeSet,
 		Computed: true,
 		Optional: true,
 		Elem: &schema.Schema{
@@ -68,7 +68,7 @@ var MemberSchema = map[string]*schema.Schema{
 		Description: "List of IP address assignments",
 	},
 	"capabilities": {
-		Type:     schema.TypeList,
+		Type:     schema.TypeSet,
 		Computed: true,
 		Optional: true,
 		Elem: &schema.Schema{
@@ -77,7 +77,7 @@ var MemberSchema = map[string]*schema.Schema{
 		Description: "List of network capabilities",
 	},
 	"tags": {
-		Type:     schema.TypeList,
+		Type:     schema.TypeSet, 
 		Computed: true,
 		Optional: true,
 		Elem: &schema.Schema{
@@ -102,9 +102,9 @@ func toMember(d *schema.ResourceData) *spec.Member {
 			Authorized:      boolPtr(d.Get("authorized").(bool)),
 			ActiveBridge:    boolPtr(d.Get("allow_ethernet_bridging").(bool)),
 			NoAutoAssignIps: boolPtr(d.Get("no_auto_assign_ips").(bool)),
-			Capabilities:    fetchIntList(d, "capabilities"),
-			IpAssignments:   fetchStringList(d, "ip_assignments"),
-			Tags:            fetchTags(d.Get("tags").([]interface{})),
+			Capabilities:    fetchIntSet(d, "capabilities"),
+			IpAssignments:   fetchStringSet(d, "ip_assignments"),
+			Tags:            fetchTags(d.Get("tags").(*schema.Set).List()),
 		},
 	}
 }