Merge pull request #2351 from CactuseSecurity/develop

Main v8.0
CactuseSecurity · Feb 20, 2024 · 6680851 · 6680851
2 parents 4ace328 + ae07e52
commit 6680851
Show file tree

Hide file tree

Showing 419 changed files with 21,053 additions and 4,814 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .idea/
 .test_data/
 roles/importer/venv/
+ansible_venv/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -46,21 +46,48 @@
                 "moduleLoad": false
             }
         },
+        {
+            "name": "py-normalizeRlmOwners",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/scripts/customizing/modelling/getOwnersFromTufinRlm.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+            },
+            "args": [
+                "-c${workspaceFolder}/scripts/customizing/modelling/customizingConfig.json"
+            ]
+        },
+        {
+            "name": "py-normalizeNwData",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/scripts/customizing/modelling/convertNwObjDataExample.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+            },
+            "args": [
+                "-c${workspaceFolder}/scripts/customizing/modelling/customizingConfig.json"
+            ]
+        },
         {
             "name": "py-import-mgm",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/import-mgm.py",
             "console": "integratedTerminal",
             "env": {
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m15",
-                "-d8",
+                "-m7",
+                "-d1",
                 "-f",
                 "-s",
-                //"-c"
+                //"-l66",
+                // "-c"
                 //"-l250"
                 //  41 - lab fortimanager
                 //"-nhttps://fwodemodata.cactus.de/demo07_dummyGw1.json"
@@ -70,9 +97,20 @@
                 //"-ihttps://fwodemodata.cactus.de/big/xxx.json",
             ]
         },
+        {
+            "name": "py-write-config",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/scripts/customizing/sample-config-change.py",
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
+            },
+            "args": []
+        },
         {
             "name": "py-acquire-lock",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/common/files/acquire_lock.py",
             "console": "integratedTerminal",
@@ -85,7 +123,7 @@
         },
         {
             "name": "py-generate-tenant-data",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/test/files/tenant_networks/create_tenant_network_data.py",
             "console": "integratedTerminal",
@@ -96,7 +134,7 @@
         },
         {
             "name": "py-change-comment",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/sample-data/files/config_changes/write_date_to_comment.py",
             "console": "integratedTerminal",
@@ -107,7 +145,7 @@
         },
         {
             "name": "py-change-rule",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/sample-data/files/config_changes/enlarge_rule.py",
             "console": "integratedTerminal",
@@ -118,7 +156,7 @@
         },
         {
             "name": "py-cpr8x-get-config",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/get_config.py",
             "console": "integratedTerminal",
@@ -136,7 +174,7 @@
         },
         {
             "name": "py-cpr8x-enrich-config",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/enrich_config.py",
             "console": "integratedTerminal",
@@ -153,7 +191,7 @@
         },
         {
             "name": "py-cpr8x-parse-config",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/parse_config.py",
             "console": "integratedTerminal",
@@ -167,7 +205,7 @@
         },
         {
             "name": "py-cpr8x-api-test-call",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/api-test-call.py",
             "console": "integratedTerminal",
@@ -180,7 +218,7 @@
         },
         {
             "name": "py-get-config-fm7",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/fortimanager5ff/get_config.py",
             "console": "integratedTerminal",
@@ -198,7 +236,7 @@
         },
         {
             "name": "py-export-itsecorg",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/api/files/scripts/fwo-export-itsecorg-devices.py",
             "console": "integratedTerminal",
@@ -215,7 +253,7 @@
         },
         {
             "name": "py-export-config",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/api/files/scripts/fwo-export-config.py",
             "console": "integratedTerminal",
@@ -228,7 +266,7 @@
         },
         {
             "name": "py-execute-graphql",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/api/files/scripts/fwo-execute-graphql.py",
             "console": "integratedTerminal",
@@ -241,7 +279,7 @@
         },
         {
             "name": "py-execute-graphql-query",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/api/files/scripts/fwo-execute-graphql-query.py",
             "console": "integratedTerminal",
@@ -254,7 +292,7 @@
         },
         {
             "name": "py-cpr8x-autodiscovery",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/checkpointR8x/auto-discover.py",
             "console": "integratedTerminal",
@@ -272,7 +310,7 @@
         },
         {
             "name": "py-import-main-loop",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/roles/importer/files/importer/import-main-loop.py",
             "console": "integratedTerminal",

diff --git a/ansible.cfg b/ansible.cfg
@@ -1,7 +1,8 @@
 # ansible.cfg
 [defaults]
 inventory = inventory
-#timeout = 60
+# interpreter_python = ~/.local/bin/ansible
+# timeout = 60
 force_handlers = True
 stdout_callback = yaml