Skip to content

Fix conditional attribute on role in custom control topology policy definition #557

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix conditional attribute on role in custom control topology policy definition #557

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
2 changes: 1 addition & 1 deletion docs/resources/custom_control_topology_policy_definition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Optional:
- `region_id` (Number) Region ID, Attribute conditional on `type` being equal to `regionId`
- Range: `0`-`63`
- `region_list_id` (String) Region list ID, Attribute conditional on `type` being equal to `regionList`
- `role` (String) Role, Attribute conditional on `type` being equal to `regionId`
- `role` (String) Role, Attribute conditional on `type` being equal to `role`
- Choices: `border-router`, `edge-router`
- `site_id` (Number) Site ID, Attribute conditional on `type` being equal to `siteId`
- Range: `0`-`4294967295`
Expand Down
2 changes: 1 addition & 1 deletion gen/definitions/generic/custom_control_topology_policy_definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ attributes:
tf_name: role
conditional_attribute:
name: type
value: regionId
value: role
type: String
description: Role
enum_values: [border-router, edge-router]
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/model_sdwan_custom_control_topology_policy_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func (data CustomControlTopologyPolicyDefinition) toBody(ctx context.Context) st
if !childItem.RegionId.IsNull() && childItem.Type.ValueString() == "regionId" {
itemChildBody, _ = sjson.Set(itemChildBody, "value", fmt.Sprint(childItem.RegionId.ValueInt64()))
}
if !childItem.Role.IsNull() && childItem.Type.ValueString() == "regionId" {
if !childItem.Role.IsNull() && childItem.Type.ValueString() == "role" {
itemChildBody, _ = sjson.Set(itemChildBody, "value", childItem.Role.ValueString())
}
if !childItem.RegionListId.IsNull() && childItem.Type.ValueString() == "regionList" {
Expand Down Expand Up @@ -477,7 +477,7 @@ func (data *CustomControlTopologyPolicyDefinition) fromBody(ctx context.Context,
} else {
cItem.RegionId = types.Int64Null()
}
if ccValue := cv.Get("value"); ccValue.Exists() && cItem.Type.ValueString() == "regionId" {
if ccValue := cv.Get("value"); ccValue.Exists() && cItem.Type.ValueString() == "role" {
cItem.Role = types.StringValue(ccValue.String())
} else {
cItem.Role = types.StringNull()
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/resource_sdwan_custom_control_topology_policy_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func (r *CustomControlTopologyPolicyDefinitionResource) Schema(ctx context.Conte
},
},
"role": schema.StringAttribute{
MarkdownDescription: helpers.NewAttributeDescription("Role, Attribute conditional on `type` being equal to `regionId`").AddStringEnumDescription("border-router", "edge-router").String,
MarkdownDescription: helpers.NewAttributeDescription("Role, Attribute conditional on `type` being equal to `role`").AddStringEnumDescription("border-router", "edge-router").String,
Optional: true,
Validators: []validator.String{
stringvalidator.OneOf("border-router", "edge-router"),
Expand Down