Skip to content

Commit 6599891

Browse files
seconroyseconroy
authored
Resolve testing issues (#437)
1 parent b5c693b commit 6599891

7 files changed

+65
-29
lines changed

‎gen/templates/profile_parcels/model.go

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (data {{camelCase .Name}}) toBody(ctx context.Context) string {
185185
body, _ = sjson.Set(body, path+"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "variable")
186186
body, _ = sjson.Set(body, path+"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", data.{{toGoName .TfName}}Variable.ValueString())
187187
}
188-
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if data.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.ValueString() == "{{.DefaultValue}}"{{end}} {
188+
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if data.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.String() == "{{.DefaultValue}}"{{end}} {
189189
if true{{if ne .ConditionalAttribute.Name ""}} {{if eq .ConditionalAttribute.Type "Bool"}} && data.{{toGoName .ConditionalAttribute.Name}}.ValueBool() == {{.ConditionalAttribute.Value}} {{else}} && data.{{toGoName .ConditionalAttribute.Name}}.ValueString() == "{{.ConditionalAttribute.Value}}" {{end}}{{end}} {
190190
body, _ = sjson.Set(body, path+"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "default")
191191
{{if or .DefaultValue .DefaultValueEmptyString}}body, _ = sjson.Set(body, path+"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", {{if eq .Type "String"}}"{{end}}{{.DefaultValue}}{{if eq .Type "String"}}"{{end}}){{end}}
@@ -230,7 +230,7 @@ func (data {{camelCase .Name}}) toBody(ctx context.Context) string {
230230
itemBody, _ = sjson.Set(itemBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "variable")
231231
itemBody, _ = sjson.Set(itemBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", item.{{toGoName .TfName}}Variable.ValueString())
232232
}
233-
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if item.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.ValueString() == "{{.DefaultValue}}"{{end}} {
233+
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if item.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.String() == "{{.DefaultValue}}"{{end}} {
234234
if true{{if ne .ConditionalAttribute.Name ""}} {{if eq .ConditionalAttribute.Type "Bool"}} && item.{{toGoName .ConditionalAttribute.Name}}.ValueBool() == {{.ConditionalAttribute.Value}} {{else}} && item.{{toGoName .ConditionalAttribute.Name}}.ValueString() == "{{.ConditionalAttribute.Value}}" {{end}}{{end}} {
235235
itemBody, _ = sjson.Set(itemBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "default")
236236
{{if or .DefaultValue .DefaultValueEmptyString}}itemBody, _ = sjson.Set(itemBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", {{if eq .Type "String"}}"{{end}}{{.DefaultValue}}{{if eq .Type "String"}}"{{end}}){{end}}
@@ -275,7 +275,7 @@ func (data {{camelCase .Name}}) toBody(ctx context.Context) string {
275275
itemChildBody, _ = sjson.Set(itemChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "variable")
276276
itemChildBody, _ = sjson.Set(itemChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", childItem.{{toGoName .TfName}}Variable.ValueString())
277277
}
278-
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if childItem.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.ValueString() == "{{.DefaultValue}}"{{end}} {
278+
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if childItem.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.String() == "{{.DefaultValue}}"{{end}} {
279279
if true{{if ne .ConditionalAttribute.Name ""}} {{if eq .ConditionalAttribute.Type "Bool"}} && childItem.{{toGoName .ConditionalAttribute.Name}}.ValueBool() == {{.ConditionalAttribute.Value}} {{else}} && childItem.{{toGoName .ConditionalAttribute.Name}}.ValueString() == "{{.ConditionalAttribute.Value}}" {{end}}{{end}} {
280280
itemChildBody, _ = sjson.Set(itemChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "default")
281281
{{if or .DefaultValue .DefaultValueEmptyString}}itemChildBody, _ = sjson.Set(itemChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", {{if eq .Type "String"}}"{{end}}{{.DefaultValue}}{{if eq .Type "String"}}"{{end}}){{end}}
@@ -320,7 +320,7 @@ func (data {{camelCase .Name}}) toBody(ctx context.Context) string {
320320
itemChildChildBody, _ = sjson.Set(itemChildChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "variable")
321321
itemChildChildBody, _ = sjson.Set(itemChildChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", childChildItem.{{toGoName .TfName}}Variable.ValueString())
322322
}
323-
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if childChildItem.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.ValueString() == "{{.DefaultValue}}"{{end}} {
323+
} else {{end}}{{if and .DefaultValuePresent (not .ExcludeNull)}}if childChildItem.{{toGoName .TfName}}.IsNull() {{if and .DynamicDefault .DefaultValuePresent}}|| data.{{toGoName .TfName}}.String() == "{{.DefaultValue}}"{{end}} {
324324
if true{{if ne .ConditionalAttribute.Name ""}} {{if eq .ConditionalAttribute.Type "Bool"}} && childChildItem.{{toGoName .ConditionalAttribute.Name}}.ValueBool() == {{.ConditionalAttribute.Value}} {{else}} && childChildItem.{{toGoName .ConditionalAttribute.Name}}.ValueString() == "{{.ConditionalAttribute.Value}}" {{end}}{{end}} {
325325
itemChildChildBody, _ = sjson.Set(itemChildChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType", "default")
326326
{{if or .DefaultValue .DefaultValueEmptyString}}itemChildChildBody, _ = sjson.Set(itemChildChildBody, "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value", {{if eq .Type "String"}}"{{end}}{{.DefaultValue}}{{if eq .Type "String"}}"{{end}}){{end}}
@@ -382,14 +382,17 @@ func (data *{{camelCase .Name}}) fromBody(ctx context.Context, res gjson.Result)
382382
{{- if eq .Type "StringInt64"}}
383383
data.{{toGoName .TfName}} = types.StringNull()
384384
{{- else}}
385+
{{- if .DynamicDefault}}
386+
temp{{toGoName .TfName}} := data.{{toGoName .TfName}}
387+
{{- end}}
385388
data.{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
386389
{{- end}}
387390
{{ if .Variable}}data.{{toGoName .TfName}}Variable = types.StringNull(){{end}}
388391
if t := res.Get(path + "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
389392
va := res.Get(path + "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
390393
{{if .Variable}}if t.String() == "variable" {
391394
data.{{toGoName .TfName}}Variable = types.StringValue(va.String())
392-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
395+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
393396
{{- if eq .Type "StringInt64" }}
394397
data.{{toGoName .TfName}} = types.StringValue(va.String())
395398
{{- else}}
@@ -408,14 +411,17 @@ func (data *{{camelCase .Name}}) fromBody(ctx context.Context, res gjson.Result)
408411
{{- if eq .Type "StringInt64"}}
409412
item.{{toGoName .TfName}} = types.StringNull()
410413
{{- else}}
414+
{{- if .DynamicDefault}}
415+
temp{{toGoName .TfName}} := item.{{toGoName .TfName}}
416+
{{- end}}
411417
item.{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
412418
{{- end}}
413419
{{ if .Variable}}item.{{toGoName .TfName}}Variable = types.StringNull(){{end}}
414420
if t := v.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
415421
va := v.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
416422
{{if .Variable}}if t.String() == "variable" {
417423
item.{{toGoName .TfName}}Variable = types.StringValue(va.String())
418-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
424+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
419425
{{- if eq .Type "StringInt64" }}
420426
item.{{toGoName .TfName}} = types.StringValue(va.String())
421427
{{- else}}
@@ -433,14 +439,17 @@ func (data *{{camelCase .Name}}) fromBody(ctx context.Context, res gjson.Result)
433439
{{- if eq .Type "StringInt64"}}
434440
cItem.{{toGoName .TfName}} = types.StringNull()
435441
{{- else}}
442+
{{- if .DynamicDefault}}
443+
temp{{toGoName .TfName}} := cItem.{{toGoName .TfName}}
444+
{{- end}}
436445
cItem.{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
437446
{{- end}}
438447
{{ if .Variable}}cItem.{{toGoName .TfName}}Variable = types.StringNull(){{end}}
439448
if t := cv.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
440449
va := cv.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
441450
{{if .Variable}}if t.String() == "variable" {
442451
cItem.{{toGoName .TfName}}Variable = types.StringValue(va.String())
443-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
452+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
444453
{{- if eq .Type "StringInt64" }}
445454
cItem.{{toGoName .TfName}} = types.StringValue(va.String())
446455
{{- else}}
@@ -458,14 +467,17 @@ func (data *{{camelCase .Name}}) fromBody(ctx context.Context, res gjson.Result)
458467
{{- if eq .Type "StringInt64"}}
459468
ccItem.{{toGoName .TfName}} = types.StringNull()
460469
{{- else}}
470+
{{- if .DynamicDefault}}
471+
temp{{toGoName .TfName}} := ccItem.{{toGoName .TfName}}
472+
{{- end}}
461473
ccItem.{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
462474
{{- end}}
463475
{{ if .Variable}}ccItem.{{toGoName .TfName}}Variable = types.StringNull(){{end}}
464476
if t := ccv.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
465477
va := ccv.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
466478
{{if .Variable}}if t.String() == "variable" {
467479
ccItem.{{toGoName .TfName}}Variable = types.StringValue(va.String())
468-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
480+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
469481
{{- if eq .Type "StringInt64" }}
470482
ccItem.{{toGoName .TfName}} = types.StringValue(va.String())
471483
{{- else}}
@@ -510,14 +522,17 @@ func (data *{{camelCase .Name}}) updateFromBody(ctx context.Context, res gjson.R
510522
{{- if eq .Type "StringInt64"}}
511523
data.{{toGoName .TfName}} = types.StringNull()
512524
{{- else}}
525+
{{- if .DynamicDefault}}
526+
temp{{toGoName .TfName}} := data.{{toGoName .TfName}}
527+
{{- end}}
513528
data.{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
514529
{{- end}}
515530
{{ if .Variable}}data.{{toGoName .TfName}}Variable = types.StringNull(){{end}}
516531
if t := res.Get(path + "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
517532
va := res.Get(path + "{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
518533
{{if .Variable}}if t.String() == "variable" {
519534
data.{{toGoName .TfName}}Variable = types.StringValue(va.String())
520-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
535+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
521536
{{- if eq .Type "StringInt64" }}
522537
data.{{toGoName .TfName}} = types.StringValue(va.String())
523538
{{- else}}
@@ -603,14 +618,17 @@ func (data *{{camelCase .Name}}) updateFromBody(ctx context.Context, res gjson.R
603618
{{- if eq .Type "StringInt64"}}
604619
data.{{$list}}[i].{{toGoName .TfName}} = types.StringNull()
605620
{{- else}}
621+
{{- if .DynamicDefault}}
622+
temp{{toGoName .TfName}} := data.{{$list}}[i].{{toGoName .TfName}}
623+
{{- end}}
606624
data.{{$list}}[i].{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
607625
{{- end}}
608626
{{ if .Variable}}data.{{$list}}[i].{{toGoName .TfName}}Variable = types.StringNull(){{end}}
609627
if t := r.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
610628
va := r.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
611629
{{if .Variable}}if t.String() == "variable" {
612630
data.{{$list}}[i].{{toGoName .TfName}}Variable = types.StringValue(va.String())
613-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
631+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
614632
{{- if eq .Type "StringInt64" }}
615633
data.{{$list}}[i].{{toGoName .TfName}} = types.StringValue(va.String())
616634
{{- else}}
@@ -696,14 +714,17 @@ func (data *{{camelCase .Name}}) updateFromBody(ctx context.Context, res gjson.R
696714
{{- if eq .Type "StringInt64"}}
697715
data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}} = types.StringNull()
698716
{{- else}}
717+
{{- if .DynamicDefault}}
718+
temp{{toGoName .TfName}} := data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}}
719+
{{- end}}
699720
data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
700721
{{- end}}
701722
{{ if .Variable}}data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}}Variable = types.StringNull(){{end}}
702723
if t := cr.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
703724
va := cr.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
704725
{{if .Variable}}if t.String() == "variable" {
705726
data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}}Variable = types.StringValue(va.String())
706-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
727+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
707728
{{- if eq .Type "StringInt64" }}
708729
data.{{$list}}[i].{{$clist}}[ci].{{toGoName .TfName}} = types.StringValue(va.String())
709730
{{- else}}
@@ -789,14 +810,17 @@ func (data *{{camelCase .Name}}) updateFromBody(ctx context.Context, res gjson.R
789810
{{- if eq .Type "StringInt64"}}
790811
data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}} = types.StringNull()
791812
{{- else}}
813+
{{- if .DynamicDefault}}
814+
temp{{toGoName .TfName}} := data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}}
815+
{{- end}}
792816
data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}} = types.{{.Type}}Null({{if isListSet .}}types.{{.ElementType}}Type{{end}})
793817
{{- end}}
794818
{{ if .Variable}}data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}}Variable = types.StringNull(){{end}}
795819
if t := ccr.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.optionType"); t.Exists() {
796820
va := ccr.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.value")
797821
{{if .Variable}}if t.String() == "variable" {
798822
data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}}Variable = types.StringValue(va.String())
799-
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| t.String() == "default"{{end}} {
823+
} else{{end}} if t.String() == "global" {{if .DynamicDefault}}|| (t.String() == "default" && temp{{toGoName .TfName}}.String() == "{{.DefaultValue}}"){{end}} {
800824
{{- if eq .Type "StringInt64" }}
801825
data.{{$list}}[i].{{$clist}}[ci].{{$cclist}}[cci].{{toGoName .TfName}} = types.StringValue(va.String())
802826
{{- else}}

‎internal/provider/model_sdwan_service_route_policy_feature.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (data ServiceRoutePolicy) toBody(ctx context.Context) string {
109109
body, _ = sjson.Set(body, "name", data.Name.ValueString())
110110
body, _ = sjson.Set(body, "description", data.Description.ValueString())
111111
path := "data."
112-
if data.DefaultAction.IsNull() || data.DefaultAction.ValueString() == "reject" {
112+
if data.DefaultAction.IsNull() || data.DefaultAction.String() == "reject" {
113113
if true {
114114
body, _ = sjson.Set(body, path+"defaultAction.optionType", "default")
115115
body, _ = sjson.Set(body, path+"defaultAction.value", "reject")
@@ -365,11 +365,12 @@ func (data *ServiceRoutePolicy) fromBody(ctx context.Context, res gjson.Result)
365365
data.Description = types.StringNull()
366366
}
367367
path := "payload.data."
368+
tempDefaultAction := data.DefaultAction
368369
data.DefaultAction = types.StringNull()
369370

370371
if t := res.Get(path + "defaultAction.optionType"); t.Exists() {
371372
va := res.Get(path + "defaultAction.value")
372-
if t.String() == "global" || t.String() == "default" {
373+
if t.String() == "global" || (t.String() == "default" && tempDefaultAction.String() == "reject") {
373374
data.DefaultAction = types.StringValue(va.String())
374375
}
375376
}
@@ -652,11 +653,12 @@ func (data *ServiceRoutePolicy) updateFromBody(ctx context.Context, res gjson.Re
652653
data.Description = types.StringNull()
653654
}
654655
path := "payload.data."
656+
tempDefaultAction := data.DefaultAction
655657
data.DefaultAction = types.StringNull()
656658

657659
if t := res.Get(path + "defaultAction.optionType"); t.Exists() {
658660
va := res.Get(path + "defaultAction.value")
659-
if t.String() == "global" || t.String() == "default" {
661+
if t.String() == "global" || (t.String() == "default" && tempDefaultAction.String() == "reject") {
660662
data.DefaultAction = types.StringValue(va.String())
661663
}
662664
}

‎internal/provider/model_sdwan_system_ipv4_device_access_feature.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (data SystemIPv4DeviceAccess) toBody(ctx context.Context) string {
7979
body, _ = sjson.Set(body, "name", data.Name.ValueString())
8080
body, _ = sjson.Set(body, "description", data.Description.ValueString())
8181
path := "data."
82-
if data.DefaultAction.IsNull() || data.DefaultAction.ValueString() == "drop" {
82+
if data.DefaultAction.IsNull() || data.DefaultAction.String() == "drop" {
8383
if true {
8484
body, _ = sjson.Set(body, path+"defaultAction.optionType", "default")
8585
body, _ = sjson.Set(body, path+"defaultAction.value", "drop")
@@ -183,11 +183,12 @@ func (data *SystemIPv4DeviceAccess) fromBody(ctx context.Context, res gjson.Resu
183183
data.Description = types.StringNull()
184184
}
185185
path := "payload.data."
186+
tempDefaultAction := data.DefaultAction
186187
data.DefaultAction = types.StringNull()
187188

188189
if t := res.Get(path + "defaultAction.optionType"); t.Exists() {
189190
va := res.Get(path + "defaultAction.value")
190-
if t.String() == "global" || t.String() == "default" {
191+
if t.String() == "global" || (t.String() == "default" && tempDefaultAction.String() == "drop") {
191192
data.DefaultAction = types.StringValue(va.String())
192193
}
193194
}
@@ -288,11 +289,12 @@ func (data *SystemIPv4DeviceAccess) updateFromBody(ctx context.Context, res gjso
288289
data.Description = types.StringNull()
289290
}
290291
path := "payload.data."
292+
tempDefaultAction := data.DefaultAction
291293
data.DefaultAction = types.StringNull()
292294

293295
if t := res.Get(path + "defaultAction.optionType"); t.Exists() {
294296
va := res.Get(path + "defaultAction.value")
295-
if t.String() == "global" || t.String() == "default" {
297+
if t.String() == "global" || (t.String() == "default" && tempDefaultAction.String() == "drop") {
296298
data.DefaultAction = types.StringValue(va.String())
297299
}
298300
}

0 commit comments

Comments
 (0)