provider/digitalocean: Adds a FQDN out to the digitalocean_record

builtin/providers/digitalocean/resource_digitalocean_record.go

@@ -62,6 +62,11 @@ func resourceDigitalOceanRecord() *schema.Resource {
  Computed: true,
  ForceNew: true,
  },
+
+ "fqdn": &schema.Schema{
+ Type: schema.TypeString,
+ Computed: true,
+ },
  },
  }
 }
@@ -146,6 +151,10 @@ func resourceDigitalOceanRecordRead(d *schema.ResourceData, meta interface{}) er
  d.Set("priority", strconv.Itoa(rec.Priority))
  d.Set("port", strconv.Itoa(rec.Port))
 
+ en := constructFqdn(rec.Name, d.Get("domain").(string))
+ log.Printf("[DEBUG] Constructred FQDN: %s", en)
+ d.Set("fqdn", en)
+
  return nil
 }
 
@@ -196,3 +205,12 @@ func resourceDigitalOceanRecordDelete(d *schema.ResourceData, meta interface{})
 
  return nil
 }
+
+func constructFqdn(name, domain string) string {
+ rn := strings.ToLower(strings.TrimSuffix(name, "."))
+ domain = strings.TrimSuffix(domain, ".")
+ if !strings.HasSuffix(rn, domain) {
+ rn = strings.Join([]string{name, domain}, ".")
+ }
+ return rn
+}

builtin/providers/digitalocean/resource_digitalocean_record_test.go

@@ -5,12 +5,35 @@ import (
  "strconv"
  "testing"
 
+ "strings"
+
  "github.com/digitalocean/godo"
  "github.com/hashicorp/terraform/helper/acctest"
  "github.com/hashicorp/terraform/helper/resource"
  "github.com/hashicorp/terraform/terraform"
 )
 
+func TestDigitalOceanRecordConstructFqdn(t *testing.T) {
+ cases := []struct {
+ Input, Output string
+ }{
+ {"www", "www.nonexample.com"},
+ {"dev.www", "dev.www.nonexample.com"},
+ {"*", "*.nonexample.com"},
+ {"nonexample.com", "nonexample.com"},
+ {"test.nonexample.com", "test.nonexample.com"},
+ {"test.nonexample.com.", "test.nonexample.com"},
+ }
+
+ domain := "nonexample.com"
+ for _, tc := range cases {
+ actual := constructFqdn(tc.Input, domain)
+ if actual != tc.Output {
+ t.Fatalf("input: %s\noutput: %s", tc.Input, actual)
+ }
+ }
+}
+
 func TestAccDigitalOceanRecord_Basic(t *testing.T) {
  var record godo.DomainRecord
  domain := fmt.Sprintf("foobar-test-terraform-%s.com", acctest.RandString(10))
@@ -31,6 +54,8 @@ func TestAccDigitalOceanRecord_Basic(t *testing.T) {
  "digitalocean_record.foobar", "domain", domain),
  resource.TestCheckResourceAttr(
  "digitalocean_record.foobar", "value", "192.168.0.10"),
+ resource.TestCheckResourceAttr(
+ "digitalocean_record.foobar", "fqdn", strings.Join([]string{"terraform", domain}, ".")),
  ),
  },
  },

website/source/docs/providers/do/r/record.html.markdown

@@ -45,4 +45,5 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `id` - The record ID
+* `fqdn` - The FQDN of the record