Added RRSet comments

Author: Stanislau Petrusiou

powerdns/client.go

@@ -428,26 +428,14 @@ func (client *Client) DeleteZone(name string) error {
 
 // ListRecords returns all records in Zone
 func (client *Client) ListRecords(zone string) ([]Record, error) {
-	req, err := client.newRequest("GET", fmt.Sprintf("/servers/localhost/zones/%s", zone), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := client.HTTP.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	zoneInfo := new(ZoneInfo)
-	err = json.NewDecoder(resp.Body).Decode(zoneInfo)
+	rrsets, err := client.ListRRSets(zone)
 	if err != nil {
 		return nil, err
 	}
 
-	records := zoneInfo.Records
+	var records []Record
 	// Convert the API v1 response to v0 record structure
-	for _, rrs := range zoneInfo.ResourceRecordSets {
+	for _, rrs := range rrsets {
 		for _, record := range rrs.Records {
 			records = append(records, Record{
 				Name:    rrs.Name,
@@ -461,6 +449,26 @@ func (client *Client) ListRecords(zone string) ([]Record, error) {
 	return records, nil
 }
 
+func (client *Client) getZoneInfo(zone string) (*ZoneInfo, error) {
+	req, err := client.newRequest("GET", fmt.Sprintf("/servers/localhost/zones/%s", zone), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := client.HTTP.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	zoneInfo := new(ZoneInfo)
+	err = json.NewDecoder(resp.Body).Decode(zoneInfo)
+	if err != nil {
+		return nil, err
+	}
+	return zoneInfo, nil
+}
+
 // ListRecordsInRRSet returns only records of specified name and type
 func (client *Client) ListRecordsInRRSet(zone string, name string, tpe string) ([]Record, error) {
 	allRecords, err := client.ListRecords(zone)
@@ -487,6 +495,35 @@ func (client *Client) ListRecordsByID(zone string, recID string) ([]Record, erro
 	return client.ListRecordsInRRSet(zone, name, tpe)
 }
 
+//GetResourceRecordSet by zone and id
+func (client *Client) GetRRSetOfRecord(zone string, recID string) (*ResourceRecordSet, error) {
+	name, tpe, err := parseID(recID)
+	if err != nil {
+		return nil, err
+	}
+
+	rrsets, err := client.ListRRSets(zone)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, rrset := range rrsets {
+		if rrset.Name == name && rrset.Type == tpe {
+			return &rrset, nil
+		}
+	}
+	return nil, fmt.Errorf("Error getting rrset %s. Not found.", name)
+}
+
+//ListRRSets by zone
+func (client *Client) ListRRSets(zone string) ([]ResourceRecordSet, error) {
+	zoneInfo, err := client.getZoneInfo(zone)
+	if err != nil {
+		return nil, err
+	}
+	return zoneInfo.ResourceRecordSets, nil
+}
+
 // RecordExists checks if requested record exists in Zone
 func (client *Client) RecordExists(zone string, name string, tpe string) (bool, error) {
 	allRecords, err := client.ListRecords(zone)

powerdns/resource_powerdns_record.go

@@ -231,6 +231,8 @@ func resourcePDNSRecordImport(d *schema.ResourceData, meta interface{}) ([]*sche
 	log.Printf("[INFO] importing PowerDNS Record %s in Zone: %s", recordID, zoneName)
 
 	records, err := client.ListRecordsByID(zoneName, recordID)
+	rrset, err := client.GetRRSetOfRecord(zoneName, recordID)
+
 	if err != nil {
 		return nil, fmt.Errorf("couldn't fetch PowerDNS Record: %s", err)
 	}
@@ -244,11 +246,20 @@ func resourcePDNSRecordImport(d *schema.ResourceData, meta interface{}) ([]*sche
 		recs = append(recs, r.Content)
 	}
 
+	commentsSet := make([]map[string]interface{}, len(rrset.Comments))
+	for i, comment := range rrset.Comments {
+		commentsSet[i] = map[string]interface{}{
+			"content": comment.Content,
+			"account": comment.Account,
+		}
+	}
+
 	d.Set("zone", zoneName)
 	d.Set("name", records[0].Name)
 	d.Set("ttl", records[0].TTL)
 	d.Set("type", records[0].Type)
 	d.Set("records", recs)
+	d.Set("comment", commentsSet)
 	d.SetId(recordID)
 
 	return []*schema.ResourceData{d}, nil

powerdns/resource_powerdns_record_test.go

@@ -395,6 +395,9 @@ func TestAccPDNSRecord_TXT(t *testing.T) {
 }
 
 func TestAccPDNSRecord_WithComments(t *testing.T) {
+	resourceName := "powerdns_record.test-comments"
+	resourceID := `{"zone":"sysa.xyz.","id":"comment.sysa.xyz.:::A"}`
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -403,9 +406,15 @@ func TestAccPDNSRecord_WithComments(t *testing.T) {
 			{
 				Config: testPDSNRecordWithComments,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckPDNSRecordExists("powerdns_record.test-comments"),
+					testAccCheckPDNSRecordExists(resourceName),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportStateId:     resourceID,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }