Fix Network Resource group order (#94)

Author: mohamed-essam

docs/resources/network_resource.md

@@ -38,7 +38,7 @@ resource "netbird_network_resource" "example" {
 ### Required
 
 - `address` (String) Network resource address (either a direct host like 1.1.1.1 or 1.1.1.1/32, or a subnet like 192.168.178.0/24, or domains like example.com and *.example.com)
-- `groups` (List of String) Group IDs containing the resource
+- `groups` (Set of String) Group IDs containing the resource
 - `name` (String) NetworkResource Name
 - `network_id` (String) The unique identifier of a network
 

internal/provider/network_resource_resource.go

@@ -6,10 +6,9 @@ package provider
 import (
 	"context"
 	"fmt"
-	"sort"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
+	"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -47,7 +46,7 @@ type NetworkResourceModel struct {
 	Description types.String `tfsdk:"description"`
 	Address     types.String `tfsdk:"address"`
 	Enabled     types.Bool   `tfsdk:"enabled"`
-	Groups      types.List   `tfsdk:"groups"`
+	Groups      types.Set    `tfsdk:"groups"`
 }
 
 func (r *NetworkResource) Metadata(ctx context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
@@ -93,11 +92,11 @@ func (r *NetworkResource) Schema(ctx context.Context, req resource.SchemaRequest
 				Computed:            true,
 				Default:             booldefault.StaticBool(true),
 			},
-			"groups": schema.ListAttribute{
+			"groups": schema.SetAttribute{
 				MarkdownDescription: "Group IDs containing the resource",
 				Required:            true,
 				ElementType:         types.StringType,
-				Validators:          []validator.List{listvalidator.ValueStringsAre(stringvalidator.LengthAtLeast(1)), listvalidator.SizeAtLeast(1)},
+				Validators:          []validator.Set{setvalidator.ValueStringsAre(stringvalidator.LengthAtLeast(1)), setvalidator.SizeAtLeast(1)},
 			},
 		},
 	}
@@ -135,8 +134,7 @@ func networkResourceAPIToTerraform(ctx context.Context, networkResource *api.Net
 	for i, k := range networkResource.Groups {
 		groups[i] = k.Id
 	}
-	sort.Strings(groups)
-	data.Groups, d = types.ListValueFrom(ctx, types.StringType, groups)
+	data.Groups, d = types.SetValueFrom(ctx, types.StringType, groups)
 	ret.Append(d...)
 	return ret
 }
@@ -156,7 +154,7 @@ func (r *NetworkResource) Create(ctx context.Context, req resource.CreateRequest
 		Description: data.Description.ValueStringPointer(),
 		Address:     data.Address.ValueString(),
 		Enabled:     data.Enabled.ValueBool(),
-		Groups:      stringListDefault(ctx, data.Groups, []string{}),
+		Groups:      stringSetDefault(ctx, data.Groups, []string{}),
 	}
 
 	networkResource, err := r.client.Networks.Resources(data.NetworkId.ValueString()).Create(ctx, networkResourceReq)
@@ -226,7 +224,7 @@ func (r *NetworkResource) Update(ctx context.Context, req resource.UpdateRequest
 		Description: data.Description.ValueStringPointer(),
 		Address:     data.Address.ValueString(),
 		Enabled:     data.Enabled.ValueBool(),
-		Groups:      stringListDefault(ctx, data.Groups, []string{}),
+		Groups:      stringSetDefault(ctx, data.Groups, []string{}),
 	}
 
 	networkResource, err := r.client.Networks.Resources(data.NetworkId.ValueString()).Update(ctx, data.Id.ValueString(), networkResourceReq)

internal/provider/network_resource_test.go

@@ -35,7 +35,7 @@ func Test_networkResourceAPIToTerraform(t *testing.T) {
 				Description: types.StringNull(),
 				Address:     types.StringValue("1.1.1.1/32"),
 				Enabled:     types.BoolValue(false),
-				Groups:      types.ListValueMust(types.StringType, []attr.Value{}),
+				Groups:      types.SetValueMust(types.StringType, []attr.Value{}),
 			},
 		},
 		{
@@ -62,7 +62,41 @@ func Test_networkResourceAPIToTerraform(t *testing.T) {
 				Description: types.StringValue("Test"),
 				Address:     types.StringValue("example.com"),
 				Enabled:     types.BoolValue(true),
-				Groups:      types.ListValueMust(types.StringType, []attr.Value{types.StringValue("g1")}),
+				Groups:      types.SetValueMust(types.StringType, []attr.Value{types.StringValue("g1")}),
+			},
+		},
+		{
+			resource: &api.NetworkResource{
+				Address:     "example.com",
+				Description: valPtr("Test"),
+				Enabled:     true,
+				Groups: []api.GroupMinimum{
+					{
+						Id:             "g1",
+						Name:           "not important",
+						Issued:         nil,
+						PeersCount:     0,
+						ResourcesCount: 0,
+					},
+					{
+						Id:             "g2",
+						Name:           "doesn't matter",
+						Issued:         nil,
+						PeersCount:     0,
+						ResourcesCount: 0,
+					},
+				},
+				Id:   "r2",
+				Name: "test2",
+				Type: api.NetworkResourceTypeDomain,
+			},
+			expected: NetworkResourceModel{
+				Id:          types.StringValue("r2"),
+				Name:        types.StringValue("test2"),
+				Description: types.StringValue("Test"),
+				Address:     types.StringValue("example.com"),
+				Enabled:     types.BoolValue(true),
+				Groups:      types.SetValueMust(types.StringType, []attr.Value{types.StringValue("g1"), types.StringValue("g2")}),
 			},
 		},
 	}
