@@ -97,7 +97,7 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour
97
97
crn := d .Get (cisID ).(string )
98
98
zoneID , _ , _ := flex .ConvertTftoCisTwoVar (d .Get (cisDomainID ).(string ))
99
99
100
- var newFirewallRules firewallrulesv1.FirewallRuleInputWithFilterID
100
+ var newFirewallRules firewallrulesv1.FirewallRuleInput
101
101
102
102
if a , ok := d .GetOk (cisFirewallrulesAction ); ok {
103
103
action := a .(string )
@@ -108,14 +108,18 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour
108
108
newFirewallRules .Description = & description
109
109
}
110
110
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
114
118
}
115
119
116
120
opt := cisClient .NewCreateFirewallRulesOptions (xAuthtoken , crn , zoneID )
117
121
118
- opt .SetFirewallRuleInputWithFilterID ([]firewallrulesv1.FirewallRuleInputWithFilterID {newFirewallRules })
122
+ opt .SetFirewallRuleInput ([]firewallrulesv1.FirewallRuleInput {newFirewallRules })
119
123
120
124
result , _ , err := cisClient .CreateFirewallRulesWithContext (context , opt )
121
125
if err != nil || result == nil {
@@ -181,7 +185,8 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour
181
185
if d .HasChange (cisFilterID ) ||
182
186
d .HasChange (cisFirewallrulesAction ) ||
183
187
d .HasChange (cisFirewallrulesPaused ) ||
184
- d .HasChange (cisFilterDescription ) {
188
+ d .HasChange (cisFilterDescription ) ||
189
+ d .HasChange (cisFirewallrulesPriority ) {
185
190
186
191
var updatefirewallrules firewallrulesv1.FirewallRulesUpdateInputItem
187
192
updatefirewallrules .ID = & firewallruleID
@@ -198,7 +203,10 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour
198
203
description := des .(string )
199
204
updatefirewallrules .Description = & description
200
205
}
201
-
206
+ if priority , ok := d .GetOk (cisFirewallrulesPriority ); ok {
207
+ rulePriority := int64 (priority .(int ))
208
+ updatefirewallrules .Priority = & rulePriority
209
+ }
202
210
if id , ok := d .GetOk (cisFilterID ); ok {
203
211
filterid := id .(string )
204
212
filterUpdate , _ := cisClient .NewFirewallRulesUpdateInputItemFilter (filterid )
0 commit comments