Adds new resource cloudflare_ip_list

cloudflare/provider.go

@@ -120,6 +120,7 @@ func Provider() terraform.ResourceProvider {
 			"cloudflare_filter":                                 resourceCloudflareFilter(),
 			"cloudflare_firewall_rule":                          resourceCloudflareFirewallRule(),
 			"cloudflare_healthcheck":                            resourceCloudflareHealthcheck(),
+			"cloudflare_ip_list":                                resourceCloudflareIPList(),
 			"cloudflare_load_balancer_monitor":                  resourceCloudflareLoadBalancerMonitor(),
 			"cloudflare_load_balancer_pool":                     resourceCloudflareLoadBalancerPool(),
 			"cloudflare_load_balancer":                          resourceCloudflareLoadBalancer(),

cloudflare/resource_cloudflare_ip_list.go

@@ -0,0 +1,187 @@
+package cloudflare
+
+import (
+	"context"
+	"fmt"
+	"github.com/cloudflare/cloudflare-go"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	"github.com/pkg/errors"
+	"regexp"
+	"strings"
+)
+
+func resourceCloudflareIPList() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceCloudflareIPListCreate,
+		Read:   resourceCloudflareIPListRead,
+		Update: resourceCloudflareIPListUpdate,
+		Delete: resourceCloudflareIPListDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceCloudflareIPListImport,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"account_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringMatch(regexp.MustCompile("^[0-9a-z_]+$"), "IP List name must only contain lowercase letters, numbers and underscores"),
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"kind": {
+				Type:         schema.TypeString,
+				ValidateFunc: validation.StringInSlice([]string{"ip"}, false),
+				Required:     true,
+			},
+			"item": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem:     listItemElem,
+			},
+		},
+	}
+}
+
+var listItemElem = &schema.Resource{
+	Schema: map[string]*schema.Schema{
+		"id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"value": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"comment": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+	},
+}
+
+func resourceCloudflareIPListCreate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*cloudflare.API)
+	client.AccountID = d.Get("account_id").(string)
+
+	list, err := client.CreateIPList(context.Background(), d.Get("name").(string), d.Get("description").(string), d.Get("kind").(string))
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("error creating IP List %s", d.Get("name").(string)))
+	}
+
+	d.SetId(list.ID)
+
+	if items, ok := d.GetOk("item"); ok {
+		IPListItems := buildIPListItemsCreateRequest(items.(*schema.Set).List())
+		_, err = client.CreateIPListItems(context.Background(), d.Id(), IPListItems)
+		if err != nil {
+			return errors.Wrap(err, fmt.Sprintf("error creating IP List Items"))
+		}
+	}
+
+	return resourceCloudflareIPListRead(d, meta)
+}
+
+func resourceCloudflareIPListImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	client := meta.(*cloudflare.API)
+	attributes := strings.SplitN(d.Id(), "/", 2)
+
+	if len(attributes) != 2 {
+		return nil, fmt.Errorf("invalid id (\"%s\") specified, should be in format \"accountID/listID\"", d.Id())
+	}
+
+	accountID, listID := attributes[0], attributes[1]
+	d.SetId(listID)
+	client.AccountID = accountID
+
+	resourceCloudflareIPListRead(d, meta)
+
+	return []*schema.ResourceData{d}, nil
+}
+
+func resourceCloudflareIPListRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*cloudflare.API)
+	client.AccountID = d.Get("account_id").(string)
+
+	list, err := client.GetIPList(context.Background(), d.Id())
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("error reading IP List with ID %q", d.Id()))
+	}
+
+	d.Set("name", list.Name)
+	d.Set("description", list.Description)
+	d.Set("kind", list.Kind)
+
+	items, err := client.ListIPListItems(context.Background(), d.Id())
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("error reading IP List Items"))
+	}
+
+	var itemData []map[string]interface{}
+	var item map[string]interface{}
+
+	for _, i := range items {
+		item = make(map[string]interface{})
+		item["id"] = i.ID
+		item["value"] = i.IP
+		item["comment"] = i.Comment
+
+		itemData = append(itemData, item)
+	}
+
+	d.Set("item", itemData)
+
+	return nil
+}
+
+func resourceCloudflareIPListUpdate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*cloudflare.API)
+	client.AccountID = d.Get("account_id").(string)
+
+	_, err := client.UpdateIPList(context.Background(), d.Id(), d.Get("description").(string))
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("error updating IP List description"))
+	}
+
+	if items, ok := d.GetOk("item"); ok {
+		IPListItems := buildIPListItemsCreateRequest(items.(*schema.Set).List())
+		_, err = client.ReplaceIPListItems(context.Background(), d.Id(), IPListItems)
+		if err != nil {
+			return errors.Wrap(err, fmt.Sprintf("error creating IP List Items"))
+		}
+	}
+
+	return resourceCloudflareIPListRead(d, meta)
+}
+
+func resourceCloudflareIPListDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*cloudflare.API)
+	client.AccountID = d.Get("account_id").(string)
+
+	_, err := client.DeleteIPList(context.Background(), d.Id())
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("error deleting IP List with ID %q", d.Id()))
+	}
+
+	return nil
+}
+
+func buildIPListItemsCreateRequest(items []interface{}) []cloudflare.IPListItemCreateRequest {
+	var IPListItems []cloudflare.IPListItemCreateRequest
+
+	for _, item := range items {
+		IPListItems = append(IPListItems, cloudflare.IPListItemCreateRequest{
+			IP:      item.(map[string]interface{})["value"].(string),
+			Comment: item.(map[string]interface{})["comment"].(string),
+		})
+	}
+
+	return IPListItems
+}

