Skip to content

feat(instance): add direction in security-group rule marshal #3015

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
remyleone merged 1 commit into from
Apr 7, 2023
Merged

feat(instance): add direction in security-group rule marshal #3015

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
22 changes: 12 additions & 10 deletions internal/namespaces/instance/v1/custom_security_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ func marshalSecurityGroupRules(i interface{}, _ *human.MarshalOpt) (out string,
rules := i.([]*instance.SecurityGroupRule)

type humanRule struct {
ID string
Protocol instance.SecurityGroupRuleProtocol
Action instance.SecurityGroupRuleAction
IPRange string
Dest string
ID string
Direction string
Protocol instance.SecurityGroupRuleProtocol
Action instance.SecurityGroupRuleAction
IPRange string
Dest string
}

toHumanRule := func(rule *instance.SecurityGroupRule) *humanRule {
Expand All @@ -61,11 +62,12 @@ func marshalSecurityGroupRules(i interface{}, _ *human.MarshalOpt) (out string,
dest += "-" + strconv.Itoa(int(*rule.DestPortTo))
}
return &humanRule{
ID: rule.ID,
Protocol: rule.Protocol,
Action: rule.Action,
IPRange: rule.IPRange.String(),
Dest: dest,
ID: rule.ID,
Direction: string(rule.Direction),
Protocol: rule.Protocol,
Action: rule.Action,
IPRange: rule.IPRange.String(),
Dest: dest,
}
}
humanRules := make([]*humanRule, len(rules))
Expand Down
16 changes: 8 additions & 8 deletions internal/namespaces/instance/v1/testdata/test-security-group-get-get.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ ModificationDate few seconds ago
Stateful true

Inbound Rules (default policy accept):
ID PROTOCOL ACTION IP RANGE DEST
ID DIRECTION PROTOCOL ACTION IP RANGE DEST

Outbound Rules (default policy accept):
ID PROTOCOL ACTION IP RANGE DEST
58909be7-d17c-4ac8-9eb3-23d5fc58abc5 TCP drop 0.0.0.0/0 25
25680235-108b-4bbc-8e25-114303d950bd TCP drop 0.0.0.0/0 465
4a31b633-118e-4900-bd52-facf1085fc8d TCP drop 0.0.0.0/0 587
e7dd28e8-3747-4c7c-9a4f-35ae3f0ae2cd TCP drop ::/0 25
f37d9e7c-8ed7-4e0f-baff-7f5e7ede0baf TCP drop ::/0 465
68054851-54e3-46c9-9cd7-83219751248b TCP drop ::/0 587
ID DIRECTION PROTOCOL ACTION IP RANGE DEST
58909be7-d17c-4ac8-9eb3-23d5fc58abc5 outbound TCP drop 0.0.0.0/0 25
25680235-108b-4bbc-8e25-114303d950bd outbound TCP drop 0.0.0.0/0 465
4a31b633-118e-4900-bd52-facf1085fc8d outbound TCP drop 0.0.0.0/0 587
e7dd28e8-3747-4c7c-9a4f-35ae3f0ae2cd outbound TCP drop ::/0 25
f37d9e7c-8ed7-4e0f-baff-7f5e7ede0baf outbound TCP drop ::/0 465
68054851-54e3-46c9-9cd7-83219751248b outbound TCP drop ::/0 587

Servers:
ID NAME
Expand Down