Merge pull request #433 from jeremmfr/issue-430

security_policy: fix error reading config when there is permit suffix in application-services
jeremmfr · Oct 14, 2022 · 10b34c7 · 10b34c7
2 parents c932050 + 4a01c77
commit 10b34c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ ENHANCEMENTS:
 
 BUG FIXES:
 
+* resource/`junos_security_global_policy`: fix error reading config when an element of `permit_application_services` have the suffix `permit`, `deny` or `reject` (Fixes #430)
+* resource/`junos_security_policy`: fix error reading config when an element of `permit_application_services` have the suffix `permit`, `deny` or `reject`
+
 ## 1.31.0 (October 12, 2022)
 
 FEATURES:

diff --git a/junos/resource_security_global_policy.go b/junos/resource_security_global_policy.go
@@ -485,9 +485,9 @@ func readSecurityGlobalPolicy(clt *Client, junSess *junosSession) (globalPolicyO
 						itemTrimPolicy, "match source-end-user-profile "), "\"")
 				case strings.HasPrefix(itemTrimPolicy, "then "):
 					switch {
-					case strings.HasSuffix(itemTrimPolicy, permitW),
-						strings.HasSuffix(itemTrimPolicy, "deny"),
-						strings.HasSuffix(itemTrimPolicy, "reject"):
+					case itemTrimPolicy == "then permit",
+						itemTrimPolicy == "then deny",
+						itemTrimPolicy == "then reject":
 						policy["then"] = strings.TrimPrefix(itemTrimPolicy, "then ")
 					case itemTrimPolicy == "then count":
 						policy["count"] = true

diff --git a/junos/resource_security_policy.go b/junos/resource_security_policy.go
@@ -556,9 +556,9 @@ func readSecurityPolicy(fromZone, toZone string, clt *Client, junSess *junosSess
 						itemTrimPolicy, "match source-end-user-profile "), "\"")
 				case strings.HasPrefix(itemTrimPolicy, "then "):
 					switch {
-					case strings.HasSuffix(itemTrimPolicy, permitW),
-						strings.HasSuffix(itemTrimPolicy, "deny"),
-						strings.HasSuffix(itemTrimPolicy, "reject"):
+					case itemTrimPolicy == "then permit",
+						itemTrimPolicy == "then deny",
+						itemTrimPolicy == "then reject":
 						policy["then"] = strings.TrimPrefix(itemTrimPolicy, "then ")
 					case itemTrimPolicy == "then count":
 						policy["count"] = true