refactor: rename 'projectid' to 'project' for consistency across data source and resource limits

Author: ianc769

cloudstack/data_source_cloudstack_limits.go

@@ -54,7 +54,7 @@ func dataSourceCloudStackLimits() *schema.Resource {
 				Optional:    true,
 				Description: "List only resources belonging to the domain specified.",
 			},
-			"projectid": {
+			"project": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "List resource limits by project.",
@@ -127,7 +127,7 @@ func dataSourceCloudStackLimitsRead(d *schema.ResourceData, meta interface{}) er
 		p.SetDomainid(v.(string))
 	}
 
-	if v, ok := d.GetOk("projectid"); ok {
+	if v, ok := d.GetOk("project"); ok {
 		p.SetProjectid(v.(string))
 	}
 
@@ -200,7 +200,7 @@ func generateDataSourceID(d *schema.ResourceData) string {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
 
-	if v, ok := d.GetOk("projectid"); ok {
+	if v, ok := d.GetOk("project"); ok {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
 

cloudstack/resource_cloudstack_limits.go

@@ -87,7 +87,7 @@ func resourceCloudStackLimits() *schema.Resource {
 				Computed:    true,
 				Description: "Internal field to track the originally configured max value to distinguish between 0 and -1 when CloudStack returns -1.",
 			},
-			"projectid": {
+			"project": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				ForceNew:    true,
@@ -205,7 +205,7 @@ func resourceCloudStackLimitsCreate(d *schema.ResourceData, meta interface{}) er
 
 	account := d.Get("account").(string)
 	domain_id := d.Get("domain_id").(string)
-	projectid := d.Get("projectid").(string)
+	projectid := d.Get("project").(string)
 
 	// Validate account and domain parameters
 	if account != "" && domain_id == "" {
@@ -300,8 +300,8 @@ func resourceCloudStackLimitsRead(d *schema.ResourceData, meta interface{}) erro
 						}
 					} else if idParts[1] == "project" {
 						// Format: resourcetype-project-projectid
-						if err := d.Set("projectid", idParts[2]); err != nil {
-							return fmt.Errorf("error setting projectid: %s", err)
+						if err := d.Set("project", idParts[2]); err != nil {
+							return fmt.Errorf("error setting project: %s", err)
 						}
 					} else if idParts[1] == "account" && len(idParts) >= 4 {
 						// Format: resourcetype-account-account-domain_id
@@ -319,7 +319,7 @@ func resourceCloudStackLimitsRead(d *schema.ResourceData, meta interface{}) erro
 
 	account := d.Get("account").(string)
 	domain_id := d.Get("domain_id").(string)
-	projectid := d.Get("projectid").(string)
+	projectid := d.Get("project").(string)
 
 	// Create a new parameter struct
 	p := cs.Limit.NewListResourceLimitsParams()
@@ -397,7 +397,7 @@ func resourceCloudStackLimitsUpdate(d *schema.ResourceData, meta interface{}) er
 
 	account := d.Get("account").(string)
 	domain_id := d.Get("domain_id").(string)
-	projectid := d.Get("projectid").(string)
+	projectid := d.Get("project").(string)
 
 	// Create a new parameter struct
 	p := cs.Limit.NewUpdateResourceLimitParams(resourcetype)
@@ -443,7 +443,7 @@ func resourceCloudStackLimitsDelete(d *schema.ResourceData, meta interface{}) er
 
 	account := d.Get("account").(string)
 	domain_id := d.Get("domain_id").(string)
-	projectid := d.Get("projectid").(string)
+	projectid := d.Get("project").(string)
 
 	// Create a new parameter struct
 	p := cs.Limit.NewUpdateResourceLimitParams(resourcetype)

website/docs/d/limits.html.markdown

@@ -28,7 +28,7 @@ data "cloudstack_limits" "account_instance_limits" {
 # Get primary storage limits for a project
 data "cloudstack_limits" "project_storage_limits" {
   type         = "primarystorage"
-  projectid    = "project-uuid"
+  project      = "project-uuid"
 }
 ```
 
@@ -51,7 +51,7 @@ The following arguments are supported:
   * `secondarystorage`
 * `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.
+* `project` - (Optional) List resource limits by project.
 
 ## Attributes Reference
 

website/docs/r/limits.html.markdown

@@ -31,7 +31,7 @@ resource "cloudstack_limits" "volume_limit" {
 resource "cloudstack_limits" "storage_limit" {
   type         = "primarystorage"
   max          = 1000  # GB
-  projectid    = "project-uuid"
+  project      = "project-uuid"
 }
 
 # Set unlimited CPU limit
@@ -62,7 +62,7 @@ The following arguments are supported:
 * `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. 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.
+* `project` - (Optional, ForceNew) Update resource limits for project.
 
 ## Attributes Reference
 
@@ -73,7 +73,7 @@ The following attributes are exported:
 * `max` - The maximum number of the resource.
 * `account` - The account of the resource limit.
 * `domainid` - The domain ID of the resource limit.
-* `projectid` - The project ID of the resource limit.
+* `project` - The project ID of the resource limit.
 
 ## Import