diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a41bc2e3..376b80330 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ FEATURES:
continously updated as apply is running, meaning that the state is
less likely to become corrupt in a catastrophic case: terraform panic
or system killing Terraform.
- * **New provider: `dnsmadeeasy`** [GH-855]
+ * **New provider: `dme` (DNSMadeEasy)** [GH-855]
IMPROVEMENTS:
diff --git a/builtin/bins/provider-dnsmadeeasy/main.go b/builtin/bins/provider-dme/main.go
similarity index 54%
rename from builtin/bins/provider-dnsmadeeasy/main.go
rename to builtin/bins/provider-dme/main.go
index 45809e0e1..705615faa 100644
--- a/builtin/bins/provider-dnsmadeeasy/main.go
+++ b/builtin/bins/provider-dme/main.go
@@ -1,12 +1,12 @@
package main
import (
- "github.com/hashicorp/terraform/builtin/providers/dnsmadeeasy"
+ "github.com/hashicorp/terraform/builtin/providers/dme"
"github.com/hashicorp/terraform/plugin"
)
func main() {
plugin.Serve(&plugin.ServeOpts{
- ProviderFunc: dnsmadeeasy.Provider,
+ ProviderFunc: dme.Provider,
})
}
diff --git a/builtin/bins/provider-dnsmadeeasy/main_test.go b/builtin/bins/provider-dme/main_test.go
similarity index 100%
rename from builtin/bins/provider-dnsmadeeasy/main_test.go
rename to builtin/bins/provider-dme/main_test.go
diff --git a/builtin/providers/dnsmadeeasy/config.go b/builtin/providers/dme/config.go
similarity index 68%
rename from builtin/providers/dnsmadeeasy/config.go
rename to builtin/providers/dme/config.go
index 7e88ed566..514df0d10 100644
--- a/builtin/providers/dnsmadeeasy/config.go
+++ b/builtin/providers/dme/config.go
@@ -1,8 +1,8 @@
-package dnsmadeeasy
+package dme
import (
"fmt"
- dme "github.com/soniah/dnsmadeeasy"
+ "github.com/soniah/dnsmadeeasy"
"log"
)
@@ -14,14 +14,14 @@ type Config struct {
}
// Client returns a new client for accessing DNSMadeEasy
-func (c *Config) Client() (*dme.Client, error) {
- client, err := dme.NewClient(c.AKey, c.SKey)
+func (c *Config) Client() (*dnsmadeeasy.Client, error) {
+ client, err := dnsmadeeasy.NewClient(c.AKey, c.SKey)
if err != nil {
return nil, fmt.Errorf("Error setting up client: %s", err)
}
if c.UseSandbox {
- client.URL = dme.SandboxURL
+ client.URL = dnsmadeeasy.SandboxURL
}
log.Printf("[INFO] DNSMadeEasy Client configured for AKey: %s", client.AKey)
diff --git a/builtin/providers/dnsmadeeasy/provider.go b/builtin/providers/dme/provider.go
similarity index 98%
rename from builtin/providers/dnsmadeeasy/provider.go
rename to builtin/providers/dme/provider.go
index 7bd868659..ea134520a 100644
--- a/builtin/providers/dnsmadeeasy/provider.go
+++ b/builtin/providers/dme/provider.go
@@ -1,4 +1,4 @@
-package dnsmadeeasy
+package dme
import (
"os"
diff --git a/builtin/providers/dnsmadeeasy/provider_test.go b/builtin/providers/dme/provider_test.go
similarity index 98%
rename from builtin/providers/dnsmadeeasy/provider_test.go
rename to builtin/providers/dme/provider_test.go
index 1f2ba3089..76b51712b 100644
--- a/builtin/providers/dnsmadeeasy/provider_test.go
+++ b/builtin/providers/dme/provider_test.go
@@ -1,4 +1,4 @@
-package dnsmadeeasy
+package dme
import (
"os"
diff --git a/builtin/providers/dnsmadeeasy/resource_dme_record.go b/builtin/providers/dme/resource_dme_record.go
similarity index 95%
rename from builtin/providers/dnsmadeeasy/resource_dme_record.go
rename to builtin/providers/dme/resource_dme_record.go
index c3b7659ff..6c50523bf 100644
--- a/builtin/providers/dnsmadeeasy/resource_dme_record.go
+++ b/builtin/providers/dme/resource_dme_record.go
@@ -1,4 +1,4 @@
-package dnsmadeeasy
+package dme
import (
"fmt"
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/hashicorp/terraform/helper/schema"
- dme "github.com/soniah/dnsmadeeasy"
+ "github.com/soniah/dnsmadeeasy"
)
func resourceDMERecord() *schema.Resource {
@@ -79,7 +79,7 @@ func resourceDMERecord() *schema.Resource {
}
func resourceDMERecordCreate(d *schema.ResourceData, meta interface{}) error {
- client := meta.(*dme.Client)
+ client := meta.(*dnsmadeeasy.Client)
domainid := d.Get("domainid").(string)
log.Printf("[INFO] Creating record for domainid: %s", domainid)
@@ -102,7 +102,7 @@ func resourceDMERecordCreate(d *schema.ResourceData, meta interface{}) error {
}
func resourceDMERecordRead(d *schema.ResourceData, meta interface{}) error {
- client := meta.(*dme.Client)
+ client := meta.(*dnsmadeeasy.Client)
domainid := d.Get("domainid").(string)
recordid := d.Id()
@@ -117,7 +117,7 @@ func resourceDMERecordRead(d *schema.ResourceData, meta interface{}) error {
}
func resourceDMERecordUpdate(d *schema.ResourceData, meta interface{}) error {
- client := meta.(*dme.Client)
+ client := meta.(*dnsmadeeasy.Client)
domainid := d.Get("domainid").(string)
recordid := d.Id()
@@ -136,7 +136,7 @@ func resourceDMERecordUpdate(d *schema.ResourceData, meta interface{}) error {
}
func resourceDMERecordDelete(d *schema.ResourceData, meta interface{}) error {
- client := meta.(*dme.Client)
+ client := meta.(*dnsmadeeasy.Client)
domainid := d.Get("domainid").(string)
recordid := d.Id()
@@ -203,7 +203,7 @@ func getAll(d *schema.ResourceData, cr map[string]interface{}) error {
return nil
}
-func setAll(d *schema.ResourceData, rec *dme.Record) error {
+func setAll(d *schema.ResourceData, rec *dnsmadeeasy.Record) error {
d.Set("type", rec.Type)
d.Set("name", rec.Name)
d.Set("ttl", rec.TTL)
diff --git a/builtin/providers/dnsmadeeasy/resource_dme_record_test.go b/builtin/providers/dme/resource_dme_record_test.go
similarity index 95%
rename from builtin/providers/dnsmadeeasy/resource_dme_record_test.go
rename to builtin/providers/dme/resource_dme_record_test.go
index 75f5d7029..284ab0ad9 100644
--- a/builtin/providers/dnsmadeeasy/resource_dme_record_test.go
+++ b/builtin/providers/dme/resource_dme_record_test.go
@@ -1,4 +1,4 @@
-package dnsmadeeasy
+package dme
import (
"fmt"
@@ -7,14 +7,14 @@ import (
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
- dme "github.com/soniah/dnsmadeeasy"
+ "github.com/soniah/dnsmadeeasy"
)
var _ = fmt.Sprintf("dummy") // dummy
var _ = os.DevNull // dummy
func TestAccDMERecordA(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -43,7 +43,7 @@ func TestAccDMERecordA(t *testing.T) {
}
func TestAccDMERecordCName(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -77,7 +77,7 @@ ANAME can't be tested under sandbox, as the value of the ANAME must be a
resolvable address.
func TestAccDMERecordAName(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -107,7 +107,7 @@ func TestAccDMERecordAName(t *testing.T) {
*/
func TestAccDMERecordMX(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -138,7 +138,7 @@ func TestAccDMERecordMX(t *testing.T) {
}
func TestAccDMERecordHTTPRED(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -179,7 +179,7 @@ func TestAccDMERecordHTTPRED(t *testing.T) {
}
func TestAccDMERecordTXT(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -208,7 +208,7 @@ func TestAccDMERecordTXT(t *testing.T) {
}
func TestAccDMERecordSPF(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -237,7 +237,7 @@ func TestAccDMERecordSPF(t *testing.T) {
}
func TestAccDMERecordPTR(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -266,7 +266,7 @@ func TestAccDMERecordPTR(t *testing.T) {
}
func TestAccDMERecordNS(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -295,7 +295,7 @@ func TestAccDMERecordNS(t *testing.T) {
}
func TestAccDMERecordAAAA(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -324,7 +324,7 @@ func TestAccDMERecordAAAA(t *testing.T) {
}
func TestAccDMERecordSRV(t *testing.T) {
- var record dme.Record
+ var record dnsmadeeasy.Record
domainid := os.Getenv("DME_DOMAINID")
resource.Test(t, resource.TestCase{
@@ -359,7 +359,7 @@ func TestAccDMERecordSRV(t *testing.T) {
}
func testAccCheckDMERecordDestroy(s *terraform.State) error {
- client := testAccProvider.Meta().(*dme.Client)
+ client := testAccProvider.Meta().(*dnsmadeeasy.Client)
for _, rs := range s.RootModule().Resources {
if rs.Type != "dnsmadeeasy_record" {
@@ -376,7 +376,7 @@ func testAccCheckDMERecordDestroy(s *terraform.State) error {
return nil
}
-func testAccCheckDMERecordExists(n string, record *dme.Record) resource.TestCheckFunc {
+func testAccCheckDMERecordExists(n string, record *dnsmadeeasy.Record) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
@@ -388,7 +388,7 @@ func testAccCheckDMERecordExists(n string, record *dme.Record) resource.TestChec
return fmt.Errorf("No Record ID is set")
}
- client := testAccProvider.Meta().(*dme.Client)
+ client := testAccProvider.Meta().(*dnsmadeeasy.Client)
foundRecord, err := client.ReadRecord(rs.Primary.Attributes["domainid"], rs.Primary.ID)
diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss
index a0d2ce807..f144f813a 100755
--- a/website/source/assets/stylesheets/_docs.scss
+++ b/website/source/assets/stylesheets/_docs.scss
@@ -9,6 +9,7 @@ body.page-sub{
body.layout-atlas,
body.layout-consul,
body.layout-dnsimple,
+body.layout-dme,
body.layout-cloudflare,
body.layout-cloudstack,
body.layout-google,
diff --git a/website/source/docs/providers/dnsmadeeasy/index.html.markdown b/website/source/docs/providers/dme/index.html.markdown
similarity index 93%
rename from website/source/docs/providers/dnsmadeeasy/index.html.markdown
rename to website/source/docs/providers/dme/index.html.markdown
index bb32a6fd8..1c4150f2d 100644
--- a/website/source/docs/providers/dnsmadeeasy/index.html.markdown
+++ b/website/source/docs/providers/dme/index.html.markdown
@@ -1,7 +1,7 @@
---
-layout: "dnsmadeeasy"
+layout: "dme"
page_title: "Provider: DNSMadeEasy"
-sidebar_current: "docs-dnsmadeeasy-index"
+sidebar_current: "docs-dme-index"
description: |-
The DNSMadeEasy provider is used to interact with the resources supported by DNSMadeEasy. The provider needs to be configured with the proper credentials before it can be used.
---
diff --git a/website/source/docs/providers/dnsmadeeasy/r/record.html.markdown b/website/source/docs/providers/dme/r/record.html.markdown
similarity index 95%
rename from website/source/docs/providers/dnsmadeeasy/r/record.html.markdown
rename to website/source/docs/providers/dme/r/record.html.markdown
index aeb48d279..6e7a7b040 100644
--- a/website/source/docs/providers/dnsmadeeasy/r/record.html.markdown
+++ b/website/source/docs/providers/dme/r/record.html.markdown
@@ -45,24 +45,24 @@ required for some record types.
http://help.dnsmadeeasy.com/tutorials/managed-dns/ has more
information.
-### A Record
+#### A Record
* `value` is the hostname
-### CNAME Record
+#### CNAME Record
* `value` is the alias name
-### ANAME Record
+#### ANAME Record
* `value` is the aname target
-### MX Record
+#### MX Record
* `value` is the server
* `mxLevel` (Integer, Required) is the MX level
-### HTTPRED Record
+#### HTTPRED Record
* `value` is the URL
* `hardLink` (Boolean, Optional) If true, any request that is
@@ -80,27 +80,27 @@ information.
of this field
* `description` (Optional) A human-readable description.
-### TXT Record
+#### TXT Record
* `value` is free form text
-### SPF Record
+#### SPF Record
* `value` is the SPF definition of hosts allowed to send email
-### PTR Record
+#### PTR Record
* `value` is the reverse DNS for the host
-### NS Record
+#### NS Record
* `value` is the host name of the server
-### AAAA Record
+#### AAAA Record
* `value` is the IPv6 address
-### SRV Record
+#### SRV Record
* `value` is the host
* `priority` (Integer, Required). Acts the same way as MX Level
@@ -121,7 +121,7 @@ The following attributes are exported:
Additional fields may also be exported by some record types -
see DNS Record Types.
-## Record Type Examples
+#### Record Type Examples
Following are examples of using each of the record types.
diff --git a/website/source/layouts/dme.erb b/website/source/layouts/dme.erb
new file mode 100644
index 000000000..2e7212456
--- /dev/null
+++ b/website/source/layouts/dme.erb
@@ -0,0 +1,26 @@
+<% wrap_layout :inner do %>
+ <% content_for :sidebar do %>
+
+ <% end %>
+
+ <%= yield %>
+ <% end %>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index c71ac5a2e..2e9a7afdb 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -128,6 +128,10 @@
DigitalOcean
+ >
+ DNSMadeEasy
+
+
>
DNSimple