Fix incorrect types (#487)

rchrabas · web-flow · commit a30bca6d0764 · 2025-08-08T19:39:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@
 - Adds `enhanced_app_aware_routing` support to the `sdwan_cisco_system_feature_template` resource and data source
 - Add `gateway` attribute for `ipv4_static_routes` and `ipv6_static_routes` in `sdwan_service_lan_vpn_feature` resource
 - Fix issue causing `sdwan_transport_routing_bgp_feature` to fail to apply when `policy_type` is set to `off`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/475)
+- BREAKING CHANGE: `sdwan_cisco_vpn_feature_template`: rename `interface` attribute to `interfaces`
+- Fix type of `interfaces` attribute of `sdwan_cisco_vpn_feature_template` under `ipv4_static_ipsec_routes` & `ipv4_static_gre_routes`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/474)
+- Fix type of `as_path_prepend` attribute of `sdwan_service_route_policy_feature` and `sdwan_transport_route_policy_feature`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/474)
 
 ## 0.6.2
 
diff --git a/docs/data-sources/cisco_vpn_feature_template.md b/docs/data-sources/cisco_vpn_feature_template.md
@@ -103,8 +103,8 @@ Read-Only:
 
 Read-Only:
 
-- `interface` (Set of String) List of GRE Interfaces
-- `interface_variable` (String) Variable name
+- `interfaces` (List of String) List of GRE Interfaces
+- `interfaces_variable` (String) Variable name
 - `optional` (Boolean) Indicates if list item is considered optional.
 - `prefix` (String) Prefix
 - `prefix_variable` (String) Variable name
@@ -116,8 +116,8 @@ Read-Only:
 
 Read-Only:
 
-- `interface` (Set of String) List of IPSEC Interfaces (Separated by commas)
-- `interface_variable` (String) Variable name
+- `interfaces` (List of String) List of IPSEC Interfaces (Separated by commas)
+- `interfaces_variable` (String) Variable name
 - `optional` (Boolean) Indicates if list item is considered optional.
 - `prefix` (String) Prefix
 - `prefix_variable` (String) Variable name
diff --git a/docs/data-sources/service_route_policy_feature.md b/docs/data-sources/service_route_policy_feature.md
@@ -52,7 +52,7 @@ Read-Only:
 
 Read-Only:
 
-- `as_path_prepend` (Set of Number)
+- `as_path_prepend` (List of Number)
 - `community` (Set of String)
 - `community_additive` (Boolean)
 - `community_variable` (String) Variable name
diff --git a/docs/data-sources/transport_route_policy_feature.md b/docs/data-sources/transport_route_policy_feature.md
@@ -52,7 +52,7 @@ Read-Only:
 
 Read-Only:
 
-- `as_path_prepend` (Set of Number)
+- `as_path_prepend` (List of Number)
 - `community` (Set of String)
 - `community_additive` (Boolean)
 - `community_variable` (String) Variable name
diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -18,6 +18,9 @@ description: |-
 - Adds `enhanced_app_aware_routing` support to the `sdwan_cisco_system_feature_template` resource and data source
 - Add `gateway` attribute for `ipv4_static_routes` and `ipv6_static_routes` in `sdwan_service_lan_vpn_feature` resource
 - Fix issue causing `sdwan_transport_routing_bgp_feature` to fail to apply when `policy_type` is set to `off`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/475)
+- BREAKING CHANGE: `sdwan_cisco_vpn_feature_template`: rename `interface` attribute to `interfaces`
+- Fix type of `interfaces` attribute of `sdwan_cisco_vpn_feature_template` under `ipv4_static_ipsec_routes` & `ipv4_static_gre_routes`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/474)
+- Fix type of `as_path_prepend` attribute of `sdwan_service_route_policy_feature` and `sdwan_transport_route_policy_feature`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/474)
 
 ## 0.6.2
 
