feat: update CloudStack limits handling for zero resources and unlimited resources

Implimenting copilot suggestions for d.GetOk

Author: ianc769

cloudstack/data_source_cloudstack_limits.go

@@ -38,11 +38,11 @@ func dataSourceCloudStackLimits() *schema.Resource {
 				Optional: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					"instance", "ip", "volume", "snapshot", "template", "project", "network", "vpc",
-					"cpu", "memory", "primarystorage", "secondarystorage", "publicip", "eip", "autoscalevmgroup",
+					"cpu", "memory", "primarystorage", "secondarystorage",
 				}, false), // false disables case-insensitive matching
 				Description: "The type of resource to list the limits. Available types are: " +
 					"instance, ip, volume, snapshot, template, project, network, vpc, cpu, memory, " +
-					"primarystorage, secondarystorage, publicip, eip, autoscalevmgroup",
+					"primarystorage, secondarystorage",
 			},
 			"account": {
 				Type:        schema.TypeString,

cloudstack/resource_cloudstack_limits.go

@@ -79,7 +79,7 @@ func resourceCloudStackLimits() *schema.Resource {
 			"max": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				Description: "Maximum resource limit. Use -1 for unlimited resource limit.",
+				Description: "Maximum resource limit. Use -1 for unlimited resource limit. A value of 0 means zero resources are allowed, though the CloudStack API may return -1 for a limit set to 0.",
 			},
 			"projectid": {
 				Type:        schema.TypeString,
@@ -118,7 +118,6 @@ func resourceCloudStackLimitsCreate(d *schema.ResourceData, meta interface{}) er
 
 	account := d.Get("account").(string)
 	domainid := d.Get("domainid").(string)
-	max := d.Get("max").(int)
 	projectid := d.Get("projectid").(string)
 
 	// Validate account and domain parameters
@@ -134,8 +133,10 @@ func resourceCloudStackLimitsCreate(d *schema.ResourceData, meta interface{}) er
 	if domainid != "" {
 		p.SetDomainid(domainid)
 	}
-	if max != 0 {
-		p.SetMax(int64(max))
+	if maxVal, ok := d.GetOk("max"); ok {
+		maxIntVal := maxVal.(int)
+		log.Printf("[DEBUG] Setting max value to %d", maxIntVal)
+		p.SetMax(int64(maxIntVal))
 	}
 	if projectid != "" {
 		p.SetProjectid(projectid)
@@ -226,7 +227,15 @@ func resourceCloudStackLimitsRead(d *schema.ResourceData, meta interface{}) erro
 	// Update the config
 	for _, limit := range l.ResourceLimits {
 		if limit.Resourcetype == fmt.Sprintf("%d", resourcetype) {
-			d.Set("max", limit.Max)
+			log.Printf("[DEBUG] Retrieved max value from API: %d", limit.Max)
+
+			// If the user set max to 0 but the API returned -1, keep it as 0 in the state
+			if limit.Max == -1 && d.Get("max").(int) == 0 {
+				log.Printf("[DEBUG] API returned -1 for a limit set to 0, keeping it as 0 in state")
+				d.Set("max", 0)
+			} else {
+				d.Set("max", limit.Max)
+			}
 
 			// Only set the type field if it was originally specified in the configuration
 			if v, ok := d.GetOk("type"); ok {
@@ -251,7 +260,6 @@ func resourceCloudStackLimitsUpdate(d *schema.ResourceData, meta interface{}) er
 
 	account := d.Get("account").(string)
 	domainid := d.Get("domainid").(string)
-	max := d.Get("max").(int)
 	projectid := d.Get("projectid").(string)
 
 	// Create a new parameter struct
@@ -262,8 +270,10 @@ func resourceCloudStackLimitsUpdate(d *schema.ResourceData, meta interface{}) er
 	if domainid != "" {
 		p.SetDomainid(domainid)
 	}
-	if max != 0 {
-		p.SetMax(int64(max))
+	if maxVal, ok := d.GetOk("max"); ok {
+		maxIntVal := maxVal.(int)
+		log.Printf("[DEBUG] Setting max value to %d", maxIntVal)
+		p.SetMax(int64(maxIntVal))
 	}
 	if projectid != "" {
 		p.SetProjectid(projectid)

cloudstack/resource_cloudstack_limits_test.go

@@ -307,6 +307,26 @@ func TestAccCloudStackLimits_memory(t *testing.T) {
 	})
 }
 
+func TestAccCloudStackLimits_zero(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCloudStackLimitsDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCloudStackLimits_domain + testAccCloudStackLimits_zero,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudStackLimitsExists("cloudstack_limits.zero_limit"),
+					resource.TestCheckResourceAttr(
+						"cloudstack_limits.zero_limit", "type", "instance"),
+					resource.TestCheckResourceAttr(
+						"cloudstack_limits.zero_limit", "max", "0"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccCloudStackLimits_secondarystorage(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -343,7 +363,7 @@ func TestAccCloudStackLimits_import(t *testing.T) {
 				ResourceName:            "cloudstack_limits.foo",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"domainid", "type", "type", "max"},
+				ImportStateVerifyIgnore: []string{"domainid", "type", "max"},
 			},
 		},
 	})
@@ -448,6 +468,16 @@ resource "cloudstack_limits" "memory_limit" {
 }
 `
 
+const testAccCloudStackLimits_zero = `
+# Testing setting a limit to 0 (zero resources allowed)
+# Note: The CloudStack API may return -1 for a limit set to 0, but the provider maintains the 0 value in state
+resource "cloudstack_limits" "zero_limit" {
+  type         = "instance"
+  max          = 0
+  domainid     = cloudstack_domain.test_domain.id
+}
+`
+
 const testAccCloudStackLimits_secondarystorage = `
 resource "cloudstack_limits" "secondarystorage_limit" {
   type         = "secondarystorage"

website/docs/d/limits.html.markdown

@@ -49,9 +49,6 @@ The following arguments are supported:
   * `memory`
   * `primarystorage`
   * `secondarystorage`
-  * `publicip`
-  * `eip`
-  * `autoscalevmgroup`
 * `account` - (Optional) List resources by account. Must be used with the `domainid` parameter.
 * `domainid` - (Optional) List only resources belonging to the domain specified.
 * `projectid` - (Optional) List resource limits by project.
@@ -63,7 +60,7 @@ The following attributes are exported:
 * `limits` - A list of resource limits. Each limit has the following attributes:
   * `resourcetype` - The type of resource.
   * `resourcetypename` - The name of the resource type.
-  * `max` - The maximum number of the resource.
+  * `max` - The maximum number of the resource. A value of `-1` indicates unlimited resources. A value of `0` means zero resources are allowed, though the CloudStack API may return `-1` for a limit set to `0`.
   * `account` - The account of the resource limit.
   * `domain` - The domain name of the resource limit.
   * `domainid` - The domain ID of the resource limit.

website/docs/r/limits.html.markdown

@@ -58,13 +58,10 @@ The following arguments are supported:
   * `memory`
   * `primarystorage`
   * `secondarystorage`
-  * `publicip`
-  * `eip`
-  * `autoscalevmgroup`
 
 * `account` - (Optional, ForceNew) Update resource for a specified account. Must be used with the `domainid` parameter.
 * `domainid` - (Optional, ForceNew) Update resource limits for all accounts in specified domain. If used with the `account` parameter, updates resource limits for a specified account in specified domain.
-* `max` - (Optional) Maximum resource limit. Use `-1` for unlimited resource limit.
+* `max` - (Optional) Maximum resource limit. Use `-1` for unlimited resource limit. A value of `0` means zero resources are allowed, though the CloudStack API may return `-1` for a limit set to `0`.
 * `projectid` - (Optional, ForceNew) Update resource limits for project.
 
 ## Attributes Reference