Skip to content

fix sg_rule policy_index not effect #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2022
Merged

fix sg_rule policy_index not effect #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_security_group_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func resourceTencentCloudSecurityGroupRuleCreate(d *schema.ResourceData, m inter
}
var policyIndex int64
if v, ok := d.GetOk("policy_index"); ok {
policyIndex = v.(int64)
policyIndex = int64(v.(int))
}
info := securityGroupRuleBasicInfo{
SgId: sgId,
Expand Down
16 changes: 16 additions & 0 deletions tencentcloud/resource_tc_security_group_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ func TestAccTencentCloudSecurityGroupRule_basic(t *testing.T) {
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in", "type", "ingress"),
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in", "policy_index", "0"),
resource.TestCheckNoResourceAttr("tencentcloud_security_group_rule.http-in", "source_sgid"),

resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in1", "cidr_ip", "1.1.1.2"),
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in1", "ip_protocol", "tcp"),
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in1", "description", ""),
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in1", "type", "ingress"),
resource.TestCheckResourceAttr("tencentcloud_security_group_rule.http-in1", "policy_index", "1"),
resource.TestCheckNoResourceAttr("tencentcloud_security_group_rule.http-in1", "source_sgid"),
),
},
},
Expand Down Expand Up @@ -254,6 +261,15 @@ resource "tencentcloud_security_group_rule" "http-in" {
policy = "accept"
policy_index = 0
}
resource "tencentcloud_security_group_rule" "http-in1" {
security_group_id = tencentcloud_security_group.foo.id
type = "ingress"
cidr_ip = "1.1.1.2"
ip_protocol = "tcp"
port_range = "80,8080"
policy = "accept"
policy_index = 1
}
`

const testAccSecurityGroupRuleConfigSSH = `
Expand Down
4 changes: 1 addition & 3 deletions tencentcloud/service_tencentcloud_vpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,9 +1285,7 @@ func (me *VpcService) CreateSecurityGroupPolicy(ctx context.Context, info securi
if info.Protocol != nil {
policy.Protocol = common.StringPtr(strings.ToUpper(*info.Protocol))
}
if policy.PolicyIndex != nil {
policy.PolicyIndex = helper.Int64(info.PolicyIndex)
}
policy.PolicyIndex = helper.Int64(info.PolicyIndex)
policy.Port = info.PortRange
policy.PolicyDescription = info.Description
policy.Action = common.StringPtr(strings.ToUpper(info.Action))
Expand Down