diff --git a/docs/resources/cisco_vpn_feature_template.md b/docs/resources/cisco_vpn_feature_template.md
@@ -97,16 +97,16 @@ resource "sdwan_cisco_vpn_feature_template" "example" {
   ]
   ipv4_static_gre_routes = [
     {
-      prefix    = "3.3.3.0/24"
-      vpn_id    = 2
-      interface = ["e1"]
+      prefix     = "3.3.3.0/24"
+      vpn_id     = 2
+      interfaces = ["e1"]
     }
   ]
   ipv4_static_ipsec_routes = [
     {
-      prefix    = "4.4.4.0/24"
-      vpn_id    = 2
-      interface = ["e1"]
+      prefix     = "4.4.4.0/24"
+      vpn_id     = 2
+      interfaces = ["e1"]
     }
   ]
   omp_advertise_ipv4_routes = [
@@ -328,8 +328,8 @@ Optional:
 
 Optional:
 
-- `interface` (Set of String) List of GRE Interfaces
-- `interface_variable` (String) Variable name
+- `interfaces` (List of String) List of GRE Interfaces
+- `interfaces_variable` (String) Variable name
 - `optional` (Boolean) Indicates if list item is considered optional.
 - `prefix` (String) Prefix
 - `prefix_variable` (String) Variable name
@@ -342,8 +342,8 @@ Optional:
 
 Optional:
 
-- `interface` (Set of String) List of IPSEC Interfaces (Separated by commas)
-- `interface_variable` (String) Variable name
+- `interfaces` (List of String) List of IPSEC Interfaces (Separated by commas)
+- `interfaces_variable` (String) Variable name
 - `optional` (Boolean) Indicates if list item is considered optional.
 - `prefix` (String) Prefix
 - `prefix_variable` (String) Variable name
diff --git a/docs/resources/service_route_policy_feature.md b/docs/resources/service_route_policy_feature.md
@@ -89,7 +89,7 @@ Optional:
 
 Optional:
 
-- `as_path_prepend` (Set of Number)
+- `as_path_prepend` (List of Number)
 - `community` (Set of String)
 - `community_additive` (Boolean) - Default value: `false`
 - `community_variable` (String) Variable name
diff --git a/docs/resources/transport_route_policy_feature.md b/docs/resources/transport_route_policy_feature.md
@@ -89,7 +89,7 @@ Optional:
 
 Optional:
 
-- `as_path_prepend` (Set of Number)
+- `as_path_prepend` (List of Number)
 - `community` (Set of String)
 - `community_additive` (Boolean) - Default value: `false`
 - `community_variable` (String) Variable name
diff --git a/examples/resources/sdwan_cisco_vpn_feature_template/resource.tf b/examples/resources/sdwan_cisco_vpn_feature_template/resource.tf
@@ -80,16 +80,16 @@ resource "sdwan_cisco_vpn_feature_template" "example" {
   ]
   ipv4_static_gre_routes = [
     {
-      prefix    = "3.3.3.0/24"
-      vpn_id    = 2
-      interface = ["e1"]
+      prefix     = "3.3.3.0/24"
+      vpn_id     = 2
+      interfaces = ["e1"]
     }
   ]
   ipv4_static_ipsec_routes = [
     {
-      prefix    = "4.4.4.0/24"
-      vpn_id    = 2
-      interface = ["e1"]
+      prefix     = "4.4.4.0/24"
+      vpn_id     = 2
+      interfaces = ["e1"]
     }
   ]
   omp_advertise_ipv4_routes = [
diff --git a/gen/definitions/feature_templates/cisco_vpn.yaml b/gen/definitions/feature_templates/cisco_vpn.yaml
@@ -134,6 +134,8 @@ attributes:
         tf_name: vpn_id
         example: 2
       - model_name: interface
+        tf_name: interfaces
+        type: List
         example: e1
   - model_name: ipsec-route
     tf_name: ipv4_static_ipsec_routes
@@ -144,6 +146,8 @@ attributes:
         tf_name: vpn_id
         example: 2
       - model_name: interface
+        tf_name: interfaces
+        type: List
         example: e1
   - model_name: advertise
     tf_name: omp_advertise_ipv4_routes
diff --git a/gen/definitions/profile_parcels/service_route_policy.yaml b/gen/definitions/profile_parcels/service_route_policy.yaml
@@ -99,6 +99,8 @@ attributes:
       - model_name: prepend
         tf_name: as_path_prepend
         data_path: [accept, setAsPath]
+        type: List
+        element_type: Int64
         example: 65521
       - model_name: additive
         tf_name: community_additive
diff --git a/gen/definitions/profile_parcels/transport_route_policy.yaml b/gen/definitions/profile_parcels/transport_route_policy.yaml
@@ -100,6 +100,8 @@ attributes:
       - model_name: prepend
         tf_name: as_path_prepend
         data_path: [accept, setAsPath]
+        type: List
+        element_type: Int64
         example: 65521
       - model_name: additive
         tf_name: community_additive
diff --git a/gen/generator.go b/gen/generator.go
@@ -876,10 +876,8 @@ func parseProfileParcelAttribute(attr *YamlConfigAttribute, model gjson.Result,
 						attr.MaxInt = value.Int()
 					}
 				}
-			} else if attr.Type == "List" && attr.ElementType == "String" {
-				// Remove unsupported type error
-				attr.Type = "List"
-				attr.ElementType = "String"
+			} else if attr.Type == "List" && attr.ElementType != "" {
+				// Remove unsupported type error and enable model overrides
 			} else if attr.Type == "Set" && attr.ElementType == "String" || t.Get("properties.value.type").String() == "array" && t.Get("properties.value.items.type").String() == "string" || t.Get("properties.value.type").String() == "array" && t.Get("properties.value.items.oneOf.0.type").String() == "string" {
 				attr.Type = "Set"
 				attr.ElementType = "String"
diff --git a/internal/provider/data_source_sdwan_cisco_vpn_feature_template.go b/internal/provider/data_source_sdwan_cisco_vpn_feature_template.go
@@ -488,12 +488,12 @@ func (d *CiscoVPNFeatureTemplateDataSource) Schema(ctx context.Context, req data
 							MarkdownDescription: "Destination VPN to resolve the prefix",
 							Computed:            true,
 						},
-						"interface": schema.SetAttribute{
+						"interfaces": schema.ListAttribute{
 							MarkdownDescription: "List of GRE Interfaces",
 							ElementType:         types.StringType,
 							Computed:            true,
 						},
-						"interface_variable": schema.StringAttribute{
+						"interfaces_variable": schema.StringAttribute{
 							MarkdownDescription: helpers.NewAttributeDescription("Variable name").String,
 							Computed:            true,
 						},
@@ -521,12 +521,12 @@ func (d *CiscoVPNFeatureTemplateDataSource) Schema(ctx context.Context, req data
 							MarkdownDescription: "Destination VPN to resolve the prefix",
 							Computed:            true,
 						},
-						"interface": schema.SetAttribute{
+						"interfaces": schema.ListAttribute{
 							MarkdownDescription: "List of IPSEC Interfaces (Separated by commas)",
 							ElementType:         types.StringType,
 							Computed:            true,
 						},
-						"interface_variable": schema.StringAttribute{
+						"interfaces_variable": schema.StringAttribute{
 							MarkdownDescription: helpers.NewAttributeDescription("Variable name").String,
 							Computed:            true,
 						},
diff --git a/internal/provider/data_source_sdwan_cisco_vpn_feature_template_test.go b/internal/provider/data_source_sdwan_cisco_vpn_feature_template_test.go
@@ -197,12 +197,12 @@ func testAccDataSourceSdwanCiscoVPNFeatureTemplateConfig() string {
 	config += `	ipv4_static_gre_routes = [{` + "\n"
 	config += `	  prefix = "3.3.3.0/24"` + "\n"
 	config += `	  vpn_id = 2` + "\n"
-	config += `	  interface = ["e1"]` + "\n"
+	config += `	  interfaces = ["e1"]` + "\n"
 	config += `	}]` + "\n"
 	config += `	ipv4_static_ipsec_routes = [{` + "\n"
 	config += `	  prefix = "4.4.4.0/24"` + "\n"
 	config += `	  vpn_id = 2` + "\n"
-	config += `	  interface = ["e1"]` + "\n"
+	config += `	  interfaces = ["e1"]` + "\n"
 	config += `	}]` + "\n"
 	config += `	omp_advertise_ipv4_routes = [{` + "\n"
 	config += `	  protocol = "bgp"` + "\n"
diff --git a/internal/provider/data_source_sdwan_service_route_policy_feature.go b/internal/provider/data_source_sdwan_service_route_policy_feature.go
@@ -177,7 +177,7 @@ func (d *ServiceRoutePolicyProfileParcelDataSource) Schema(ctx context.Context,
 							Computed:            true,
 							NestedObject: schema.NestedAttributeObject{
 								Attributes: map[string]schema.Attribute{
-									"as_path_prepend": schema.SetAttribute{
+									"as_path_prepend": schema.ListAttribute{
 										MarkdownDescription: "",
 										ElementType:         types.Int64Type,
 										Computed:            true,
diff --git a/internal/provider/data_source_sdwan_transport_route_policy_feature.go b/internal/provider/data_source_sdwan_transport_route_policy_feature.go
@@ -177,7 +177,7 @@ func (d *TransportRoutePolicyProfileParcelDataSource) Schema(ctx context.Context
 							Computed:            true,
 							NestedObject: schema.NestedAttributeObject{
 								Attributes: map[string]schema.Attribute{
-									"as_path_prepend": schema.SetAttribute{
+									"as_path_prepend": schema.ListAttribute{
 										MarkdownDescription: "",
 										ElementType:         types.Int64Type,
 										Computed:            true,
diff --git a/internal/provider/model_sdwan_cisco_vpn_feature_template.go b/internal/provider/model_sdwan_cisco_vpn_feature_template.go
diff --git a/internal/provider/model_sdwan_service_route_policy_feature.go b/internal/provider/model_sdwan_service_route_policy_feature.go
diff --git a/internal/provider/model_sdwan_transport_route_policy_feature.go b/internal/provider/model_sdwan_transport_route_policy_feature.go
diff --git a/internal/provider/resource_sdwan_cisco_vpn_feature_template.go b/internal/provider/resource_sdwan_cisco_vpn_feature_template.go
diff --git a/internal/provider/resource_sdwan_cisco_vpn_feature_template_test.go b/internal/provider/resource_sdwan_cisco_vpn_feature_template_test.go
diff --git a/internal/provider/resource_sdwan_service_route_policy_feature.go b/internal/provider/resource_sdwan_service_route_policy_feature.go
diff --git a/internal/provider/resource_sdwan_transport_route_policy_feature.go b/internal/provider/resource_sdwan_transport_route_policy_feature.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl

Original file line number	Diff line number	Diff line change
`@@ -97,16 +97,16 @@ resource "sdwan_cisco_vpn_feature_template" "example" {`
`97`	`97`	`]`
`98`	`98`	`ipv4_static_gre_routes = [`
`99`	`99`	`{`
`100`		`- prefix = "3.3.3.0/24"`
`101`		`- vpn_id = 2`
`102`		`- interface = ["e1"]`
	`100`	`+ prefix = "3.3.3.0/24"`
	`101`	`+ vpn_id = 2`
	`102`	`+ interfaces = ["e1"]`
`103`	`103`	`}`
`104`	`104`	`]`
`105`	`105`	`ipv4_static_ipsec_routes = [`
`106`	`106`	`{`
`107`		`- prefix = "4.4.4.0/24"`
`108`		`- vpn_id = 2`
`109`		`- interface = ["e1"]`
	`107`	`+ prefix = "4.4.4.0/24"`
	`108`	`+ vpn_id = 2`
	`109`	`+ interfaces = ["e1"]`
`110`	`110`	`}`
`111`	`111`	`]`
`112`	`112`	`omp_advertise_ipv4_routes = [`
`@@ -328,8 +328,8 @@ Optional:`
`328`	`328`
`329`	`329`	`Optional:`
`330`	`330`
`331`		-- `interface` (Set of String) List of GRE Interfaces
`332`		-- `interface_variable` (String) Variable name
	`331`	+- `interfaces` (List of String) List of GRE Interfaces
	`332`	+- `interfaces_variable` (String) Variable name
`333`	`333`	- `optional` (Boolean) Indicates if list item is considered optional.
`334`	`334`	- `prefix` (String) Prefix
`335`	`335`	- `prefix_variable` (String) Variable name
`@@ -342,8 +342,8 @@ Optional:`
`342`	`342`
`343`	`343`	`Optional:`
`344`	`344`
`345`		-- `interface` (Set of String) List of IPSEC Interfaces (Separated by commas)
`346`		-- `interface_variable` (String) Variable name
	`345`	+- `interfaces` (List of String) List of IPSEC Interfaces (Separated by commas)
	`346`	+- `interfaces_variable` (String) Variable name
`347`	`347`	- `optional` (Boolean) Indicates if list item is considered optional.
`348`	`348`	- `prefix` (String) Prefix
`349`	`349`	- `prefix_variable` (String) Variable name
Original file line number	Diff line number	Diff line change
`@@ -80,16 +80,16 @@ resource "sdwan_cisco_vpn_feature_template" "example" {`
`80`	`80`	`]`
`81`	`81`	`ipv4_static_gre_routes = [`
`82`	`82`	`{`
`83`		`- prefix = "3.3.3.0/24"`
`84`		`- vpn_id = 2`
`85`		`- interface = ["e1"]`
	`83`	`+ prefix = "3.3.3.0/24"`
	`84`	`+ vpn_id = 2`
	`85`	`+ interfaces = ["e1"]`
`86`	`86`	`}`
`87`	`87`	`]`
`88`	`88`	`ipv4_static_ipsec_routes = [`
`89`	`89`	`{`
`90`		`- prefix = "4.4.4.0/24"`
`91`		`- vpn_id = 2`
`92`		`- interface = ["e1"]`
	`90`	`+ prefix = "4.4.4.0/24"`
	`91`	`+ vpn_id = 2`
	`92`	`+ interfaces = ["e1"]`
`93`	`93`	`}`
`94`	`94`	`]`
`95`	`95`	`omp_advertise_ipv4_routes = [`