r/firewall_filter: allow use protocol, protocol_except arguments

in from block in term block when family is set to ethernet-switching Fix #577
jeremmfr · Nov 16, 2023 · e83ba7d · e83ba7d
1 parent aafa5f9
commit e83ba7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 <!-- markdownlint-disable-file MD013 MD041 -->
 # changelog
 
+BUG FIXES:
+
+* **resource/junos_firewall_filter**: allow use `protocol` and `protocol_except` arguments in `from` block in `term` block when `family` is set to `ethernet-switching` (Fix [#577](https://github.com/jeremmfr/terraform-provider-junos/issues/577))
+
 ## v2.3.1 (November 10, 2023)
 
 BUG FIXES:

diff --git a/internal/providerfwk/resource_firewall_filter.go b/internal/providerfwk/resource_firewall_filter.go
@@ -1481,7 +1481,7 @@ func (block *firewallFilterBlockTermBlockFromConfig) validateWithFamily(
 		)
 	}
 	if !block.Protocol.IsNull() && !bchk.InSlice(family, []string{
-		junos.InetW,
+		junos.InetW, "ethernet-switching",
 	}) {
 		resp.Diagnostics.AddAttributeError(
 			pathRoot.AtName("protocol"),
@@ -1490,7 +1490,7 @@ func (block *firewallFilterBlockTermBlockFromConfig) validateWithFamily(
 		)
 	}
 	if !block.ProtocolExcept.IsNull() && !bchk.InSlice(family, []string{
-		junos.InetW,
+		junos.InetW, "ethernet-switching",
 	}) {
 		resp.Diagnostics.AddAttributeError(
 			pathRoot.AtName("protocol_except"),