Skip to content

Commit cd2809e

Browse files
arpit-srivastava-ibmArpit Srivastava
authored andcommitted
CIS Firewall Rules : added priority key (IBM-Cloud#3998)
* added priority to firewallrules * revert conflict changes * added priority in update Co-authored-by: Arpit Srivastava <arpit-mac@Arpits-MacBook-Pro.local>
1 parent 38022e8 commit cd2809e

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20211109141421-a4b61b05f7d1
2222
github.com/IBM/ibm-hpcs-uko-sdk v0.0.4
2323
github.com/IBM/keyprotect-go-client v0.7.0
24-
github.com/IBM/networking-go-sdk v0.32.0
24+
github.com/IBM/networking-go-sdk v0.33.0
2525
github.com/IBM/platform-services-go-sdk v0.28.2
2626
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
2727
github.com/IBM/scc-go-sdk/v3 v3.1.6

go.sum

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20220523145737-34645883de47/go.mod h1:tfN
77
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20220728135852-60ff775f7a8d h1:cHu5Iev9ggo1fktwmHbmPqDOkt3VYmdUGn1U7/Zb238=
88
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20220728135852-60ff775f7a8d/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
99
github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs=
10-
github.com/IBM-Cloud/power-go-client v1.1.11 h1:/qTWCCuSZsmiksvQSfhM+mZKkY/Vli/W6b82WoYD2NM=
11-
github.com/IBM-Cloud/power-go-client v1.1.11/go.mod h1:Qfx0fNi+9hms+xu9Z6Euhu9088ByW6C/TCMLECTRWNE=
1210
github.com/IBM-Cloud/power-go-client v1.1.12 h1:zL8Br83MHe1mDhFI+2YenQsHeYUtPzqw9oeFL9fmguE=
1311
github.com/IBM-Cloud/power-go-client v1.1.12/go.mod h1:Qfx0fNi+9hms+xu9Z6Euhu9088ByW6C/TCMLECTRWNE=
1412
github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw=
@@ -58,8 +56,8 @@ github.com/IBM/ibm-hpcs-uko-sdk v0.0.4 h1:B3FEq830k/B7HjQqvQubxmz8PxOUvKYD2ZypDq
5856
github.com/IBM/ibm-hpcs-uko-sdk v0.0.4/go.mod h1:MLVNHMYoKsvovJZ4v1gQCpIYtRDHTtoIHK6XztDZGsU=
5957
github.com/IBM/keyprotect-go-client v0.7.0 h1:JstSHD14Lp6ihwQseyPuGcs1AjOBjAmcisP0dTBA6A0=
6058
github.com/IBM/keyprotect-go-client v0.7.0/go.mod h1:SVr2ylV/fhSQPDiUjWirN9fsyWFCNNbt8GIT8hPJVjE=
61-
github.com/IBM/networking-go-sdk v0.32.0 h1:QWd7CxC+Wzap+zWFfXMjbqB5LpvrB1KvNtIbKrWIkhA=
62-
github.com/IBM/networking-go-sdk v0.32.0/go.mod h1:tVxXclpQs8nQJYPTr9ZPNC1voaPNQLy8iy/72oVfFtM=
59+
github.com/IBM/networking-go-sdk v0.33.0 h1:+e4Q/io0y/I+LHKSa95gUM+CJfya6gHOelSWi+hkvBA=
60+
github.com/IBM/networking-go-sdk v0.33.0/go.mod h1:7b/E21A6BmfycDuNmHjA+EhFm9iM8Wm4ULF9g93J+KE=
6361
github.com/IBM/platform-services-go-sdk v0.28.2 h1:T5qT3XI7f3cGaMLU4v1RLsuL373K2VYfPQQeGCUauj0=
6462
github.com/IBM/platform-services-go-sdk v0.28.2/go.mod h1:jy0Ahvj5Gkkua3Gd7t22bo0GfmHRQaPZcaqwfVgEY7k=
6563
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4=
@@ -807,8 +805,9 @@ golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7w
807805
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
808806
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
809807
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
810-
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
811808
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
809+
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
810+
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
812811
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
813812
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
814813
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=

ibm/service/cis/resource_ibm_cis_firewall_rules.go

+15-7
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour
9797
crn := d.Get(cisID).(string)
9898
zoneID, _, _ := flex.ConvertTftoCisTwoVar(d.Get(cisDomainID).(string))
9999

100-
var newFirewallRules firewallrulesv1.FirewallRuleInputWithFilterID
100+
var newFirewallRules firewallrulesv1.FirewallRuleInput
101101

102102
if a, ok := d.GetOk(cisFirewallrulesAction); ok {
103103
action := a.(string)
@@ -108,14 +108,18 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour
108108
newFirewallRules.Description = &description
109109
}
110110
if id, ok := d.GetOk(cisFilterID); ok {
111-
filterid := id.(string)
112-
filterModel, _ := cisClient.NewFirewallRuleInputWithFilterIdFilter(filterid)
113-
newFirewallRules.Filter = filterModel
111+
filterID := id.(string)
112+
filtersInterface := &firewallrulesv1.FirewallRuleInputFilter{ID: &filterID}
113+
newFirewallRules.Filter = filtersInterface
114+
}
115+
if priority, ok := d.GetOk(cisFirewallrulesPriority); ok {
116+
rulePriority := int64(priority.(int))
117+
newFirewallRules.Priority = &rulePriority
114118
}
115119

116120
opt := cisClient.NewCreateFirewallRulesOptions(xAuthtoken, crn, zoneID)
117121

118-
opt.SetFirewallRuleInputWithFilterID([]firewallrulesv1.FirewallRuleInputWithFilterID{newFirewallRules})
122+
opt.SetFirewallRuleInput([]firewallrulesv1.FirewallRuleInput{newFirewallRules})
119123

120124
result, _, err := cisClient.CreateFirewallRulesWithContext(context, opt)
121125
if err != nil || result == nil {
@@ -181,7 +185,8 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour
181185
if d.HasChange(cisFilterID) ||
182186
d.HasChange(cisFirewallrulesAction) ||
183187
d.HasChange(cisFirewallrulesPaused) ||
184-
d.HasChange(cisFilterDescription) {
188+
d.HasChange(cisFilterDescription) ||
189+
d.HasChange(cisFirewallrulesPriority) {
185190

186191
var updatefirewallrules firewallrulesv1.FirewallRulesUpdateInputItem
187192
updatefirewallrules.ID = &firewallruleID
@@ -198,7 +203,10 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour
198203
description := des.(string)
199204
updatefirewallrules.Description = &description
200205
}
201-
206+
if priority, ok := d.GetOk(cisFirewallrulesPriority); ok {
207+
rulePriority := int64(priority.(int))
208+
updatefirewallrules.Priority = &rulePriority
209+
}
202210
if id, ok := d.GetOk(cisFilterID); ok {
203211
filterid := id.(string)
204212
filterUpdate, _ := cisClient.NewFirewallRulesUpdateInputItemFilter(filterid)

0 commit comments

Comments
 (0)