Merge pull request #73 from jbe-dw/fixZoneUpdate

Enable more fields to be updated with zone update

Author: mbag

powerdns/client.go

@@ -185,6 +185,14 @@ type ZoneInfo struct {
 	SoaEditAPI         string              `json:"soa_edit_api"`
 }
 
+// ZoneInfoUpd is a limited subset for supported updates
+type ZoneInfoUpd struct {
+	Name       string `json:"name"`
+	Kind       string `json:"kind"`
+	SoaEditAPI string `json:"soa_edit_api,omitempty"`
+	Account    string `json:"account"`
+}
+
 // Record represents a PowerDNS record object
 type Record struct {
 	Name     string `json:"name"`
@@ -388,7 +396,7 @@ func (client *Client) CreateZone(zoneInfo ZoneInfo) (ZoneInfo, error) {
 }
 
 // UpdateZone updates a zone
-func (client *Client) UpdateZone(name string, zoneInfo ZoneInfo) error {
+func (client *Client) UpdateZone(name string, zoneInfo ZoneInfoUpd) error {
 	body, err := json.Marshal(zoneInfo)
 	if err != nil {
 		return err

powerdns/resource_powerdns_zone.go

@@ -123,6 +123,7 @@ func resourcePDNSZoneCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.SetId(createdZoneInfo.ID)
+	resourcePDNSZoneRead(d, meta)
 
 	return nil
 }
@@ -167,15 +168,16 @@ func resourcePDNSZoneUpdate(d *schema.ResourceData, meta interface{}) error {
 
 	client := meta.(*Client)
 
-	zoneInfo := ZoneInfo{}
-	shouldUpdate := false
-	if d.HasChange("kind") {
+	zoneInfo := ZoneInfoUpd{}
+	if d.HasChange("kind") || d.HasChange("account") || d.HasChange("soa_edit_api") {
+		zoneInfo.Name = d.Get("name").(string)
 		zoneInfo.Kind = d.Get("kind").(string)
-		shouldUpdate = true
-	}
+		zoneInfo.Account = d.Get("account").(string)
+		zoneInfo.SoaEditAPI = d.Get("soa_edit_api").(string)
 
-	if shouldUpdate {
-		return client.UpdateZone(d.Id(), zoneInfo)
+		c := client.UpdateZone(d.Id(), zoneInfo)
+		resourcePDNSZoneRead(d, meta)
+		return c
 	}
 	return nil
 }