feat: secgroup rule supports description setting (#921)

huaweicloud · Feb 19, 2021 · b24eedd · b24eedd
1 parent bc389e2
commit b24eedd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/docs/resources/networking_secgroup_rule.md b/docs/resources/networking_secgroup_rule.md
@@ -43,6 +43,12 @@ The following arguments are supported:
     type, valid values are __IPv4__ or __IPv6__.
     Changing this creates a new security group rule.
 
+* `description` - (Optional, String, ForceNew) Specifies the supplementary
+    information about the networking security group rule. 
+    This parameter can contain a maximum of 255 characters and cannot contain
+    angle brackets (< or >).
+    Changing this creates a new security group rule.
+
 * `protocol` - (Optional, String, ForceNew) Specifies the layer 4 protocol
     type, valid values are following. This is required if you want to specify
     a port range.

diff --git a/huaweicloud/resource_huaweicloud_networking_secgroup_rule_v2.go b/huaweicloud/resource_huaweicloud_networking_secgroup_rule_v2.go
@@ -51,6 +51,11 @@ func ResourceNetworkingSecGroupRuleV2() *schema.Resource {
 					"IPv4", "IPv6",
 				}, true),
 			},
+			"security_group_id": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
 			"port_range_min": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -84,9 +89,9 @@ func ResourceNetworkingSecGroupRuleV2() *schema.Resource {
 					return strings.ToLower(v.(string))
 				},
 			},
-			"security_group_id": {
+			"description": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
 			},
 			"tenant_id": {
@@ -118,6 +123,7 @@ func resourceNetworkingSecGroupRuleV2Create(d *schema.ResourceData, meta interfa
 	}
 
 	opts := rules.CreateOpts{
+		Description:    d.Get("description").(string),
 		SecGroupID:     d.Get("security_group_id").(string),
 		PortRangeMin:   d.Get("port_range_min").(int),
 		PortRangeMax:   d.Get("port_range_max").(int),
@@ -171,6 +177,7 @@ func resourceNetworkingSecGroupRuleV2Read(d *schema.ResourceData, meta interface
 	}
 
 	d.Set("direction", security_group_rule.Direction)
+	d.Set("description", security_group_rule.Description)
 	d.Set("ethertype", security_group_rule.EtherType)
 	d.Set("protocol", security_group_rule.Protocol)
 	d.Set("port_range_min", security_group_rule.PortRangeMin)

diff --git a/huaweicloud/resource_huaweicloud_networking_secgroup_rule_v2_test.go b/huaweicloud/resource_huaweicloud_networking_secgroup_rule_v2_test.go
@@ -26,6 +26,7 @@ func TestAccNetworkingV2SecGroupRule_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckNetworkingV2SecGroupRuleExists(resourceRuleName, &secgroupRule),
 					resource.TestCheckResourceAttr(resourceRuleName, "direction", "ingress"),
+					resource.TestCheckResourceAttr(resourceRuleName, "description", "This is a basic acc test"),
 					resource.TestCheckResourceAttr(resourceRuleName, "port_range_min", "80"),
 					resource.TestCheckResourceAttr(resourceRuleName, "port_range_max", "80"),
 					resource.TestCheckResourceAttr(resourceRuleName, "ethertype", "IPv4"),
@@ -192,6 +193,7 @@ func testAccNetworkingV2SecGroupRule_basic(rName string) string {
 
 resource "huaweicloud_networking_secgroup_rule" "secgroup_rule_test" {
   direction         = "ingress"
+  description       = "This is a basic acc test"
   ethertype         = "IPv4"
   port_range_max    = 80
   port_range_min    = 80