Merge pull request #494 from MusicDin/cp/fix-network-zones

Fix network zone minor issue - from Incus
terraform-lxd · Jul 10, 2024 · 32291df · 32291df
2 parents b06bbd6 + 80694d4
commit 32291df
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/docs/resources/network_zone.md b/docs/resources/network_zone.md
@@ -22,7 +22,7 @@ resource "lxd_network_zone" "zone" {
 
 resource "lxd_network_zone_record" "record" {
   name = "ns"
-  zone = lxd_network_zone.zone.id
+  zone = lxd_network_zone.zone.name
 
   entry {
       type  = "CNAME"

diff --git a/docs/resources/network_zone_record.md b/docs/resources/network_zone_record.md
@@ -22,7 +22,7 @@ resource "lxd_network_zone" "zone" {
 
 resource "lxd_network_zone_record" "record" {
   name = "ns"
-  zone = lxd_network_zone.zone.id
+  zone = lxd_network_zone.zone.name
 
   entry {
       type  = "CNAME"

diff --git a/internal/network/resource_network_zone_record.go b/internal/network/resource_network_zone_record.go
@@ -30,7 +30,7 @@ type NetworkZoneRecordModel struct {
 	Name        types.String `tfsdk:"name"`
 	Zone        types.String `tfsdk:"zone"`
 	Description types.String `tfsdk:"description"`
-	Enteries    types.Set    `tfsdk:"entry"`
+	Entries     types.Set    `tfsdk:"entry"`
 	Project     types.String `tfsdk:"project"`
 	Remote      types.String `tfsdk:"remote"`
 	Config      types.Map    `tfsdk:"config"`
@@ -118,7 +118,8 @@ func (r NetworkZoneRecordResource) Schema(_ context.Context, _ resource.SchemaRe
 						},
 
 						"ttl": schema.Int64Attribute{
-							Required:    true,
+							Optional:    true,
+							Computed:    true,
 							Description: "Record entry TTL",
 							Validators: []validator.Int64{
 								int64validator.AtLeast(1),
@@ -168,7 +169,7 @@ func (r NetworkZoneRecordResource) Create(ctx context.Context, req resource.Crea
 	config, diags := common.ToConfigMap(ctx, plan.Config)
 	resp.Diagnostics.Append(diags...)
 
-	entries, diags := ToZoneRecordEntryList(ctx, plan.Enteries)
+	entries, diags := ToZoneRecordEntryList(ctx, plan.Entries)
 	resp.Diagnostics.Append(diags...)
 
 	if resp.Diagnostics.HasError() {
@@ -251,7 +252,7 @@ func (r NetworkZoneRecordResource) Update(ctx context.Context, req resource.Upda
 	config, diags := common.ToConfigMap(ctx, plan.Config)
 	resp.Diagnostics.Append(diags...)
 
-	entries, diags := ToZoneRecordEntryList(ctx, plan.Enteries)
+	entries, diags := ToZoneRecordEntryList(ctx, plan.Entries)
 	resp.Diagnostics.Append(diags...)
 
 	if resp.Diagnostics.HasError() {
@@ -347,7 +348,7 @@ func (r NetworkZoneRecordResource) SyncState(ctx context.Context, tfState *tfsdk
 	m.Zone = types.StringValue(zoneName)
 	m.Name = types.StringValue(record.Name)
 	m.Description = types.StringValue(record.Description)
-	m.Enteries = entries
+	m.Entries = entries
 	m.Config = config
 
 	if respDiags.HasError() {

diff --git a/internal/network/resource_network_zone_record_test.go b/internal/network/resource_network_zone_record_test.go
@@ -37,7 +37,7 @@ func TestAccNetworkZoneRecord_entries(t *testing.T) {
 	entry1 := map[string]string{
 		"type":  "CNAME",
 		"value": "one",
-		"ttl":   "3600",
+		"ttl":   "",
 	}
 
 	entry2 := map[string]string{
@@ -132,7 +132,6 @@ resource "lxd_network_zone_record" "record" {
   entry {
     type  = "CNAME"
     value = "one"
-    ttl   = 3600
   }
 }
 `, zoneName, recordName)