feat: add TypeSet support (#1171)

CHANGELOG.md

@@ -8,6 +8,8 @@ nav_order: 1
 
 ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD
 
+- Set `TypeSet` for `user_peer_network_cidrs` field
+
 ## [4.3.0] - 2023-05-10
 
 - Added docs and validation for `aiven_service_integration_endpoint`

docs/data-sources/transit_gateway_vpc_attachment.md

@@ -36,6 +36,6 @@ data "aiven_transit_gateway_vpc_attachment" "attachment" {
 - `peering_connection_id` (String) Cloud provider identifier for the peering connection if available
 - `state` (String) State of the peering connection
 - `state_info` (Map of String) State-specific help or error information
-- `user_peer_network_cidrs` (List of String) List of private IPv4 ranges to route through the peering connection
+- `user_peer_network_cidrs` (Set of String) List of private IPv4 ranges to route through the peering connection
 
 

docs/resources/transit_gateway_vpc_attachment.md

@@ -32,7 +32,7 @@ resource "aiven_transit_gateway_vpc_attachment" "attachment" {
 - `peer_cloud_account` (String) AWS account ID or GCP project ID of the peered VPC. This property cannot be changed, doing so forces recreation of the resource.
 - `peer_region` (String) AWS region of the peered VPC (if not in the same region as Aiven VPC)
 - `peer_vpc` (String) Transit gateway ID. This property cannot be changed, doing so forces recreation of the resource.
-- `user_peer_network_cidrs` (List of String) List of private IPv4 ranges to route through the peering connection
+- `user_peer_network_cidrs` (Set of String) List of private IPv4 ranges to route through the peering connection
 - `vpc_id` (String) The VPC the peering connection belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource.
 
 ### Optional

internal/schemautil/schemautil.go

@@ -141,7 +141,8 @@ func EmptyObjectDiffSuppressFunc(k, old, new string, d *schema.ResourceData) boo
 func EmptyObjectDiffSuppressFuncSkipArrays(s map[string]*schema.Schema) schema.SchemaDiffSuppressFunc {
 	var skipKeys []string
 	for key, sh := range s {
-		if sh.Type == schema.TypeList {
+		switch sh.Type {
+		case schema.TypeList, schema.TypeSet:
 			skipKeys = append(skipKeys, key)
 		}
 	}

internal/schemautil/userconfig/apiconvert/fromapi.go

@@ -3,6 +3,8 @@ package apiconvert
 import (
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/aiven/terraform-provider-aiven/internal/schemautil/userconfig"
 )
 
@@ -190,6 +192,11 @@ func propsFromAPI(n string, r map[string]interface{}, p map[string]interface{})
 				}
 
 				vrs = l
+
+				switch k {
+				case "user_peer_network_cidrs":
+					vrs = schema.NewSet(schema.HashString, l)
+				}
 			}
 		case "object":
 			vra, ok := vr.(map[string]interface{})

internal/schemautil/userconfig/apiconvert/toapi.go

@@ -6,6 +6,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/aiven/terraform-provider-aiven/internal/schemautil/userconfig"
 )
 
@@ -268,7 +270,12 @@ func itemToAPI(
 
 		va, ok := v.([]interface{})
 		if !ok {
-			return nil, false, fmt.Errorf("%s: not a slice", fks)
+			// This can be TypeSet
+			set, ok := v.(*schema.Set)
+			if !ok {
+				return nil, false, fmt.Errorf("%s: not slice or set", fks)
+			}
+			va = set.List()
 		}
 
 		if va == nil || o {

internal/sdkprovider/service/vpc/transit_gateway_vpc_attachement.go

@@ -4,11 +4,11 @@ import (
 	"context"
 
 	"github.com/aiven/aiven-go-client"
-	"github.com/aiven/terraform-provider-aiven/internal/schemautil/userconfig"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	"github.com/aiven/terraform-provider-aiven/internal/schemautil"
+	"github.com/aiven/terraform-provider-aiven/internal/schemautil/userconfig"
 )
 
 var aivenTransitGatewayVPCAttachmentSchema = map[string]*schema.Schema{
@@ -32,7 +32,7 @@ var aivenTransitGatewayVPCAttachmentSchema = map[string]*schema.Schema{
 	},
 	"user_peer_network_cidrs": {
 		Required:    true,
-		Type:        schema.TypeList,
+		Type:        schema.TypeSet,
 		Description: "List of private IPv4 ranges to route through the peering connection",
 		Elem: &schema.Schema{
 			Type:     schema.TypeString,