Merge pull request #3382 from CactuseSecurity/develop

main v8.8.5 merge from develop

Author: tpurschke

.github/workflows/auto-sync-develop-to-importer-rework.yml.yml

@@ -0,0 +1,74 @@
+name: Sync develop to importer-rework
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  sync-branches:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Ensure "automation" label exists (create or update)
+        run: |
+            gh label create automation \
+            --color "0e8a16" \
+            --description "Automatically created for syncing branches" \
+            --force
+        env:
+            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch all branches
+        run: git fetch origin importer-rework
+
+      - name: Check if develop is ahead of importer-rework
+        id: ahead_check
+        run: |
+          git fetch origin
+          git rev-list --left-right --count origin/importer-rework...origin/develop > counts.txt
+          ahead=$(cut -f2 counts.txt)
+          echo "ahead_count=$ahead" >> $GITHUB_OUTPUT
+
+      - name: Check for existing PR
+        id: pr_check
+        run: |
+          existing_pr=$(gh pr list \
+            --base importer-rework \
+            --head develop \
+            --state open \
+            --json number \
+            --jq '.[0].number')
+
+          echo "existing_pr=$existing_pr" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create PR from develop to importer-rework
+        if: steps.ahead_check.outputs.ahead_count != '0' && steps.pr_check.outputs.existing_pr == ''
+        run: |
+          gh pr create \
+            --base importer-rework \
+            --head develop \
+            --title "Sync develop → importer-rework" \
+            --body "This PR was auto-created to sync changes from \`develop\` into \`importer-rework\`." \
+            --label automation \
+            --repo ${{ github.repository }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # OPTIONAL: Automatically merge the PR if all checks pass
+      # - name: Auto-merge PR
+      #   if: steps.pr_check.outputs.existing_pr != ''
+      #   run: |
+      #     gh pr merge "${{ steps.pr_check.outputs.existing_pr }}" --merge --admin
+      #   env:
+      #     GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,3 +3,5 @@
 .test_data/
 roles/importer/venv/
 ansible_venv/
+
+.vscode/launch.json

documentation/revision-history-develop.md

@@ -273,3 +273,7 @@ bugfix release:
 
 # 8.8.4 - 02.06.2025 DEVELOP
 - hotfix for Check Point importer suppor for DLP actions (ask, inform)
+
+# 8.8.5 - 17.06.2025 DEVELOP
+- new enum values for Request Element Field Types
+- hotfix change recognition: separate rule changes and "all changes" to make object version handling work properly

inventory/group_vars/all.yml

@@ -1,5 +1,5 @@
 ### general settings
-product_version: "8.8.4"
+product_version: "8.8.5"
 ansible_user: "{{ lookup('env', 'USER') }}"
 ansible_become_method: sudo
 ansible_python_interpreter: /usr/bin/python3

inventory/group_vars/apiserver.yml

@@ -8,7 +8,7 @@ api_hasura_admin_test_password: "not4production"
 api_user_email: "{{ api_user }}@{{ api_network_listening_ip_address }}"
 api_home: "{{ fworch_home }}/api"
 api_hasura_cli_bin: "{{ fworch_home }}/api/bin/hasura"
-api_hasura_version: "v2.45.2"
+api_hasura_version: "v2.48.1"
 api_project_name: api
 api_no_metadata: false
 api_rollback_is_running: false

roles/FWO.sln

@@ -37,12 +37,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Encryption", "lib\files
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Basics", "lib\files\FWO.Basics\FWO.Basics.csproj", "{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Tufin.SecureChange", "lib\files\FWO.Tufin.SecureChange\FWO.Tufin.SecureChange.csproj", "{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Services", "lib\files\FWO.Services\FWO.Services.csproj", "{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.Data", "lib\files\FWO.Data\FWO.Data.csproj", "{9E80E931-7350-1356-D96D-34F3EDA6ABFB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FWO.ExternalSystems", "lib\files\FWO.ExternalSystems\FWO.ExternalSystems.csproj", "{072AE48C-2B5E-49A6-81AF-32F6C941655D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,10 +109,6 @@ Global
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56021BEC-39E5-4EC7-B3DB-80834B57B2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,6 +117,10 @@ Global
 		{9E80E931-7350-1356-D96D-34F3EDA6ABFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E80E931-7350-1356-D96D-34F3EDA6ABFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E80E931-7350-1356-D96D-34F3EDA6ABFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{072AE48C-2B5E-49A6-81AF-32F6C941655D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{072AE48C-2B5E-49A6-81AF-32F6C941655D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{072AE48C-2B5E-49A6-81AF-32F6C941655D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{072AE48C-2B5E-49A6-81AF-32F6C941655D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,8 +139,8 @@ Global
 		{B48F8BD5-1056-4670-BEFA-F4A260293B6F} = {CE55F125-0CD2-4789-A3C1-045DEF33ABA5}
 		{6EBEBF57-3399-4008-BA10-0D21F6827244} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 		{0CBD4CC5-3E39-4134-A0E1-4DB8999619F3} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
-		{17AA0E0C-BB46-42FE-A08C-68539EA7FD53} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 		{9E80E931-7350-1356-D96D-34F3EDA6ABFB} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
+		{072AE48C-2B5E-49A6-81AF-32F6C941655D} = {B48F8BD5-1056-4670-BEFA-F4A260293B6F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68364621-1011-4D44-9CF5-518F0DC3F459}