Support lb type param on terraform sdk (#1023)

* Support lb type param on terraform sdk * Cleanup tests * Update digitalocean/loadbalancer/resource_loadbalancer.go PR feedback Co-authored-by: Andrew Starr-Bochicchio <[email protected]> --------- Co-authored-by: Andrew Starr-Bochicchio <[email protected]>
digitalocean · Sep 20, 2023 · 441d3a6 · 441d3a6
1 parent 54006ec
commit 441d3a6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/digitalocean/loadbalancer/datasource_loadbalancer.go b/digitalocean/loadbalancer/datasource_loadbalancer.go
@@ -247,6 +247,12 @@ func DataSourceDigitalOceanLoadbalancer() *schema.Resource {
  },
  },
  },
+ "type": {
+ Type: schema.TypeString,
+ Optional: true,
+ Computed: true,
+ Description: "the type of the load balancer (GLOBAL or REGIONAL)",
+ },
  },
  }
 }
@@ -323,6 +329,7 @@ func dataSourceDigitalOceanLoadbalancerRead(ctx context.Context, d *schema.Resou
  d.Set("vpc_uuid", foundLoadbalancer.VPCUUID)
  d.Set("http_idle_timeout_seconds", foundLoadbalancer.HTTPIdleTimeoutSeconds)
  d.Set("project_id", foundLoadbalancer.ProjectID)
+ d.Set("type", foundLoadbalancer.Type)
 
  if err := d.Set("droplet_ids", flattenDropletIds(foundLoadbalancer.DropletIDs)); err != nil {
  return diag.Errorf("[DEBUG] Error setting Load Balancer droplet_ids - error: %#v", err)

diff --git a/digitalocean/loadbalancer/datasource_loadbalancer_test.go b/digitalocean/loadbalancer/datasource_loadbalancer_test.go
@@ -41,6 +41,8 @@ data "digitalocean_loadbalancer" "foobar" {
  "data.digitalocean_loadbalancer.foobar", "region", "nyc3"),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "size_unit", "1"),
+ resource.TestCheckResourceAttr(
+ "data.digitalocean_loadbalancer.foobar", "type", ""),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "forwarding_rule.#", "1"),
  resource.TestCheckTypeSetElemNestedAttrs(
@@ -109,6 +111,8 @@ data "digitalocean_loadbalancer" "foobar" {
  "data.digitalocean_loadbalancer.foobar", "region", "nyc3"),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "size_unit", "1"),
+ resource.TestCheckResourceAttr(
+ "data.digitalocean_loadbalancer.foobar", "type", ""),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "forwarding_rule.#", "1"),
  resource.TestCheckTypeSetElemNestedAttrs(
@@ -173,6 +177,8 @@ data "digitalocean_loadbalancer" "foobar" {
  "data.digitalocean_loadbalancer.foobar", "region", "nyc3"),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "size_unit", "6"),
+ resource.TestCheckResourceAttr(
+ "data.digitalocean_loadbalancer.foobar", "type", ""),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "forwarding_rule.#", "1"),
  resource.TestCheckTypeSetElemNestedAttrs(
@@ -235,6 +241,8 @@ data "digitalocean_loadbalancer" "foobar" {
  "data.digitalocean_loadbalancer.foobar", "region", "nyc3"),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "size_unit", "6"),
+ resource.TestCheckResourceAttr(
+ "data.digitalocean_loadbalancer.foobar", "type", ""),
  resource.TestCheckResourceAttr(
  "data.digitalocean_loadbalancer.foobar", "forwarding_rule.#", "1"),
  resource.TestCheckTypeSetElemNestedAttrs(
@@ -651,7 +659,7 @@ resource "digitalocean_tag" "foo" {
 
 resource "digitalocean_droplet" "foo" {
  count = 2
- image = "ubuntu-18-04-x64"
+ image = "ubuntu-22-04-x64"
  name = "%s-${count.index}"
  region = "nyc3"
  size = "s-1vcpu-1gb"
@@ -663,6 +671,7 @@ resource "digitalocean_loadbalancer" "foo" {
  name = "%s"
  region = "nyc3"
  size = "%s"
+ type = "REGIONAL"
 
  forwarding_rule {
  entry_port = 80
@@ -690,7 +699,7 @@ resource "digitalocean_tag" "foo" {
 
 resource "digitalocean_droplet" "foo" {
  count = 2
- image = "ubuntu-18-04-x64"
+ image = "ubuntu-22-04-x64"
  name = "%s-${count.index}"
  region = "nyc3"
  size = "s-1vcpu-1gb"

diff --git a/digitalocean/loadbalancer/resource_loadbalancer.go b/digitalocean/loadbalancer/resource_loadbalancer.go
@@ -403,6 +403,12 @@ func resourceDigitalOceanLoadBalancerV0() *schema.Resource {
  },
  },
  },
+ "type": {
+ Type: schema.TypeString,
+ Optional: true,
+ ForceNew: true,
+ Description: "the type of the load balancer (GLOBAL or REGIONAL)",
+ },
  },
  }
 }
@@ -493,6 +499,10 @@ func buildLoadBalancerRequest(client *godo.Client, d *schema.ResourceData) (*god
  opts.VPCUUID = v.(string)
  }
 
+ if v, ok := d.GetOk("type"); ok {
+ opts.Type = v.(string)
+ }
+
  return opts, nil
 }
 
@@ -591,7 +601,6 @@ func resourceDigitalOceanLoadbalancerRead(ctx context.Context, d *schema.Resourc
  }
 
  return nil
-
 }
 
 func resourceDigitalOceanLoadbalancerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/digitalocean/loadbalancer/resource_loadbalancer_test.go b/digitalocean/loadbalancer/resource_loadbalancer_test.go
@@ -34,6 +34,8 @@ func TestAccDigitalOceanLoadbalancer_Basic(t *testing.T) {
  "digitalocean_loadbalancer.foobar", "name", name),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "region", "nyc3"),
+ resource.TestCheckResourceAttr(
+ "digitalocean_loadbalancer.foobar", "type", "REGIONAL"),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "size_unit", "1"),
  resource.TestCheckResourceAttr(
@@ -93,6 +95,8 @@ func TestAccDigitalOceanLoadbalancer_Updated(t *testing.T) {
  "digitalocean_loadbalancer.foobar", "name", name),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "region", "nyc3"),
+ resource.TestCheckResourceAttr(
+ "digitalocean_loadbalancer.foobar", "type", "REGIONAL"),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "size_unit", "1"),
  resource.TestCheckResourceAttr(
@@ -136,6 +140,8 @@ func TestAccDigitalOceanLoadbalancer_Updated(t *testing.T) {
  "digitalocean_loadbalancer.foobar", "name", name),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "region", "nyc3"),
+ resource.TestCheckResourceAttr(
+ "digitalocean_loadbalancer.foobar", "type", "REGIONAL"),
  resource.TestCheckResourceAttr(
  "digitalocean_loadbalancer.foobar", "size_unit", "1"),
  resource.TestCheckResourceAttr(
@@ -792,6 +798,7 @@ resource "digitalocean_droplet" "foobar" {
 resource "digitalocean_loadbalancer" "foobar" {
  name = "%s"
  region = "nyc3"
+ type = "REGIONAL"
 
  forwarding_rule {
  entry_port = 80
@@ -833,6 +840,7 @@ resource "digitalocean_droplet" "foo" {
 resource "digitalocean_loadbalancer" "foobar" {
  name = "%s"
  region = "nyc3"
+ type = "REGIONAL"
 
  forwarding_rule {
  entry_port = 81