Fix freeipa_dns_record

Author: mcanevet

freeipa/resource_freeipa_dns_record.go

@@ -1,6 +1,7 @@
 package freeipa
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -53,15 +54,15 @@ func resourceFreeIPADNSRecordCreate(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
+	idnsname := d.Get("idnsname").(string)
+	dnszoneidnsname := d.Get("dnszoneidnsname")
+
 	args := ipa.DnsrecordAddArgs{
-		Idnsname: d.Get("idnsname").(string),
+		Idnsname: idnsname,
 	}
 
-	optArgs := ipa.DnsrecordAddOptionalArgs{}
-
-	if _dnszoneidnsname, ok := d.GetOkExists("dnszoneidnsname"); ok {
-		dnszoneidnsname := _dnszoneidnsname.(string)
-		optArgs.Dnszoneidnsname = &dnszoneidnsname
+	optArgs := ipa.DnsrecordAddOptionalArgs{
+		Dnszoneidnsname: &dnszoneidnsname,
 	}
 
 	if _dnsttl, ok := d.GetOkExists("dnsttl"); ok {
@@ -84,7 +85,7 @@ func resourceFreeIPADNSRecordCreate(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
-	d.SetId(args.Idnsname)
+	d.SetId(fmt.Sprintf("%s.%s", idnsname, dnszoneidnsname))
 
 	return resourceFreeIPADNSRecordRead(d, meta)
 }
@@ -104,7 +105,7 @@ func resourceFreeIPADNSRecordUpdate(d *schema.ResourceData, meta interface{}) er
 	optArgs := ipa.DnsrecordModOptionalArgs{}
 
 	if _dnszoneidnsname, ok := d.GetOkExists("dnszoneidnsname"); ok {
-		dnszoneidnsname := _dnszoneidnsname.(string)
+		dnszoneidnsname := _dnszoneidnsname
 		optArgs.Dnszoneidnsname = &dnszoneidnsname
 	}
 
@@ -146,7 +147,7 @@ func resourceFreeIPADNSRecordRead(d *schema.ResourceData, meta interface{}) erro
 	optArgs := ipa.DnsrecordShowOptionalArgs{}
 
 	if _dnszoneidnsname, ok := d.GetOkExists("dnszoneidnsname"); ok {
-		dnszoneidnsname := _dnszoneidnsname.(string)
+		dnszoneidnsname := _dnszoneidnsname
 		optArgs.Dnszoneidnsname = &dnszoneidnsname
 	}
 
@@ -182,7 +183,12 @@ func resourceFreeIPADNSRecordDelete(d *schema.ResourceData, meta interface{}) er
 		Idnsname: d.Get("idnsname").(string),
 	}
 
-	optArgs := ipa.DnsrecordDelOptionalArgs{}
+	dnszoneidnsname := d.Get("dnszoneidnsname")
+	delAll := true
+	optArgs := ipa.DnsrecordDelOptionalArgs{
+		Dnszoneidnsname: &dnszoneidnsname,
+		DelAll:          &delAll,
+	}
 
 	_, err = client.DnsrecordDel(&args, &optArgs)
 	if err != nil {

go.mod

@@ -2,6 +2,8 @@ module github.com/camptocamp/terraform-provider-freeipa
 
 go 1.12
 
+replace github.com/tehwalris/go-freeipa => github.com/camptocamp/go-freeipa v0.0.0-20200408154013-bc9bd4dc80cf
+
 require (
 	github.com/hashicorp/terraform-plugin-sdk v1.7.0
 	github.com/tehwalris/go-freeipa v0.0.0-20200322083409-e462fc554b76

go.sum

@@ -30,6 +30,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/camptocamp/go-freeipa v0.0.0-20200408154013-bc9bd4dc80cf h1:tcUp4fdVVheiDFpi91kvVHPc1EwgDLGZ/wRyNgkq5YA=
+github.com/camptocamp/go-freeipa v0.0.0-20200408154013-bc9bd4dc80cf/go.mod h1:mZZdj7BR8u8vfMa+vTuaebKc6ko4XefzNn5bguha+0M=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=