Skip to content

Commit

Permalink
providers/cloudflare: use cloudflare-go
Browse files Browse the repository at this point in the history 
The most improtant change is using record IDs as identifiers.
  • Loading branch information
@mitchellh
mitchellh committed May 3, 2016
1 parent a7311fa commit 109b3f5
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 133 deletions.
12 changes: 4 additions & 8 deletions builtin/providers/cloudflare/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package cloudflare
import (
"log"

"github.com/crackcomm/cloudflare"
// NOTE: Temporary until they merge my PR:
"github.com/mitchellh/cloudflare-go"
)

type Config struct {
Expand All @@ -12,13 +13,8 @@ type Config struct {
}

// Client() returns a new client for accessing cloudflare.
func (c *Config) Client() (*cloudflare.Client, error) {
client := cloudflare.New(&cloudflare.Options{
Email: c.Email,
Key: c.Token,
})

func (c *Config) Client() (*cloudflare.API, error) {
client := cloudflare.New(c.Token, c.Email)
log.Printf("[INFO] CloudFlare Client configured for user: %s", c.Email)

return client, nil
}
131 changes: 31 additions & 100 deletions builtin/providers/cloudflare/resource_cloudflare_record.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ package cloudflare
import (
"fmt"
"log"
"time"

"golang.org/x/net/context"

"github.com/crackcomm/cloudflare"
"github.com/hashicorp/terraform/helper/schema"

// NOTE: Temporary until they merge my PR:
"github.com/mitchellh/cloudflare-go"
)

func resourceCloudFlareRecord() *schema.Resource {
Expand Down Expand Up @@ -71,13 +70,13 @@ func resourceCloudFlareRecord() *schema.Resource {
}

func resourceCloudFlareRecordCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*cloudflare.Client)
client := meta.(*cloudflare.API)

newRecord := &cloudflare.Record{
Content: d.Get("value").(string),
newRecord := cloudflare.DNSRecord{
Type: d.Get("type").(string),
Name: d.Get("name").(string),
Content: d.Get("value").(string),
Proxied: d.Get("proxied").(bool),
Type: d.Get("type").(string),
ZoneName: d.Get("domain").(string),
}

Expand All @@ -89,44 +88,38 @@ func resourceCloudFlareRecordCreate(d *schema.ResourceData, meta interface{}) er
newRecord.TTL = ttl.(int)
}

zone, err := retrieveZone(client, newRecord.ZoneName)
zoneId, err := client.ZoneIDByName(newRecord.ZoneName)
if err != nil {
return err
return fmt.Errorf("Error finding zone %q: %s", newRecord.ZoneName, err)
}

d.Set("zone_id", zone.ID)
newRecord.ZoneID = zone.ID
d.Set("zone_id", zoneId)
newRecord.ZoneID = zoneId

log.Printf("[DEBUG] CloudFlare Record create configuration: %#v", newRecord)

ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))

err = client.Records.Create(ctx, newRecord)
r, err := client.CreateDNSRecord(zoneId, newRecord)
if err != nil {
return fmt.Errorf("Failed to create record: %s", err)
}

d.SetId(newRecord.ID)
d.SetId(r.ID)

log.Printf("[INFO] CloudFlare Record ID: %s", d.Id())

return resourceCloudFlareRecordRead(d, meta)
}

func resourceCloudFlareRecordRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*cloudflare.Client)
client := meta.(*cloudflare.API)
domain := d.Get("domain").(string)
rName := domain
if v := d.Get("name").(string); v != "@" {
rName = v + "." + rName
}

zone, err := retrieveZone(client, domain)
zoneId, err := client.ZoneIDByName(domain)
if err != nil {
return err
return fmt.Errorf("Error finding zone %q: %s", domain, err)
}

record, err := retrieveRecord(client, zone, rName)
record, err := client.DNSRecord(zoneId, d.Id())
if err != nil {
return err
}
Expand All @@ -138,21 +131,21 @@ func resourceCloudFlareRecordRead(d *schema.ResourceData, meta interface{}) erro
d.Set("ttl", record.TTL)
d.Set("priority", record.Priority)
d.Set("proxied", record.Proxied)
d.Set("zone_id", zone.ID)
d.Set("zone_id", zoneId)

return nil
}

func resourceCloudFlareRecordUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*cloudflare.Client)
client := meta.(*cloudflare.API)

