Merge pull request #678 from ovh/dev/aamstutz/add-dedicated-nasha-access-desc

fix: Add acl_description to resource ovh_dedicated_nasha_partition_access

Author: amstuta

ovh/resource_dedicated_nasha_partition_access.go

@@ -43,6 +43,12 @@ func resourceDedicatedNASHAPartitionAccess() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
+			"acl_description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "A brief description of the ACL",
+			},
 		},
 	}
 }
@@ -54,13 +60,14 @@ func resourceDedicatedNASHAPartitionAccessCreate(c context.Context, d *schema.Re
 	ipsubnet, _ := d.Get("ip").(string)
 
 	access := &DedicatedNASHAPartitionAccess{
-		IP:   d.Get("ip").(string),
-		Type: d.Get("type").(string),
+		IP:             d.Get("ip").(string),
+		Type:           d.Get("type").(string),
+		AclDescription: d.Get("acl_description").(string),
 	}
 
 	resp := &DedicatedNASHATask{}
 
-	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access", serviceName, partitionName)
+	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access", url.PathEscape(serviceName), url.PathEscape(partitionName))
 
 	err := config.OVHClient.Post(endpoint, access, resp)
 	if err != nil {
@@ -101,7 +108,7 @@ func resourceDedicatedNASHAPartitionAccessRead(c context.Context, d *schema.Reso
 
 	resp := &DedicatedNASHAPartitionAccess{}
 
-	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access/%s", serviceName, partitionName, url.PathEscape(ipsubnet))
+	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access/%s", url.PathEscape(serviceName), url.PathEscape(partitionName), url.PathEscape(ipsubnet))
 
 	err := config.OVHClient.Get(endpoint, resp)
 	if err != nil {
@@ -112,7 +119,9 @@ func resourceDedicatedNASHAPartitionAccessRead(c context.Context, d *schema.Reso
 		}
 		return diag.Errorf("Error calling %s:\n\t '%q'", endpoint, err)
 	}
+
 	d.Set("type", resp.Type)
+	d.Set("acl_description", resp.AclDescription)
 
 	return nil
 }
@@ -123,7 +132,7 @@ func resourceDedicatedNASHAPartitionAccessDelete(c context.Context, d *schema.Re
 	partitionName := d.Get("partition_name").(string)
 	ipsubnet, _ := d.Get("ip").(string)
 
-	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access/%s", serviceName, partitionName, url.PathEscape(ipsubnet))
+	endpoint := fmt.Sprintf("/dedicated/nasha/%s/partition/%s/access/%s", url.PathEscape(serviceName), url.PathEscape(partitionName), url.PathEscape(ipsubnet))
 
 	resp := &DedicatedNASHATask{}
 

ovh/resource_dedicated_nasha_test.go

@@ -44,6 +44,7 @@ func TestAccDedicatedNASHA(t *testing.T) {
 						partition_name = "${ovh_dedicated_nasha_partition.testacc.name}"
 						ip = "127.0.0.1/32"
 						type = "readonly"
+						acl_description = "ACL for acceptance tests"
 					}
 				`, serviceName, partitionName),
 				Check: resource.ComposeTestCheckFunc(
@@ -61,6 +62,7 @@ func TestAccDedicatedNASHA(t *testing.T) {
 					resource.TestCheckResourceAttr("ovh_dedicated_nasha_partition_access.testacc", "partition_name", partitionName),
 					resource.TestCheckResourceAttr("ovh_dedicated_nasha_partition_access.testacc", "ip", "127.0.0.1/32"),
 					resource.TestCheckResourceAttr("ovh_dedicated_nasha_partition_access.testacc", "type", "readonly"),
+					resource.TestCheckResourceAttr("ovh_dedicated_nasha_partition_access.testacc", "acl_description", "ACL for acceptance tests"),
 				),
 			},
 		},

ovh/types_dedicated_nasha.go

@@ -31,8 +31,9 @@ type DedicatedNASHAPartition struct {
 }
 
 type DedicatedNASHAPartitionAccess struct {
-	IP   string `json:"ip"`
-	Type string `json:"type,omitempty"` // readonly, readwrite
+	IP             string `json:"ip"`
+	Type           string `json:"type,omitempty"` // readonly, readwrite
+	AclDescription string `json:"aclDescription,omitempty"`
 }
 
 type DedicatedNASHAPartitionSnapshot struct {

website/docs/r/dedicated_nasha_partition_access.markdown

@@ -10,10 +10,11 @@ Provides a resource for managing access rights to partitions on HA-NAS services
 
 ```hcl
 resource "ovh_dedicated_nasha_partition_access" "my-partition" {
-  service_name = "zpool-12345"
-  partition_name = "my-partition"
-  ip = "123.123.123.123/32"
-  type = "readwrite"
+  service_name    = "zpool-12345"
+  partition_name  = "my-partition"
+  ip              = "123.123.123.123/32"
+  type            = "readwrite"
+  acl_description = "Description of the ACL"
 }
 ```
 
@@ -22,9 +23,10 @@ resource "ovh_dedicated_nasha_partition_access" "my-partition" {
 The following arguments are supported:
 
 * `service_name` - (Required) The internal name of your HA-NAS (it has to be ordered via OVHcloud interface)
-* `partition_name` - (Required) name of the partition
-* `ip` - (Required) ip block in x.x.x.x/x format
-* `type` - (Required) one of "readwrite", "readonly"
+* `partition_name` - (Required) Name of the partition
+* `ip` - (Required) IP block in x.x.x.x/x format
+* `type` - (Required) One of "readwrite", "readonly"
+* `acl_description` - A brief description of the acl
 
 ## Attributes Reference
 
@@ -34,6 +36,7 @@ The following attributes are exported:
 * `partition_name` - See Argument Reference above.
 * `ip` - See Argument Reference above.
 * `type` - See Argument Reference above.
+* `acl_description` - See Argument Reference above.
 
 ## Import