bump to v0.51.0

.changelog/1932.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/cloudflare_load_balancer: update internal method signatures to match upstream library
+```
+
+```release-note:enhancement
+resource/cloudflare_load_balancer_pool: update internal method signatures to match upstream library
+```
+
+```release-note:enhancement
+resource/cloudflare_load_balancer_monitor: update internal method signatures to match upstream library
+```

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
-	github.com/cloudflare/cloudflare-go v0.50.0
+	github.com/cloudflare/cloudflare-go v0.51.0
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/errwrap v1.1.0 // indirect

go.sum

@@ -31,8 +31,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/cloudflare-go v0.50.0 h1:RS4tttMecD1rYCiMMfJeW8s9OEhCm85Y+70RJuOoxNA=
-github.com/cloudflare/cloudflare-go v0.50.0/go.mod h1:4+j2gGo6xyrFiYmpa2y4mNzu7pPPN42kyv1b2EqiZGQ=
+github.com/cloudflare/cloudflare-go v0.51.0 h1:ZLDg3hNZ42sJahO3kdcy7NtXAlSS//pmly921jAbZ2o=
+github.com/cloudflare/cloudflare-go v0.51.0/go.mod h1:4+j2gGo6xyrFiYmpa2y4mNzu7pPPN42kyv1b2EqiZGQ=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=

internal/provider/resource_cloudflare_load_balancer.go

@@ -309,7 +309,7 @@ func resourceCloudflareLoadBalancerCreate(ctx context.Context, d *schema.Resourc
 
 	tflog.Info(ctx, fmt.Sprintf("Creating Cloudflare Load Balancer from struct: %+v", newLoadBalancer))
 
-	r, err := client.CreateLoadBalancer(ctx, zoneID, newLoadBalancer)
+	r, err := client.CreateLoadBalancer(ctx, cloudflare.ZoneIdentifier(zoneID), cloudflare.CreateLoadBalancerParams{LoadBalancer: newLoadBalancer})
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error creating load balancer for zone"))
 	}
@@ -392,9 +392,9 @@ func resourceCloudflareLoadBalancerUpdate(ctx context.Context, d *schema.Resourc
 
 	tflog.Info(ctx, fmt.Sprintf("Updating Cloudflare Load Balancer from struct: %+v", loadBalancer))
 
-	_, err := client.ModifyLoadBalancer(ctx, zoneID, loadBalancer)
+	_, err := client.UpdateLoadBalancer(ctx, cloudflare.ZoneIdentifier(zoneID), cloudflare.UpdateLoadBalancerParams{LoadBalancer: loadBalancer})
 	if err != nil {
-		return diag.FromErr(errors.Wrap(err, "error creating load balancer for zone"))
+		return diag.FromErr(errors.Wrap(err, "error updating load balancer for zone"))
 	}
 
 	return resourceCloudflareLoadBalancerRead(ctx, d, meta)
@@ -421,7 +421,7 @@ func resourceCloudflareLoadBalancerRead(ctx context.Context, d *schema.ResourceD
 	zoneID := d.Get("zone_id").(string)
 	loadBalancerID := d.Id()
 
-	loadBalancer, err := client.LoadBalancerDetails(ctx, zoneID, loadBalancerID)
+	loadBalancer, err := client.GetLoadBalancer(ctx, cloudflare.ZoneIdentifier(zoneID), loadBalancerID)
 	if err != nil {
 		var notFoundError *cloudflare.NotFoundError
 		if errors.As(err, &notFoundError) {
@@ -511,7 +511,7 @@ func resourceCloudflareLoadBalancerDelete(ctx context.Context, d *schema.Resourc
 
 	tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer: %s in zone: %s", loadBalancerID, zoneID))
 
-	err := client.DeleteLoadBalancer(ctx, zoneID, loadBalancerID)
+	err := client.DeleteLoadBalancer(ctx, cloudflare.ZoneIdentifier(zoneID), loadBalancerID)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error deleting Cloudflare Load Balancer: %w", err))
 	}

internal/provider/resource_cloudflare_load_balancer_monitor.go

@@ -94,7 +94,7 @@ func resourceCloudflareLoadBalancerPoolMonitorCreate(ctx context.Context, d *sch
 
 	tflog.Debug(ctx, fmt.Sprintf("Creating Cloudflare Load Balancer Monitor from struct: %+v", loadBalancerMonitor))
 
-	r, err := client.CreateLoadBalancerMonitor(ctx, loadBalancerMonitor)
+	r, err := client.CreateLoadBalancerMonitor(ctx, cloudflare.AccountIdentifier(client.AccountID), cloudflare.CreateLoadBalancerMonitorParams{LoadBalancerMonitor: loadBalancerMonitor})
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error creating load balancer monitor"))
 	}
@@ -182,7 +182,7 @@ func resourceCloudflareLoadBalancerPoolMonitorUpdate(ctx context.Context, d *sch
 
 	tflog.Debug(ctx, fmt.Sprintf("Update Cloudflare Load Balancer Monitor from struct: %+v", loadBalancerMonitor))
 
-	_, err := client.ModifyLoadBalancerMonitor(ctx, loadBalancerMonitor)
+	_, err := client.UpdateLoadBalancerMonitor(ctx, cloudflare.AccountIdentifier(client.AccountID), cloudflare.UpdateLoadBalancerMonitorParams{LoadBalancerMonitor: loadBalancerMonitor})
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error modifying load balancer monitor"))
 	}
@@ -205,7 +205,7 @@ func expandLoadBalancerMonitorHeader(cfgSet interface{}) map[string][]string {
 func resourceCloudflareLoadBalancerPoolMonitorRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*cloudflare.API)
 
-	loadBalancerMonitor, err := client.LoadBalancerMonitorDetails(ctx, d.Id())
+	loadBalancerMonitor, err := client.GetLoadBalancerMonitor(ctx, cloudflare.AccountIdentifier(client.AccountID), d.Id())
 	if err != nil {
 		var notFoundError *cloudflare.NotFoundError
 		if errors.As(err, &notFoundError) {
@@ -262,7 +262,7 @@ func resourceCloudflareLoadBalancerPoolMonitorDelete(ctx context.Context, d *sch
 
 	tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer Monitor: %s ", d.Id()))
 
-	err := client.DeleteLoadBalancerMonitor(ctx, d.Id())
+	err := client.DeleteLoadBalancerMonitor(ctx, cloudflare.AccountIdentifier(client.AccountID), d.Id())
 	if err != nil {
 		var notFoundError *cloudflare.NotFoundError
 		if errors.As(err, &notFoundError) {

internal/provider/resource_cloudflare_load_balancer_monitor_test.go

@@ -36,7 +36,7 @@ func testSweepCloudflareLoadBalancerMonitors(r string) error {
 	}
 
 	client.AccountID = accountID
-	monitors, err := client.ListLoadBalancerMonitors(ctx)
+	monitors, err := client.ListLoadBalancerMonitors(ctx, cloudflare.AccountIdentifier(client.AccountID), cloudflare.ListLoadBalancerMonitorParams{})
 	if err != nil {
 		tflog.Error(ctx, fmt.Sprintf("Failed to fetch Cloudflare Load Balancer Monitors: %s", err))
 	}
@@ -49,7 +49,7 @@ func testSweepCloudflareLoadBalancerMonitors(r string) error {
 	for _, monitor := range monitors {
 		tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer Monitor ID: %s", monitor.ID))
 		//nolint:errcheck
-		client.DeleteLoadBalancerPool(ctx, monitor.ID)
+		client.DeleteLoadBalancerPool(ctx, cloudflare.AccountIdentifier(client.AccountID), monitor.ID)
 	}
 
 	return nil
@@ -309,7 +309,7 @@ func testAccCheckCloudflareLoadBalancerMonitorDestroy(s *terraform.State) error
 			continue
 		}
 
-		_, err := client.LoadBalancerMonitorDetails(context.Background(), rs.Primary.ID)
+		_, err := client.GetLoadBalancerMonitor(context.Background(), cloudflare.AccountIdentifier(client.AccountID), rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("Load balancer monitor still exists")
 		}
@@ -330,7 +330,7 @@ func testAccCheckCloudflareLoadBalancerMonitorExists(n string, load *cloudflare.
 		}
 
 		client := testAccProvider.Meta().(*cloudflare.API)
-		foundLoadBalancerMonitor, err := client.LoadBalancerMonitorDetails(context.Background(), rs.Primary.ID)
+		foundLoadBalancerMonitor, err := client.GetLoadBalancerMonitor(context.Background(), cloudflare.AccountIdentifier(client.AccountID), rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -370,7 +370,7 @@ func testAccManuallyDeleteLoadBalancerMonitor(name string, loadBalancerMonitor *
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*cloudflare.API)
 		*initialId = loadBalancerMonitor.ID
-		err := client.DeleteLoadBalancerMonitor(context.Background(), loadBalancerMonitor.ID)
+		err := client.DeleteLoadBalancerMonitor(context.Background(), cloudflare.AccountIdentifier(client.AccountID), loadBalancerMonitor.ID)
 		if err != nil {
 			return err
 		}

internal/provider/resource_cloudflare_load_balancer_pool.go

@@ -72,7 +72,7 @@ func resourceCloudflareLoadBalancerPoolCreate(ctx context.Context, d *schema.Res
 
 	tflog.Debug(ctx, fmt.Sprintf("Creating Cloudflare Load Balancer Pool from struct: %+v", loadBalancerPool))
 
-	r, err := client.CreateLoadBalancerPool(ctx, loadBalancerPool)
+	r, err := client.CreateLoadBalancerPool(ctx, cloudflare.AccountIdentifier(client.AccountID), cloudflare.CreateLoadBalancerPoolParams{LoadBalancerPool: loadBalancerPool})
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error creating load balancer pool"))
 	}
@@ -134,7 +134,7 @@ func resourceCloudflareLoadBalancerPoolUpdate(ctx context.Context, d *schema.Res
 
 	tflog.Debug(ctx, fmt.Sprintf("Updating Cloudflare Load Balancer Pool from struct: %+v", loadBalancerPool))
 
-	_, err := client.ModifyLoadBalancerPool(ctx, loadBalancerPool)
+	_, err := client.UpdateLoadBalancerPool(ctx, cloudflare.AccountIdentifier(client.AccountID), cloudflare.UpdateLoadBalancerPoolParams{LoadBalancer: loadBalancerPool})
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error updating load balancer pool"))
 	}
@@ -215,7 +215,7 @@ func expandLoadBalancerOrigins(originSet *schema.Set) (origins []cloudflare.Load
 func resourceCloudflareLoadBalancerPoolRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*cloudflare.API)
 
-	loadBalancerPool, err := client.LoadBalancerPoolDetails(ctx, d.Id())
+	loadBalancerPool, err := client.GetLoadBalancerPool(ctx, cloudflare.AccountIdentifier(client.AccountID), d.Id())
 	if err != nil {
 		var notFoundError *cloudflare.NotFoundError
 		if errors.As(err, &notFoundError) {
@@ -308,7 +308,7 @@ func resourceCloudflareLoadBalancerPoolDelete(ctx context.Context, d *schema.Res
 
 	tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer Pool: %s ", d.Id()))
 
-	err := client.DeleteLoadBalancerPool(ctx, d.Id())
+	err := client.DeleteLoadBalancerPool(ctx, cloudflare.AccountIdentifier(client.AccountID), d.Id())
 	if err != nil {
 		return diag.FromErr(errors.Wrap(err, "error deleting Cloudflare Load Balancer Pool"))
 	}

internal/provider/resource_cloudflare_load_balancer_pool_test.go

@@ -36,7 +36,7 @@ func testSweepCloudflareLoadBalancerPool(r string) error {
 	}
 
 	client.AccountID = accountID
-	pools, err := client.ListLoadBalancerPools(ctx)
+	pools, err := client.ListLoadBalancerPools(ctx, cloudflare.AccountIdentifier(accountID), cloudflare.ListLoadBalancerPoolParams{})
 	if err != nil {
 		tflog.Error(ctx, fmt.Sprintf("Failed to fetch Cloudflare Load Balancer Pools: %s", err))
 	}
@@ -49,7 +49,7 @@ func testSweepCloudflareLoadBalancerPool(r string) error {
 	for _, pool := range pools {
 		tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer Pool ID: %s", pool.ID))
 		//nolint:errcheck
-		client.DeleteLoadBalancerPool(ctx, pool.ID)
+		client.DeleteLoadBalancerPool(ctx, cloudflare.AccountIdentifier(accountID), pool.ID)
 	}
 
 	return nil
@@ -182,7 +182,7 @@ func testAccCheckCloudflareLoadBalancerPoolDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := client.LoadBalancerPoolDetails(context.Background(), rs.Primary.ID)
+		_, err := client.GetLoadBalancerPool(context.Background(), cloudflare.AccountIdentifier(accountID), rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("Load balancer pool still exists")
 		}
@@ -203,7 +203,7 @@ func testAccCheckCloudflareLoadBalancerPoolExists(n string, loadBalancerPool *cl
 		}
 
 		client := testAccProvider.Meta().(*cloudflare.API)
-		foundLoadBalancerPool, err := client.LoadBalancerPoolDetails(context.Background(), rs.Primary.ID)
+		foundLoadBalancerPool, err := client.GetLoadBalancerPool(context.Background(), cloudflare.AccountIdentifier(accountID), rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -243,7 +243,7 @@ func testAccManuallyDeleteLoadBalancerPool(name string, loadBalancerPool *cloudf
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*cloudflare.API)
 		*initialId = loadBalancerPool.ID
-		err := client.DeleteLoadBalancerPool(context.Background(), loadBalancerPool.ID)
+		err := client.DeleteLoadBalancerPool(context.Background(), cloudflare.AccountIdentifier(client.AccountID), loadBalancerPool.ID)
 		if err != nil {
 			return err
 		}

internal/provider/resource_cloudflare_load_balancer_test.go

@@ -38,7 +38,7 @@ func testSweepCloudflareLoadBalancer(r string) error {
 		return errors.New("CLOUDFLARE_ZONE_ID must be set")
 	}
 
-	lbs, err := client.ListLoadBalancers(ctx, zoneID)
+	lbs, err := client.ListLoadBalancers(ctx, cloudflare.ZoneIdentifier(zoneID), cloudflare.ListLoadBalancerParams{})
 	if err != nil {
 		tflog.Error(ctx, fmt.Sprintf("Failed to fetch Cloudflare Load Balancers: %s", err))
 	}
@@ -51,7 +51,7 @@ func testSweepCloudflareLoadBalancer(r string) error {
 	for _, lb := range lbs {
 		tflog.Info(ctx, fmt.Sprintf("Deleting Cloudflare Load Balancer ID: %s", lb.ID))
 		//nolint:errcheck
-		client.DeleteLoadBalancer(ctx, zoneID, lb.ID)
+		client.DeleteLoadBalancer(ctx, cloudflare.ZoneIdentifier(zoneID), lb.ID)
 	}
 
 	return nil
@@ -268,10 +268,6 @@ func TestAccCloudflareLoadBalancer_DuplicatePool(t *testing.T) {
 	})
 }
 
-/**
-Any change to a load balancer  results in a new resource
-Although the API client contains a modify method, this always results in 405 status.
-*/
 func TestAccCloudflareLoadBalancer_Update(t *testing.T) {
 	t.Parallel()
 	var loadBalancer cloudflare.LoadBalancer
@@ -362,7 +358,7 @@ func testAccCheckCloudflareLoadBalancerDestroy(s *terraform.State) error {
 			continue
 		}
 
-		_, err := client.LoadBalancerDetails(context.Background(), rs.Primary.Attributes["zone_id"], rs.Primary.ID)
+		_, err := client.GetLoadBalancer(context.Background(), cloudflare.ZoneIdentifier(rs.Primary.Attributes["zone_id"]), rs.Primary.ID)
 		if err == nil {
 			return fmt.Errorf("load balancer still exists: %s", rs.Primary.ID)
 		}
@@ -383,7 +379,7 @@ func testAccCheckCloudflareLoadBalancerExists(n string, loadBalancer *cloudflare
 		}
 
 		client := testAccProvider.Meta().(*cloudflare.API)
-		foundLoadBalancer, err := client.LoadBalancerDetails(context.Background(), rs.Primary.Attributes["zone_id"], rs.Primary.ID)
+		foundLoadBalancer, err := client.GetLoadBalancer(context.Background(), cloudflare.ZoneIdentifier(rs.Primary.Attributes["zone_id"]), rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -447,7 +443,7 @@ func testAccManuallyDeleteLoadBalancer(name string, loadBalancer *cloudflare.Loa
 		rs, _ := s.RootModule().Resources[name]
 		client := testAccProvider.Meta().(*cloudflare.API)
 		*initialId = loadBalancer.ID
-		err := client.DeleteLoadBalancer(context.Background(), rs.Primary.Attributes["zone_id"], rs.Primary.ID)
+		err := client.DeleteLoadBalancer(context.Background(), cloudflare.ZoneIdentifier(rs.Primary.Attributes["zone_id"]), rs.Primary.ID)
 		if err != nil {
 			return err
 		}