updateRecord := &cloudflare.Record{
Content: d.Get("value").(string),
updateRecord := cloudflare.DNSRecord{
ID: d.Id(),
Name: d.Get("name").(string),
Proxied: false,
Type: d.Get("type").(string),
Name: d.Get("name").(string),
Content: d.Get("value").(string),
ZoneName: d.Get("domain").(string),
Proxied: false,
}

if priority, ok := d.GetOk("priority"); ok {
Expand All @@ -167,18 +160,15 @@ func resourceCloudFlareRecordUpdate(d *schema.ResourceData, meta interface{}) er
updateRecord.TTL = ttl.(int)
}

zone, err := retrieveZone(client, updateRecord.ZoneName)
zoneId, err := client.ZoneIDByName(updateRecord.ZoneName)
if err != nil {
return err
return fmt.Errorf("Error finding zone %q: %s", updateRecord.ZoneName, err)
}

updateRecord.ZoneID = zone.ID
updateRecord.ZoneID = zoneId

log.Printf("[DEBUG] CloudFlare Record update configuration: %#v", updateRecord)

ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))

err = client.Records.Patch(ctx, updateRecord)
err = client.UpdateDNSRecord(zoneId, d.Id(), updateRecord)
if err != nil {
return fmt.Errorf("Failed to update CloudFlare Record: %s", err)
}
Expand All @@ -187,79 +177,20 @@ func resourceCloudFlareRecordUpdate(d *schema.ResourceData, meta interface{}) er
}

func resourceCloudFlareRecordDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*cloudflare.Client)
client := meta.(*cloudflare.API)
domain := d.Get("domain").(string)
rName := domain
if v := d.Get("name").(string); v != "@" {
rName = v + "." + rName
}

zone, err := retrieveZone(client, domain)
zoneId, err := client.ZoneIDByName(domain)
if err != nil {
return err
}

record, err := retrieveRecord(client, zone, rName)
if err != nil {
return err
return fmt.Errorf("Error finding zone %q: %s", domain, err)
}

log.Printf("[INFO] Deleting CloudFlare Record: %s, %s", domain, d.Id())

ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))

err = client.Records.Delete(ctx, zone.ID, record.ID)
err = client.DeleteDNSRecord(zoneId, d.Id())
if err != nil {
return fmt.Errorf("Error deleting CloudFlare Record: %s", err)
}

return nil
}

func retrieveRecord(
client *cloudflare.Client,
zone *cloudflare.Zone,
name string) (*cloudflare.Record, error) {
ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))

rs, err := client.Records.List(ctx, zone.ID)
if err != nil {
return nil, fmt.Errorf("Unable to retrieve records for (%s): %s", zone.Name, err)
}

var record *cloudflare.Record

for _, r := range rs {
if r.Name == name {
record = r
}
}
if record == nil {
return nil, fmt.Errorf("Unable to find Cloudflare record %s", name)
}

return record, nil
}

func retrieveZone(client *cloudflare.Client, domain string) (*cloudflare.Zone, error) {
ctx, _ := context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))

zs, err := client.Zones.List(ctx)
if err != nil {
return nil, fmt.Errorf("Failed to fetch zone for %s: %s", domain, err)
}

var zone *cloudflare.Zone

for _, z := range zs {
if z.Name == domain {
zone = z
}
}

if zone == nil {
return nil, fmt.Errorf("Failed to find zone for: %s", domain)
}

return zone, nil
}
42 changes: 17 additions & 25 deletions builtin/providers/cloudflare/resource_cloudflare_record_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ import (
"fmt"
"os"
"testing"
"time"

"golang.org/x/net/context"

"github.com/crackcomm/cloudflare"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"

// NOTE: Temporary until they merge my PR:
"github.com/mitchellh/cloudflare-go"
)

