Skip to content
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

Using sg name adding rule #402

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Using sg name adding rule #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4170051
Enable using Security Group Names in VPC to add Security Group Rules
outscale-toa Dec 4, 2023
d96e802
Update tests
outscale-toa Dec 4, 2023
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
57 changes: 49 additions & 8 deletions outscale/resource_outscale_security_group_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"log"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -93,7 +94,7 @@ func resourceOutscaleOAPIOutboundRuleCreate(d *schema.ResourceData, meta interfa
req := oscgo.CreateSecurityGroupRuleRequest{
Flow: d.Get("flow").(string),
SecurityGroupId: d.Get("security_group_id").(string),
Rules: expandRules(d),
Rules: expandRules(d, conn),
}

if v, ok := d.GetOkExists("from_port_range"); ok {
Expand Down Expand Up @@ -165,7 +166,7 @@ func resourceOutscaleOAPIOutboundRuleDelete(d *schema.ResourceData, meta interfa
req := oscgo.DeleteSecurityGroupRuleRequest{
Flow: d.Get("flow").(string),
SecurityGroupId: d.Get("security_group_id").(string),
Rules: expandRules(d),
Rules: expandRules(d, conn),
}

if v, ok := d.GetOkExists("from_port_range"); ok {
Expand Down Expand Up @@ -196,15 +197,15 @@ func resourceOutscaleOAPIOutboundRuleDelete(d *schema.ResourceData, meta interfa
return nil
}

func expandRules(d *schema.ResourceData) *[]oscgo.SecurityGroupRule {
func expandRules(d *schema.ResourceData, conn *oscgo.APIClient) *[]oscgo.SecurityGroupRule {
if len(d.Get("rules").([]interface{})) > 0 {
rules := make([]oscgo.SecurityGroupRule, len(d.Get("rules").([]interface{})))

for i, rule := range d.Get("rules").([]interface{}) {
r := rule.(map[string]interface{})

rules[i] = oscgo.SecurityGroupRule{
SecurityGroupsMembers: expandSecurityGroupsMembers(r["security_groups_members"].([]interface{})),
SecurityGroupsMembers: expandSecurityGroupsMembers(r["security_groups_members"].([]interface{}), conn),
}

if ipRanges := utils.InterfaceSliceToStringSlicePtr(r["ip_ranges"].([]interface{})); len(*ipRanges) > 0 {
Expand Down Expand Up @@ -257,7 +258,7 @@ func flattenSecurityGroupsMembers(securityGroupMembers []oscgo.SecurityGroupsMem
return sgms
}

func expandSecurityGroupsMembers(gps []interface{}) *[]oscgo.SecurityGroupsMember {
func expandSecurityGroupsMembers(gps []interface{}, conn *oscgo.APIClient) *[]oscgo.SecurityGroupsMember {
groups := make([]oscgo.SecurityGroupsMember, len(gps))

for i, group := range gps {
Expand All @@ -267,16 +268,56 @@ func expandSecurityGroupsMembers(gps []interface{}) *[]oscgo.SecurityGroupsMembe
if v, ok := g["account_id"]; ok && v != "" {
groups[i].AccountId = pointy.String(cast.ToString(v))
}
if v, ok := g["security_group_id"]; ok && v != "" {
groups[i].SecurityGroupId = pointy.String(cast.ToString(v))
}
if v, ok := g["security_group_name"]; ok && v != "" {
groups[i].SecurityGroupName = pointy.String(cast.ToString(v))
if sgID := getSgIdinVPC(conn, cast.ToString(v)); sgID != "" {
groups[i].SecurityGroupId = pointy.String(cast.ToString(sgID))
}
}
if v, ok := g["security_group_id"]; ok && v != "" {
groups[i].SecurityGroupId = pointy.String(cast.ToString(v))
}
}
return &groups
}

func getSgIdinVPC(client *oscgo.APIClient, sgName string) string {

filters := oscgo.ReadSecurityGroupsRequest{
Filters: &oscgo.FiltersSecurityGroup{
SecurityGroupNames: &[]string{sgName},
},
}

var err error
var resp oscgo.ReadSecurityGroupsResponse
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
rp, httpResp, err := client.SecurityGroupApi.ReadSecurityGroups(context.Background()).ReadSecurityGroupsRequest(filters).Execute()
if err != nil {
return utils.CheckThrottling(httpResp, err)
}
resp = rp
return nil
})
if err != nil {
log.Printf("[DEBUG]: error reading the Outscale Security Group(%s): %s\n", sgName, err)
return ""
}
if resp.GetSecurityGroups() == nil || len(resp.GetSecurityGroups()) == 0 {
log.Printf("[DEBUG]: Unable to find Security Group: %s\n", sgName)
return ""
}

if len(resp.GetSecurityGroups()) > 1 {
log.Printf("[DEBUG]: Multiple results returned with '%v', please use Security Group ID\n", sgName)
return ""
}
if resp.GetSecurityGroups()[0].GetNetId() != "" {
return resp.GetSecurityGroups()[0].GetSecurityGroupId()
}
return ""
}

func getRulesSchema(isForAttr bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeList,
Expand Down
44 changes: 44 additions & 0 deletions outscale/resource_outscale_security_group_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,22 @@ func TestAccOthers_SecurityGroupRule_basic(t *testing.T) {
}
}

func TestAccNet_AddSecurityGroupRuleMembersWithSgName(t *testing.T) {

rInt := acctest.RandInt()
accountID := os.Getenv("OUTSCALE_ACCOUNT")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccAddSecurityGroupRuleMembersWithSgName(rInt, accountID),
},
},
})
}

func TestAccOthers_SecurityGroupRule_withSecurityGroupMember(t *testing.T) {
t.Parallel()
rInt := acctest.RandInt()
Expand Down Expand Up @@ -296,3 +312,31 @@ func testAccOutscaleOAPISecurityGroupRuleWithGroupMembers(rInt int, accountID st
}
`, accountID, rInt)
}

func testAccAddSecurityGroupRuleMembersWithSgName(rInt int, accountID string) string {
return fmt.Sprintf(`

resource "outscale_net" "netSgtest" {
ip_range = "10.0.0.0/16"
}

resource "outscale_security_group" "security_group" {
description = "testing security group"
security_group_name = "terraform-test_%[2]d"
net_id = outscale_net.netSgtest.net_id
}
resource "outscale_security_group_rule" "rule_group" {
security_group_id = outscale_security_group.security_group.security_group_id
flow = "Inbound"
rules {
from_port_range = 22
to_port_range = 22
ip_protocol = "tcp"
security_groups_members {
account_id = "%[1]s"
security_group_name = outscale_security_group.security_group.security_group_name
}
}
}
`, accountID, rInt)
}
1 change: 1 addition & 0 deletions ...oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_sg",
"outscale_subnet.outscale_subnet"
]
Expand Down
1 change: 1 addition & 0 deletions ...ets/TF-125_security_group_datasource_attributes_ok/step2.security_group_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group"
]
}
Expand Down
1 change: 1 addition & 0 deletions ...ets/TF-125_security_group_datasource_attributes_ok/step3.security_group_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group",
"outscale_security_group.outscale_security_group2"
]
Expand Down
1 change: 1 addition & 0 deletions ...ets/TF-125_security_group_datasource_attributes_ok/step4.security_group_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group",
"outscale_security_group.outscale_security_group2"
]
Expand Down
4 changes: 2 additions & 2 deletions ..._security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@
"security_groups_members": [
{
"account_id": "##id-2##",
"security_group_id": "##id-4##",
"security_group_name": ""
"security_group_id": "",
"security_group_name": "sg2-terraform-test"
}
],
"service_ids": null,
Expand Down
2 changes: 1 addition & 1 deletion ...8_security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ resource "outscale_security_group_rule" "outscale_security_group_rule-3_2" {
ip_protocol = "tcp"
security_groups_members {
account_id = outscale_security_group.outscale_security_group2.account_id
security_group_id = outscale_security_group.outscale_security_group2.id
security_group_name = outscale_security_group.outscale_security_group2.security_group_name
}
}
depends_on = [outscale_security_group.outscale_security_group2, outscale_security_group_rule.outscale_security_group_rule-3]
Expand Down
2 changes: 1 addition & 1 deletion ..._security_group_rule_resource_attributes_2_ok/step2.security_group_rule_resource_2_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"security_group_name": ""
}
],
"service_ids": [],
"service_ids": null,
"to_port_range": 22
}
],
Expand Down
1 change: 1 addition & 0 deletions ...s/TF-129_security_groups_datasource_attributes_ok/step2.security_groups_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group"
]
}
Expand Down
1 change: 1 addition & 0 deletions ...s/TF-129_security_groups_datasource_attributes_ok/step3.security_groups_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group",
"outscale_security_group.outscale_security_group2"
]
Expand Down
1 change: 1 addition & 0 deletions ...s/TF-129_security_groups_datasource_attributes_ok/step4.security_groups_datasource_ok.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group",
"outscale_security_group.outscale_security_group2"
]
Expand Down
1 change: 1 addition & 0 deletions ..._load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"outscale_net.outscale_net",
"outscale_security_group.outscale_security_group",
"outscale_security_group.outscale_security_group-2",
"outscale_subnet.subnet-1"
Expand Down
Loading