@@ -89,12 +123,11 @@ func Test_NetworkResource_Create(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				ResourceName: rName,
-				Config:       testNetworkResourceResource(rName, "network1", `example.com`, `["group-notall"]`, rName),
+				Config:       testNetworkResourceResource(rName, "network1", `example.com`, `["group-notall", "group-all"]`, rName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(rNameFull, "id"),
 					resource.TestCheckResourceAttr(rNameFull, "address", "example.com"),
-					resource.TestCheckResourceAttr(rNameFull, "groups.#", "1"),
-					resource.TestCheckResourceAttr(rNameFull, "groups.0", "group-notall"),
+					resource.TestCheckResourceAttr(rNameFull, "groups.#", "2"),
 					resource.TestCheckResourceAttr(rNameFull, "name", rName),
 					func(s *terraform.State) error {
 						nreID := s.RootModule().Resources[rNameFull].Primary.Attributes["id"]
@@ -107,8 +140,8 @@ func Test_NetworkResource_Create(t *testing.T) {
 							return fmt.Errorf("NetworkResource Address mismatch, expected example.com, found %s on management server", resource.Address)
 						}
 
-						if len(resource.Groups) != 1 || resource.Groups[0].Id != "group-notall" {
-							return fmt.Errorf("NetworkResource Groups mismatch, expected [group-notall], found %#v on management server", resource.Groups)
+						if len(resource.Groups) != 2 || (resource.Groups[0].Id != "group-notall" && resource.Groups[0].Id != "group-all") && (resource.Groups[1].Id != "group-notall" && resource.Groups[1].Id != "group-all") {
+							return fmt.Errorf("NetworkResource Groups mismatch, expected [group-notall, group-all], found %#v on management server", resource.Groups)
 						}
 
 						if resource.Name != rName {
@@ -139,11 +172,10 @@ func Test_NetworkResource_Update(t *testing.T) {
 			},
 			{
 				ResourceName: rName,
-				Config:       testNetworkResourceResource(rName, "network1", `google.com`, `["group-all"]`, rName+"Updated"),
+				Config:       testNetworkResourceResource(rName, "network1", `google.com`, `["group-all", "group-notall"]`, rName+"Updated"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(rNameFull, "address", "google.com"),
-					resource.TestCheckResourceAttr(rNameFull, "groups.#", "1"),
-					resource.TestCheckResourceAttr(rNameFull, "groups.0", "group-all"),
+					resource.TestCheckResourceAttr(rNameFull, "groups.#", "2"),
 					resource.TestCheckResourceAttr(rNameFull, "name", rName+"Updated"),
 					func(s *terraform.State) error {
 						nreID := s.RootModule().Resources[rNameFull].Primary.Attributes["id"]
@@ -156,8 +188,8 @@ func Test_NetworkResource_Update(t *testing.T) {
 							return fmt.Errorf("NetworkResource Address mismatch, expected google.com, found %s on management server", resource.Address)
 						}
 
-						if len(resource.Groups) != 1 || resource.Groups[0].Id != "group-all" {
-							return fmt.Errorf("NetworkResource Groups mismatch, expected [group-all], found %#v on management server", resource.Groups)
+						if len(resource.Groups) != 2 || (resource.Groups[0].Id != "group-notall" && resource.Groups[0].Id != "group-all") && (resource.Groups[1].Id != "group-notall" && resource.Groups[1].Id != "group-all") {
+							return fmt.Errorf("NetworkResource Groups mismatch, expected [group-notall, group-all], found %#v on management server", resource.Groups)
 						}
 
 						if resource.Name != rName+"Updated" {

internal/provider/util.go

@@ -41,6 +41,15 @@ func stringListDefault(ctx context.Context, a types.List, b []string) []string {
 	return ret
 }
 
+func stringSetDefault(ctx context.Context, a types.Set, b []string) []string {
+	if a.IsUnknown() || a.IsNull() {
+		return b
+	}
+	var ret []string
+	a.ElementsAs(ctx, &ret, false)
+	return ret
+}
+
 func int32Default(a types.Int32, b int32) int32 {
 	if a.IsUnknown() || a.IsNull() {
 		return b