func TestAccCloudFlareRecord_Basic(t *testing.T) {
var record cloudflare.Record
var record cloudflare.DNSRecord
domain := os.Getenv("CLOUDFLARE_DOMAIN")

resource.Test(t, resource.TestCase{
Expand All @@ -40,7 +39,7 @@ func TestAccCloudFlareRecord_Basic(t *testing.T) {
}

func TestAccCloudFlareRecord_Apex(t *testing.T) {
var record cloudflare.Record
var record cloudflare.DNSRecord
domain := os.Getenv("CLOUDFLARE_DOMAIN")

resource.Test(t, resource.TestCase{
Expand All @@ -66,7 +65,7 @@ func TestAccCloudFlareRecord_Apex(t *testing.T) {
}

func TestAccCloudFlareRecord_Proxied(t *testing.T) {
var record cloudflare.Record
var record cloudflare.DNSRecord
domain := os.Getenv("CLOUDFLARE_DOMAIN")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -95,7 +94,7 @@ func TestAccCloudFlareRecord_Proxied(t *testing.T) {
}

func TestAccCloudFlareRecord_Updated(t *testing.T) {
var record cloudflare.Record
var record cloudflare.DNSRecord
domain := os.Getenv("CLOUDFLARE_DOMAIN")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -134,7 +133,7 @@ func TestAccCloudFlareRecord_Updated(t *testing.T) {
}

func TestAccCloudFlareRecord_forceNewRecord(t *testing.T) {
var afterCreate, afterUpdate cloudflare.Record
var afterCreate, afterUpdate cloudflare.DNSRecord
domain := os.Getenv("CLOUDFLARE_DOMAIN")

resource.Test(t, resource.TestCase{
Expand All @@ -160,7 +159,7 @@ func TestAccCloudFlareRecord_forceNewRecord(t *testing.T) {
}

func testAccCheckCloudFlareRecordRecreated(t *testing.T,
before, after *cloudflare.Record) resource.TestCheckFunc {
before, after *cloudflare.DNSRecord) resource.TestCheckFunc {
return func(s *terraform.State) error {
if before.ID == after.ID {
t.Fatalf("Expected change of Record Ids, but both were %v", before.ID)
Expand All @@ -170,17 +169,14 @@ func testAccCheckCloudFlareRecordRecreated(t *testing.T,
}

func testAccCheckCloudFlareRecordDestroy(s *terraform.State) error {
var (
client = testAccProvider.Meta().(*cloudflare.Client)
ctx, _ = context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))
)
client := testAccProvider.Meta().(*cloudflare.API)

for _, rs := range s.RootModule().Resources {
if rs.Type != "cloudflare_record" {
continue
}

_, err := client.Records.Details(ctx, rs.Primary.Attributes["zone_id"], rs.Primary.ID)
_, err := client.DNSRecord(rs.Primary.Attributes["zone_id"], rs.Primary.ID)
if err == nil {
return fmt.Errorf("Record still exists")
}
Expand All @@ -189,7 +185,7 @@ func testAccCheckCloudFlareRecordDestroy(s *terraform.State) error {
return nil
}

func testAccCheckCloudFlareRecordAttributes(record *cloudflare.Record) resource.TestCheckFunc {
func testAccCheckCloudFlareRecordAttributes(record *cloudflare.DNSRecord) resource.TestCheckFunc {
return func(s *terraform.State) error {

if record.Content != "192.168.0.10" {
Expand All @@ -200,7 +196,7 @@ func testAccCheckCloudFlareRecordAttributes(record *cloudflare.Record) resource.
}
}

func testAccCheckCloudFlareRecordAttributesUpdated(record *cloudflare.Record) resource.TestCheckFunc {
func testAccCheckCloudFlareRecordAttributesUpdated(record *cloudflare.DNSRecord) resource.TestCheckFunc {
return func(s *terraform.State) error {

if record.Content != "192.168.0.11" {
Expand All @@ -211,7 +207,7 @@ func testAccCheckCloudFlareRecordAttributesUpdated(record *cloudflare.Record) re
}
}

func testAccCheckCloudFlareRecordExists(n string, record *cloudflare.Record) resource.TestCheckFunc {
func testAccCheckCloudFlareRecordExists(n string, record *cloudflare.DNSRecord) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
Expand All @@ -222,12 +218,8 @@ func testAccCheckCloudFlareRecordExists(n string, record *cloudflare.Record) res
return fmt.Errorf("No Record ID is set")
}

var (
client = testAccProvider.Meta().(*cloudflare.Client)
ctx, _ = context.WithDeadline(context.Background(), time.Now().Add(time.Second*30))
)

foundRecord, err := client.Records.Details(ctx, rs.Primary.Attributes["zone_id"], rs.Primary.ID)
client := testAccProvider.Meta().(*cloudflare.API)
foundRecord, err := client.DNSRecord(rs.Primary.Attributes["zone_id"], rs.Primary.ID)
if err != nil {
return err
}
Expand All @@ -236,7 +228,7 @@ func testAccCheckCloudFlareRecordExists(n string, record *cloudflare.Record) res
return fmt.Errorf("Record not found")
}

*record = *foundRecord
*record = foundRecord

return nil
}
Expand Down

0 comments on commit 109b3f5

Please sign in to comment.