Fixed remarks from @mbag

Author: andrey.menzhinskiy

powerdns/client.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -31,10 +32,11 @@ type Client struct {
 	HTTP          *http.Client
 	CacheEnable   bool // Enable/Disable chache for REST API requests
 	Cache         *freecache.Cache
+	CacheTTL      int
 }
 
 // NewClient returns a new PowerDNS client
-func NewClient(serverURL string, apiKey string, configTLS *tls.Config, cacheEnable bool, cacheSizeMB string) (*Client, error) {
+func NewClient(serverURL string, apiKey string, configTLS *tls.Config, cacheEnable bool, cacheSizeMB string, cacheTTL int) (*Client, error) {
 
 	cleanURL, err := sanitizeURL(serverURL)
 
@@ -60,6 +62,7 @@ func NewClient(serverURL string, apiKey string, configTLS *tls.Config, cacheEnab
 		APIVersion:  -1,
 		CacheEnable: cacheEnable,
 		Cache:       freecache.NewCache(DefaultCacheSize),
+		CacheTTL:    cacheTTL,
 	}
 
 	if err := client.setServerVersion(); err != nil {
@@ -440,20 +443,27 @@ func (client *Client) DeleteZone(name string) error {
 func (client *Client) GetZoneInfoFromCache(zone string) (*ZoneInfo, error) {
 	if client.CacheEnable {
 		cacheZoneInfo, err := client.Cache.Get([]byte(zone))
-
 		if err != nil {
 			return nil, err
 		}
+
 		zoneInfo := new(ZoneInfo)
-		json.Unmarshal(cacheZoneInfo, &zoneInfo)
+		err = json.Unmarshal(cacheZoneInfo, &zoneInfo)
+		if err != nil {
+			return nil, err
+		}
+
 		return zoneInfo, err
 	}
 	return nil, nil
 }
 
 // ListRecords returns all records in Zone
 func (client *Client) ListRecords(zone string) ([]Record, error) {
-	zoneInfo, _ := client.GetZoneInfoFromCache(zone)
+	zoneInfo, err := client.GetZoneInfoFromCache(zone)
+	if err != nil {
+		log.Printf("[WARN] module.freecache: %s: %s", zone, err)
+	}
 
 	if zoneInfo == nil {
 		req, err := client.newRequest("GET", fmt.Sprintf("/servers/localhost/zones/%s", zone), nil)
@@ -478,8 +488,8 @@ func (client *Client) ListRecords(zone string) ([]Record, error) {
 			if err != nil {
 				return nil, err
 			}
-			// Default cache ttl is 30 sec, I think that is enough
-			err = client.Cache.Set([]byte(zone), cacheValue, 30)
+
+			err = client.Cache.Set([]byte(zone), cacheValue, client.CacheTTL)
 			if err != nil {
 				return nil, fmt.Errorf("The cache for REST API requests is enabled but the size isn't enough: cacheSize: %db \n %s",
 					DefaultCacheSize, err)

powerdns/config.go

@@ -17,6 +17,7 @@ type Config struct {
 	CACertificate   string
 	CacheEnable     bool
 	CacheMemorySize string
+	CacheTTL        int
 }
 
 // Client returns a new client for accessing PowerDNS
@@ -38,7 +39,7 @@ func (c *Config) Client() (*Client, error) {
 
 	tlsConfig.InsecureSkipVerify = c.InsecureHTTPS
 
-	client, err := NewClient(c.ServerURL, c.APIKey, tlsConfig, c.CacheEnable, c.CacheMemorySize)
+	client, err := NewClient(c.ServerURL, c.APIKey, tlsConfig, c.CacheEnable, c.CacheMemorySize, c.CacheTTL)
 
 	if err != nil {
 		return nil, fmt.Errorf("Error setting up PowerDNS client: %s", err)

powerdns/provider.go

@@ -43,7 +43,13 @@ func Provider() terraform.ResourceProvider {
 				Type:        schema.TypeString,
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("PDNS_CACHE_MEM_SIZE", "100"),
-				Description: "Set cache memory size in Mb",
+				Description: "Set cache memory size in MB",
+			},
+			"cache_ttl": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("PDNS_CACHE_TTL", 30),
+				Description: "Set cache TTL in seconds",
 			},
 		},
 
@@ -64,6 +70,7 @@ func providerConfigure(data *schema.ResourceData) (interface{}, error) {
 		CACertificate:   data.Get("ca_certificate").(string),
 		CacheEnable:     data.Get("cache_requests").(bool),
 		CacheMemorySize: data.Get("cache_mem_size").(string),
+		CacheTTL:        data.Get("cache_ttl").(int),
 	}
 
 	return config.Client()

website/docs/index.html.markdown

@@ -40,5 +40,5 @@ The following arguments are supported:
 * `server_url` - (Required) The address of PowerDNS server. This can also be specified with `PDNS_SERVER_URL` environment variable. When no schema is provided, the default is `https`.
 * `ca_certificate` - (Optional) A valid path of a Root CA Certificate in PEM format _or_ the content of a Root CA certificate in PEM format. This can also be specified with `PDNS_CACERT` environment variable.
 * `insecure_https` - (Optional) Set this to `true` to disable verification of the PowerDNS server's TLS certificate. This can also be specified with the `PDNS_INSECURE_HTTPS` environment variable.
-* `cache_requests` - (Optional) Set this to `true` to enable cache of the PowerDNS REST API requests. This can also be specified with the `PDNS_CACHE_REQUESTS` environment variable.
+* `cache_requests` - (Optional) Set this to `true` to enable cache of the PowerDNS REST API requests. This can also be specified with the `PDNS_CACHE_REQUESTS` environment variable. `WARNING! Enabling this option can lead to the use of stale records when you use other automation to populate the DNS zone records at the same time.`
 * `cache_mem_size` - (Optional) Memory size in MB for a cache of the PowerDNS REST API requests. This can also be specified with the `PDNS_CACHE_MEM_SIZE` environment variable.