Merge pull request #82 from alakae/alain/lb-stubs

Support nil Listeners on Pool
cloudscale-ch · Oct 24, 2023 · 7f1a5ac · 7f1a5ac
2 parents d37ee23 + b68b391
commit 7f1a5ac
Show file tree

Hide file tree

Showing 233 changed files with 18,872 additions and 4,005 deletions.
diff --git a/README.md b/README.md
@@ -47,12 +47,12 @@ go mod vendor
 
 Use the following commands to switch to a local version of the go-sdk and back:
 ```sh
-go mod edit -replace "github.com/cloudscale-ch/cloudscale-go-sdk/v3=../cloudscale-go-sdk/"
+go mod edit -replace "github.com/cloudscale-ch/cloudscale-go-sdk/v4=../cloudscale-go-sdk/"
 go mod vendor
 git commit -m "drop: Use local version of cloudscale-go-sdk"
 ```
 ```sh
-go mod edit -dropreplace "github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+go mod edit -dropreplace "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 go mod vendor
 ```
 

diff --git a/cloudscale/config.go b/cloudscale/config.go
@@ -1,7 +1,7 @@
 package cloudscale
 
 import (
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
 	"golang.org/x/oauth2"
 )

diff --git a/cloudscale/datasource_cloudscale_custom_image.go b/cloudscale/datasource_cloudscale_custom_image.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_custom_image_test.go b/cloudscale/datasource_cloudscale_custom_image_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_floating_ip.go b/cloudscale/datasource_cloudscale_floating_ip.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_floating_ip_test.go b/cloudscale/datasource_cloudscale_floating_ip_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_load_balancer.go b/cloudscale/datasource_cloudscale_load_balancer.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"context"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_load_balancer_health_monitor.go b/cloudscale/datasource_cloudscale_load_balancer_health_monitor.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"context"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_load_balancer_health_monitor_test.go b/cloudscale/datasource_cloudscale_load_balancer_health_monitor_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"

diff --git a/cloudscale/datasource_cloudscale_load_balancer_listener.go b/cloudscale/datasource_cloudscale_load_balancer_listener.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"context"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_load_balancer_listener_test.go b/cloudscale/datasource_cloudscale_load_balancer_listener_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"

diff --git a/cloudscale/datasource_cloudscale_load_balancer_pool.go b/cloudscale/datasource_cloudscale_load_balancer_pool.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"context"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_load_balancer_pool_member.go b/cloudscale/datasource_cloudscale_load_balancer_pool_member.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"context"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_load_balancer_pool_member_test.go b/cloudscale/datasource_cloudscale_load_balancer_pool_member_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"

diff --git a/cloudscale/datasource_cloudscale_load_balancer_pool_test.go b/cloudscale/datasource_cloudscale_load_balancer_pool_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"

diff --git a/cloudscale/datasource_cloudscale_load_balancer_test.go b/cloudscale/datasource_cloudscale_load_balancer_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"regexp"

diff --git a/cloudscale/datasource_cloudscale_network.go b/cloudscale/datasource_cloudscale_network.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_network_test.go b/cloudscale/datasource_cloudscale_network_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_objects_user.go b/cloudscale/datasource_cloudscale_objects_user.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_objects_user_test.go b/cloudscale/datasource_cloudscale_objects_user_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_server.go b/cloudscale/datasource_cloudscale_server.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_server_group.go b/cloudscale/datasource_cloudscale_server_group.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_server_group_test.go b/cloudscale/datasource_cloudscale_server_group_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_server_test.go b/cloudscale/datasource_cloudscale_server_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_subnet.go b/cloudscale/datasource_cloudscale_subnet.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_subnet_test.go b/cloudscale/datasource_cloudscale_subnet_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/datasource_cloudscale_volume.go b/cloudscale/datasource_cloudscale_volume.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/datasource_cloudscale_volume_test.go b/cloudscale/datasource_cloudscale_volume_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )

