Fix error when creating client with empty list as tags (#3)

gmichels · Mar 6, 2023 · 98ccd39 · 98ccd39
1 parent a6ee5d7
commit 98ccd39
Showing 1 changed file with 7 additions and 31 deletions.
diff --git a/adguard/client_resource.go b/adguard/client_resource.go
@@ -5,11 +5,13 @@ import (
 	"time"
 
 	"github.com/gmichels/adguard-client-go"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/terraform-community-providers/terraform-plugin-framework-utils/modifiers"
 )
@@ -132,16 +134,19 @@ func (r *clientResource) Schema(_ context.Context, _ resource.SchemaRequest, res
 				Description: "List of blocked services for this client",
 				ElementType: types.StringType,
 				Optional:    true,
+				Validators:  []validator.List{listvalidator.SizeAtLeast(1)},
 			},
 			"upstreams": schema.ListAttribute{
 				Description: "List of upstream DNS server for this client",
 				ElementType: types.StringType,
 				Optional:    true,
+				Validators:  []validator.List{listvalidator.SizeAtLeast(1)},
 			},
 			"tags": schema.ListAttribute{
 				Description: "List of tags for this client",
 				ElementType: types.StringType,
 				Optional:    true,
+				Validators:  []validator.List{listvalidator.SizeAtLeast(1)},
 			},
 		},
 	}
@@ -214,38 +219,9 @@ func (r *clientResource) Create(ctx context.Context, req resource.CreateRequest,
 		return
 	}
 
-	// map response body to schema and populate Computed attribute values
+	// response sent by AdGuard Home is the same as the sent payload,
+	// just add missing attributes for state
 	plan.ID = types.StringValue(clientState.Name)
-	plan.Name = types.StringValue(clientState.Name)
-	plan.Ids, diags = types.ListValueFrom(ctx, types.StringType, clientState.Ids)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-	plan.UseGlobalSettings = types.BoolValue(clientState.UseGlobalSettings)
-	plan.FilteringEnabled = types.BoolValue(clientState.FilteringEnabled)
-	plan.ParentalEnabled = types.BoolValue(clientState.ParentalEnabled)
-	plan.SafebrowsingEnabled = types.BoolValue(clientState.SafebrowsingEnabled)
-	plan.SafesearchEnabled = types.BoolValue(clientState.SafesearchEnabled)
-	plan.UseGlobalBlockedServices = types.BoolValue(clientState.UseGlobalBlockedServices)
-	if len(clientState.BlockedServices) > 0 {
-		plan.BlockedServices, diags = types.ListValueFrom(ctx, types.StringType, clientState.BlockedServices)
-		resp.Diagnostics.Append(diags...)
-		if resp.Diagnostics.HasError() {
-			return
-		}
-	}
-	plan.Upstreams, diags = types.ListValueFrom(ctx, types.StringType, clientState.Upstreams)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-	plan.Tags, diags = types.ListValueFrom(ctx, types.StringType, clientState.Tags)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	// add the last updated attribute
 	plan.LastUpdated = types.StringValue(time.Now().Format(time.RFC850))