Skip to content

zone_based_firewall_policy_definition: add policy_version attribute #561

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

Open
rchrabas wants to merge 2 commits into
base: main
Choose a base branch
from
Open

zone_based_firewall_policy_definition: add policy_version attribute #561

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
1e0fed3
zone_based_firewall_policy_definition: add policy_version
rchrabas Nov 12, 2025
f531de7
add new attribute type - VersionString
rchrabas Nov 19, 2025
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
1 change: 1 addition & 0 deletions docs/data-sources/zone_based_firewall_policy_definition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Read-Only:
Read-Only:

- `policy_id` (String) policy id for selected match entry
- `policy_version` (String) Policy version
- `protocol_type` (String) Should be included with additionally entries for `destinationPort` and `protocol` whenever the type `protocolName` is used.
- `type` (String) Type of match entry
- `value` (String) value for selected match entry
Expand Down
1 change: 1 addition & 0 deletions docs/resources/zone_based_firewall_policy_definition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Required:
Optional:

- `policy_id` (String) policy id for selected match entry
- `policy_version` (String) Policy version
- `protocol_type` (String) Should be included with additionally entries for `destinationPort` and `protocol` whenever the type `protocolName` is used.
- `value` (String) value for selected match entry
- `value_variable` (String) variable value for selected match entry if it has variable option (sourceIp & destinationIp)
Expand Down
5 changes: 5 additions & 0 deletions gen/definitions/generic/zone_based_firewall_policy_definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ attributes:
description: policy id for selected match entry
example: 0d26a366-4a11-4942-a5ea-82af9502889f
test_value: sdwan_geo_location_list_policy_object.test.id
- tf_name: policy_version
tf_only: true
type: VersionString
description: Policy version
exclude_test: true
- model_name: value
tf_name: value
type: String
Expand Down
5 changes: 3 additions & 2 deletions gen/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,10 @@ func HasName(attributes []YamlConfigAttribute) bool {
// Templating helper function to determine if attributes list contains one or more version attributes
func HasVersionAttribute(attributes []YamlConfigAttribute) bool {
for _, attr := range attributes {
if attr.Type == "Version" || attr.Type == "Versions" {
switch attr.Type {
case "Version", "Versions", "VersionString":
return true
} else if attr.Type == "List" || attr.Type == "Set" {
case "List", "Set":
if HasVersionAttribute(attr.Attributes) {
return true
}
Expand Down
2 changes: 1 addition & 1 deletion gen/schema/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ attribute:
model_name: str(required=False) # Name of the attribute in the model (payload)
response_model_name: str(required=False) # Name of the attribute in the model (response payload)
tf_name: str(required=False) # Name of the attribute in the Terraform resource, by default derived from model_name
type: enum('String', 'Int64', 'StringInt64', 'Bool', 'List', 'Set', 'Version', 'Versions', required=False) # Type of the attribute
type: enum('String', 'Int64', 'StringInt64', 'Bool', 'List', 'Set', 'Version', 'VersionString', 'Versions', required=False) # Type of the attribute
element_type: enum('String', 'Int64', required=False) # only relevant if type is either 'List' or 'Set'
object_type: enum('object', 'tree', 'list', required=False) # Feature template schema object type
model_type_string: bool(required=False) # Set to true if element should be added as string to payload
Expand Down
8 changes: 4 additions & 4 deletions gen/templates/generic/data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (d *{{camelCase .Name}}DataSource) Schema(ctx context.Context, req datasour
{{- end}}
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: "{{.Description}}",
{{- if isListSet .}}
ElementType: types.{{.ElementType}}Type,
Expand All @@ -103,7 +103,7 @@ func (d *{{camelCase .Name}}DataSource) Schema(ctx context.Context, req datasour
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: "{{.Description}}",
{{- if isListSet .}}
ElementType: types.{{.ElementType}}Type,
Expand All @@ -116,7 +116,7 @@ func (d *{{camelCase .Name}}DataSource) Schema(ctx context.Context, req datasour
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: "{{.Description}}",
{{- if isListSet .}}
ElementType: types.{{.ElementType}}Type,
Expand All @@ -129,7 +129,7 @@ func (d *{{camelCase .Name}}DataSource) Schema(ctx context.Context, req datasour
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: "{{.Description}}",
{{- if isListSet .}}
ElementType: types.{{.ElementType}}Type,
Expand Down
42 changes: 35 additions & 7 deletions gen/templates/generic/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ Type types.String `tfsdk:"type"`
{{toGoName .TfName}} types.List `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "Version"}}
{{toGoName .TfName}} types.Int64 `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "VersionString"}}
{{toGoName .TfName}} types.String `tfsdk:"{{.TfName}}"`
{{- else}}
{{toGoName .TfName}} types.{{.Type}} `tfsdk:"{{.TfName}}"`
{{- end}}
Expand All @@ -73,6 +75,8 @@ type {{$name}}{{toGoName .TfName}} struct {
{{toGoName .TfName}} types.List `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "Version"}}
{{toGoName .TfName}} types.Int64 `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "VersionString"}}
{{toGoName .TfName}} types.String `tfsdk:"{{.TfName}}"`
{{- else}}
{{toGoName .TfName}} types.{{.Type}} `tfsdk:"{{.TfName}}"`
{{- end}}
Expand Down Expand Up @@ -100,6 +104,8 @@ type {{$name}}{{$childName}}{{toGoName .TfName}} struct {
{{toGoName .TfName}} types.List `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "Version"}}
{{toGoName .TfName}} types.Int64 `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "VersionString"}}
{{toGoName .TfName}} types.String `tfsdk:"{{.TfName}}"`
{{- else}}
{{toGoName .TfName}} types.{{.Type}} `tfsdk:"{{.TfName}}"`
{{- end}}
Expand Down Expand Up @@ -131,6 +137,8 @@ type {{$name}}{{$childName}}{{$childChildName}}{{toGoName .TfName}} struct {
{{toGoName .TfName}} types.List `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "Version"}}
{{toGoName .TfName}} types.Int64 `tfsdk:"{{.TfName}}"`
{{- else if eq .Type "VersionString"}}
{{toGoName .TfName}} types.String `tfsdk:"{{.TfName}}"`
{{- else}}
{{toGoName .TfName}} types.{{.Type}} `tfsdk:"{{.TfName}}"`
{{- end}}
Expand Down Expand Up @@ -583,7 +591,7 @@ func (data *{{camelCase .Name}}) hasChanges(ctx context.Context, state *{{camelC
func (data *{{camelCase .Name}}) updateVersions(ctx context.Context, state *{{camelCase .Name}}) {
{{- range .Attributes}}
{{- $name := toGoName .TfName}}
{{- if or (eq .Type "Version") (eq .Type "Versions")}}
{{- if or (eq .Type "Version") (eq .Type "Versions") (eq .Type "VersionString")}}
data.{{toGoName .TfName}} = state.{{toGoName .TfName}}
{{- else if and (isNestedListSet .) (hasVersionAttribute .Attributes)}}
for i := range data.{{toGoName .TfName}} {
Expand All @@ -598,11 +606,11 @@ func (data *{{camelCase .Name}}) updateVersions(ctx context.Context, state *{{ca
}
{{- range .Attributes}}
{{- $cname := toGoName .TfName}}
{{- if eq .Type "Version"}}
{{- if or (eq .Type "Version") (eq .Type "VersionString")}}
if stateIndex > -1 {
data.{{$name}}[i].{{toGoName .TfName}} = state.{{$name}}[stateIndex].{{toGoName .TfName}}
} else {
data.{{$name}}[i].{{toGoName .TfName}} = types.Int64Null()
data.{{$name}}[i].{{toGoName .TfName}} = types.{{if eq .Type "Version"}}Int64{{else}}String{{end}}Null()
}
{{- else if eq .Type "Versions"}}
if stateIndex > -1 && !state.{{$name}}[stateIndex].{{toGoName .TfName}}.IsNull() {
Expand All @@ -625,11 +633,11 @@ func (data *{{camelCase .Name}}) updateVersions(ctx context.Context, state *{{ca
}
{{- range .Attributes}}
{{- $ccname := toGoName .TfName}}
{{- if eq .Type "Version"}}
{{- if or (eq .Type "Version") (eq .Type "VersionString")}}
if cStateIndex > -1 {
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = state.{{$name}}[stateIndex].{{$cname}}[cStateIndex].{{toGoName .TfName}}
} else {
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = types.Int64Null()
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = types.{{if eq .Type "Version"}}Int64{{else}}String{{end}}Null()
}
{{- else if eq .Type "Versions"}}
if cStateIndex > -1 && !state.{{$name}}[stateIndex].{{$cname}}[cStateIndex].{{toGoName .TfName}}.IsNull() {
Expand All @@ -651,11 +659,11 @@ func (data *{{camelCase .Name}}) updateVersions(ctx context.Context, state *{{ca
}
}
{{- range .Attributes}}
{{- if eq .Type "Version"}}
{{- if or (eq .Type "Version") (eq .Type "VersionString")}}
if ccStateIndex > -1 {
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = state.{{$name}}[stateIndex].{{$cname}}[cStateIndex].{{$ccname}}[ccStateIndex].{{toGoName .TfName}}
} else {
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = types.Int64Null()
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = types.{{if eq .Type "Version"}}Int64{{else}}String{{end}}Null()
}
{{- else if eq .Type "Versions"}}
if ccStateIndex > -1 && !state.{{$name}}[stateIndex].{{$cname}}[cStateIndex].{{$ccname}}[ccStateIndex].{{toGoName .TfName}}.IsNull() {
Expand Down Expand Up @@ -696,6 +704,11 @@ func (data *{{camelCase .Name}}) processImport(ctx context.Context) {
if data.{{toVersionName .TfName}} != types.StringNull() {
data.{{toGoName .TfName}} = types.Int64Value(0)
}
{{- else if eq .Type "VersionString"}}
if data.{{toVersionName .TfName}} != types.StringNull() {
count := strings.Count(strings.TrimSpace(data.{{toVersionName .TfName}}.ValueString()), " ") + 1
data.{{toGoName .TfName}} = types.StringValue(strings.TrimSpace(strings.Repeat("0 ", count)))
}
{{- else if eq .Type "Versions"}}
if !data.{{toVersionName .TfName}}.IsNull() {
data.{{toGoName .TfName}} = types.ListNull(types.StringType)
Expand All @@ -710,6 +723,11 @@ func (data *{{camelCase .Name}}) processImport(ctx context.Context) {
if data.{{$name}}[i].{{toVersionName .TfName}} != types.StringNull() {
data.{{$name}}[i].{{toGoName .TfName}} = types.Int64Value(0)
}
{{- else if eq .Type "VersionString"}}
if data.{{$name}}[i].{{toVersionName .TfName}} != types.StringNull() {
count := strings.Count(strings.TrimSpace(data.{{$name}}[i].{{toVersionName .TfName}}.ValueString()), " ") + 1
data.{{$name}}[i].{{toGoName .TfName}} = types.StringValue(strings.TrimSpace(strings.Repeat("0 ", count)))
}
{{- else if eq .Type "Versions"}}
if !data.{{$name}}[i].{{toVersionName .TfName}}.IsNull() {
data.{{$name}}[i].{{toGoName .TfName}} = types.ListNull(types.StringType)
Expand All @@ -724,6 +742,11 @@ func (data *{{camelCase .Name}}) processImport(ctx context.Context) {
if data.{{$name}}[i].{{$cname}}[ii].{{toVersionName .TfName}} != types.StringNull() {
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = types.Int64Value(0)
}
{{- else if eq .Type "VersionString"}}
if data.{{$name}}[i].{{$cname}}[ii].{{toVersionName .TfName}} != types.StringNull() {
count := strings.Count(strings.TrimSpace(data.{{$name}}[i].{{$cname}}[ii].{{toVersionName .TfName}}.ValueString()), " ") + 1
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = types.StringValue(strings.TrimSpace(strings.Repeat("0 ", count)))
}
{{- else if eq .Type "Versions"}}
if !data.{{$name}}[i].{{$cname}}[ii].{{toVersionName .TfName}}.IsNull() {
data.{{$name}}[i].{{$cname}}[ii].{{toGoName .TfName}} = types.ListNull(types.StringType)
Expand All @@ -736,6 +759,11 @@ func (data *{{camelCase .Name}}) processImport(ctx context.Context) {
if data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toVersionName .TfName}} != types.StringNull() {
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = types.Int64Value(0)
}
{{- else if eq .Type "VersionString"}}
if data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toVersionName .TfName}} != types.StringNull() {
count := strings.Count(strings.TrimSpace(data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toVersionName .TfName}}.ValueString()), " ") + 1
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = types.StringValue(strings.TrimSpace(strings.Repeat("0 ", count)))
}
{{- else if eq .Type "Versions"}}
if !data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toVersionName .TfName}}.IsNull() {
data.{{$name}}[i].{{$cname}}[ii].{{$ccname}}[iii].{{toGoName .TfName}} = types.ListNull(types.StringType)
Expand Down
8 changes: 4 additions & 4 deletions gen/templates/generic/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (r *{{camelCase .Name}}Resource) Schema(ctx context.Context, req resource.S
{{- end}}
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: helpers.NewAttributeDescription("{{.Description}}{{if .ConditionalAttribute.Name}}, Attribute conditional on `{{.ConditionalAttribute.Name}}` being equal to `{{.ConditionalAttribute.Value}}`{{end}}")
{{- if len .EnumValues -}}
.AddStringEnumDescription({{range .EnumValues}}"{{.}}", {{end}})
Expand Down Expand Up @@ -165,7 +165,7 @@ func (r *{{camelCase .Name}}Resource) Schema(ctx context.Context, req resource.S
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: helpers.NewAttributeDescription("{{.Description}}{{if .ConditionalAttribute.Name}}, Attribute conditional on `{{.ConditionalAttribute.Name}}` being equal to `{{.ConditionalAttribute.Value}}`{{end}}")
{{- if len .EnumValues -}}
.AddStringEnumDescription({{range .EnumValues}}"{{.}}", {{end}})
Expand Down Expand Up @@ -232,7 +232,7 @@ func (r *{{camelCase .Name}}Resource) Schema(ctx context.Context, req resource.S
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: helpers.NewAttributeDescription("{{.Description}}{{if .ConditionalAttribute.Name}}, Attribute conditional on `{{.ConditionalAttribute.Name}}` being equal to `{{.ConditionalAttribute.Value}}`{{end}}")
{{- if len .EnumValues -}}
.AddStringEnumDescription({{range .EnumValues}}"{{.}}", {{end}})
Expand Down Expand Up @@ -299,7 +299,7 @@ func (r *{{camelCase .Name}}Resource) Schema(ctx context.Context, req resource.S
Attributes: map[string]schema.Attribute{
{{- range .Attributes}}
{{- if not .Value}}
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else}}{{.Type}}{{end}}Attribute{
"{{.TfName}}": schema.{{if isNestedListSet .}}{{.Type}}Nested{{else if isList .}}List{{else if isSet .}}Set{{else if eq .Type "Versions"}}List{{else if eq .Type "Version"}}Int64{{else if eq .Type "VersionString"}}String{{else}}{{.Type}}{{end}}Attribute{
MarkdownDescription: helpers.NewAttributeDescription("{{.Description}}{{if .ConditionalAttribute.Name}}, Attribute conditional on `{{.ConditionalAttribute.Name}}` being equal to `{{.ConditionalAttribute.Value}}`{{end}}")
{{- if len .EnumValues -}}
.AddStringEnumDescription({{range .EnumValues}}"{{.}}", {{end}})
Expand Down
4 changes: 4 additions & 0 deletions internal/provider/data_source_sdwan_zone_based_firewall_policy_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ func (d *ZoneBasedFirewallPolicyDefinitionDataSource) Schema(ctx context.Context
MarkdownDescription: "policy id for selected match entry",
Computed: true,
},
"policy_version": schema.StringAttribute{
MarkdownDescription: "Policy version",
Computed: true,
},
"value": schema.StringAttribute{
MarkdownDescription: "value for selected match entry",
Computed: true,
Expand Down
Loading