diff --git a/cloudscale/provider_test.go b/cloudscale/provider_test.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"strconv"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/cloudscale/resource_cloudscale_custom_image.go b/cloudscale/resource_cloudscale_custom_image.go
@@ -8,7 +8,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/resource_cloudscale_custom_image_test.go b/cloudscale/resource_cloudscale_custom_image_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/cloudscale/resource_cloudscale_floating_ip.go b/cloudscale/resource_cloudscale_floating_ip.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/cloudscale/resource_cloudscale_floating_ip_test.go b/cloudscale/resource_cloudscale_floating_ip_test.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/cloudscale/resource_cloudscale_load_balancer.go b/cloudscale/resource_cloudscale_load_balancer.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"

diff --git a/cloudscale/resource_cloudscale_load_balancer_health_monitor.go b/cloudscale/resource_cloudscale_load_balancer_health_monitor.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )

diff --git a/cloudscale/resource_cloudscale_load_balancer_health_monitor_test.go b/cloudscale/resource_cloudscale_load_balancer_health_monitor_test.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/cloudscale/resource_cloudscale_load_balancer_listener.go b/cloudscale/resource_cloudscale_load_balancer_listener.go
@@ -3,7 +3,7 @@ package cloudscale
 import (
 	"context"
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 )
@@ -43,8 +43,8 @@ func getLoadBalancerListenerSchema(t SchemaType) map[string]*schema.Schema {
 		},
 		"pool_uuid": {
 			Type:     schema.TypeString,
-			Required: t.isResource(),
-			Optional: t.isDataSource(),
+			Optional: true,
+			Computed: true,
 			ForceNew: true,
 		},
 		"pool_name": {
@@ -102,11 +102,14 @@ func resourceCloudscaleLoadBalancerListenerCreate(d *schema.ResourceData, meta a
 
 	opts := &cloudscale.LoadBalancerListenerRequest{
 		Name:         d.Get("name").(string),
-		Pool:         d.Get("pool_uuid").(string),
 		Protocol:     d.Get("protocol").(string),
 		ProtocolPort: d.Get("protocol_port").(int),
 	}
 
+	if attr, ok := d.GetOk("pool_uuid"); ok {
+		opts.Pool = attr.(string)
+	}
+
 	if attr, ok := d.GetOk("timeout_client_data_ms"); ok {
 		opts.TimeoutClientDataMS = attr.(int)
 	}
@@ -148,9 +151,15 @@ func gatherLoadBalancerListenerResourceData(loadbalancerlistener *cloudscale.Loa
 	m["id"] = loadbalancerlistener.UUID
 	m["href"] = loadbalancerlistener.HREF
 	m["name"] = loadbalancerlistener.Name
-	m["pool_uuid"] = loadbalancerlistener.Pool.UUID
-	m["pool_name"] = loadbalancerlistener.Pool.Name
-	m["pool_href"] = loadbalancerlistener.Pool.HREF
+	if loadbalancerlistener.Pool != nil {
+		m["pool_uuid"] = loadbalancerlistener.Pool.UUID
+		m["pool_name"] = loadbalancerlistener.Pool.Name
+		m["pool_href"] = loadbalancerlistener.Pool.HREF
+	} else {
+		m["pool_uuid"] = nil
+		m["pool_name"] = nil
+		m["pool_href"] = nil
+	}
 	m["protocol"] = loadbalancerlistener.Protocol
 	m["protocol_port"] = loadbalancerlistener.ProtocolPort
 	m["timeout_client_data_ms"] = loadbalancerlistener.TimeoutClientDataMS

diff --git a/cloudscale/resource_cloudscale_load_balancer_listener_test.go b/cloudscale/resource_cloudscale_load_balancer_listener_test.go
@@ -2,7 +2,7 @@ package cloudscale
 
 import (
 	"fmt"
-	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ import ( @@
     	"math"
     	"time"
-    	"github.com/cloudscale-ch/cloudscale-go-sdk/v3"
+    	"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
     	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
     )
@@ Expand Down @@