feat(sg-rule-name):added name field in other protocols (#6602)

Author: shreyasms07

ibm/service/vpc/data_source_ibm_is_security_group.go

@@ -352,6 +352,7 @@ func securityGroupGet(context context.Context, d *schema.ResourceData, meta inte
 						r := make(map[string]interface{})
 						r[isSgRuleDirection] = *rule.Direction
 						r[isSgRuleIPVersion] = *rule.IPVersion
+						r[isSgRuleName] = rule.Name
 						if rule.Protocol != nil {
 							r[isSgRuleProtocol] = *rule.Protocol
 						}
@@ -385,6 +386,7 @@ func securityGroupGet(context context.Context, d *schema.ResourceData, meta inte
 						r := make(map[string]interface{})
 						r[isSgRuleDirection] = *rule.Direction
 						r[isSgRuleIPVersion] = *rule.IPVersion
+						r[isSgRuleName] = rule.Name
 						if rule.Protocol != nil {
 							r[isSgRuleProtocol] = *rule.Protocol
 						}

ibm/service/vpc/data_source_ibm_is_security_group_rule.go

@@ -191,6 +191,9 @@ func dataSourceIBMIsSecurityGroupRuleRead(context context.Context, d *schema.Res
 			if err = d.Set("protocol", securityGroupRule.Protocol); err != nil {
 				return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting protocol: %s", err), "(Data) ibm_is_security_group_rule", "read", "set-protocol").GetDiag()
 			}
+			if err = d.Set("name", securityGroupRule.Name); err != nil {
+				return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting protocol: %s", err), "(Data) ibm_is_security_group_rule", "read", "set-protocol").GetDiag()
+			}
 			if securityGroupRule.Remote != nil {
 				securityGroupRuleRemote, err := dataSourceSecurityGroupRuleFlattenRemote(securityGroupRule.Remote)
 				if err != nil {
@@ -263,6 +266,9 @@ func dataSourceIBMIsSecurityGroupRuleRead(context context.Context, d *schema.Res
 			if err = d.Set("protocol", securityGroupRule.Protocol); err != nil {
 				return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting protocol: %s", err), "(Data) ibm_is_security_group_rule", "read", "set-protocol").GetDiag()
 			}
+			if err = d.Set("name", securityGroupRule.Name); err != nil {
+				return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting protocol: %s", err), "(Data) ibm_is_security_group_rule", "read", "set-protocol").GetDiag()
+			}
 			if securityGroupRule.Remote != nil {
 				securityGroupRuleRemote, err := dataSourceSecurityGroupRuleFlattenRemote(securityGroupRule.Remote)
 				if err != nil {

ibm/service/vpc/resource_ibm_is_security_group_rule.go

@@ -94,6 +94,7 @@ func ResourceIBMISSecurityGroupRule() *schema.Resource {
 
 			isSecurityGroupRuleName: {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 				Description: "The name for this security group rule. The name must not be used by another rule in the security group. If unspecified, the name will be a hyphenated list of randomly-selected words.",
 			},
@@ -1012,8 +1013,9 @@ func parseIBMISSecurityGroupRuleDictionary(d *schema.ResourceData, tag string, s
 	securityGroupRulePatchModel.Direction = &parsed.direction
 
 	if v, ok := d.GetOk(isSecurityGroupRuleName); ok && v.(string) != "" {
-		name := v.(string)
-		securityGroupRulePatchModel.Name = &name
+		parsed.name = v.(string)
+		sgTemplate.Name = &parsed.name
+		securityGroupRulePatchModel.Name = &parsed.name
 	}
 
 	if version, ok := d.GetOk(isSecurityGroupRuleIPVersion); ok {

ibm/service/vpc/resource_ibm_is_security_group_rule_test.go

@@ -152,6 +152,17 @@ func testAccCheckIBMISsecurityGroupRuleConfig(vpcname, name string) string {
 		direction = "inbound"
 		remote    = "127.0.0.1"
 	  }
+
+	  resource "ibm_is_security_group_rule" "testacc_security_group_rule" {
+		group     = ibm_is_security_group.testacc_security_group.id
+		direction = "inbound"
+		remote    = "127.0.0.1"
+		icmp {
+		  code = 21
+		  type = 31
+		}
+		name 	  = "test-name"
+	  }
 	  
 	  resource "ibm_is_security_group_rule" "testacc_security_group_rule_icmp" {
 		depends_on = [ibm_is_security_group_rule.testacc_security_group_rule_all]
@@ -272,7 +283,7 @@ func testAccCheckIBMISsecurityGroupRuleConfig(vpcname, name string) string {
 		port_min = 8080
 		port_max = 8080
 	  }
-	}
+
  `, vpcname, name)
 
 }