cloudflare/resource_cloudflare_ip_list_test.go

@@ -0,0 +1,170 @@
+package cloudflare
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/cloudflare/cloudflare-go"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+)
+
+func TestAccCloudflareIPListExists(t *testing.T) {
+	rnd := generateRandomResourceName()
+	name := fmt.Sprintf("cloudflare_ip_list.%s", rnd)
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+
+	var IPList cloudflare.IPList
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheckAccount(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCloudflareIPList(rnd, rnd, rnd, accountID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareIPListExists(name, &IPList),
+					resource.TestCheckResourceAttr(
+						name, "name", rnd),
+				),
+			},
+		},
+	})
+}
+
+func TestAccCloudflareIPListUpdateDescription(t *testing.T) {
+	rnd := generateRandomResourceName()
+	name := fmt.Sprintf("cloudflare_ip_list.%s", rnd)
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+
+	var IPList cloudflare.IPList
+	var initialID string
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheckAccount(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCloudflareIPList(rnd, rnd, rnd, accountID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareIPListExists(name, &IPList),
+					resource.TestCheckResourceAttr(
+						name, "description", rnd),
+				),
+			},
+			{
+				PreConfig: func() {
+					initialID = IPList.ID
+				},
+				Config: testAccCheckCloudflareIPList(rnd, rnd, rnd+"-updated", accountID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareIPListExists(name, &IPList),
+					func(state *terraform.State) error {
+						if initialID != IPList.ID {
+							return fmt.Errorf("wanted update but IPList got recreated (id changed %q -> %q)",
+								initialID, IPList.ID)
+						}
+						return nil
+					},
+					resource.TestCheckResourceAttr(name, "description", rnd+"-updated"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccCloudflareIPListUpdate(t *testing.T) {
+	rnd := generateRandomResourceName()
+	name := fmt.Sprintf("cloudflare_ip_list.%s", rnd)
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+
+	var IPList cloudflare.IPList
+	var initialID string
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheckAccount(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCloudflareIPList(rnd, rnd, rnd, accountID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareIPListExists(name, &IPList),
+					resource.TestCheckResourceAttr(
+						name, "name", rnd),
+				),
+			},
+			{
+				PreConfig: func() {
+					initialID = IPList.ID
+				},
+				Config: testAccCheckCloudflareIPListUpdate(rnd, rnd, rnd, accountID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudflareIPListExists(name, &IPList),
+					func(state *terraform.State) error {
+						if initialID != IPList.ID {
+							return fmt.Errorf("wanted update but IPList got recreated (id changed %q -> %q)",
+								initialID, IPList.ID)
+						}
+						return nil
+					},
+					resource.TestCheckResourceAttr(name, "item.#", "2"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckCloudflareIPListExists(n string, list *cloudflare.IPList) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No IP List ID is set")
+		}
+
+		client := testAccProvider.Meta().(*cloudflare.API)
+		foundIPList, err := client.GetIPList(context.Background(), rs.Primary.ID)
+		if err != nil {
+			return err
+		}
+
+		*list = foundIPList
+
+		return nil
+	}
+}
+
+func testAccCheckCloudflareIPList(ID, name, description, accountID string) string {
+	return fmt.Sprintf(`
+  resource "cloudflare_ip_list" "%[1]s" {
+	account_id = "%[4]s"
+    name = "%[2]s"
+	description = "%[3]s"
+  	kind = "ip"
+  }`, ID, name, description, accountID)
+}
+
+func testAccCheckCloudflareIPListUpdate(ID, name, description, accountID string) string {
+	return fmt.Sprintf(`
+  resource "cloudflare_ip_list" "%[1]s" {
+	account_id = "%[4]s"
+    name = "%[2]s"
+	description = "%[3]s"
+  	kind = "ip"
+
+  	item {
+      value = "192.0.2.0"
+      comment = "one"
+    }
+
+    item {
+      value = "192.0.2.1"
+      comment = "two"
+    }
+  }`, ID, name, description, accountID)
+}

website/cloudflare.erb

@@ -88,6 +88,9 @@
             <li<%= sidebar_current("docs-cloudflare-resource-healthcheck") %>>
               <a href="/docs/providers/cloudflare/r/healthcheck.html">cloudflare_healthcheck</a>
             </li>
+            <li<%= sidebar_current("docs-cloudflare-resource-ip-list") %>>
+              <a href="/docs/providers/cloudflare/r/ip_list.html">cloudflare_ip_list</a>
+            </li>
             <li<%= sidebar_current("docs-cloudflare-resource-load-balancer") %>>
               <a href="/docs/providers/cloudflare/r/load_balancer.html">cloudflare_load_balancer</a>
             </li>