Skip to content

Commit a0b1db3

Browse files
tpurschketpurschke
authored
Merge pull request CactuseSecurity#4042 from CactuseSecurity/develop
Main v8.9.5
2 parents 169d448 + f8c5a4a commit a0b1db3

File tree

48 files changed

+1918
-1253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1918
-1253
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
roles/importer/venv/
55
ansible_venv/
66
**/.venv/
7-
7+
**/__pycache__/
8+
**/*.pyc
89
.vscode/launch.json

‎.vscode/settings.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,13 @@
1010
"files.associations": {
1111
"launch.template.json": "jsonc"
1212
},
13-
}
13+
"python.testing.unittestEnabled": true,
14+
"python.testing.pytestEnabled": false,
15+
"python.testing.unittestArgs": [
16+
"-v",
17+
"-s",
18+
"scripts/customizing/app_data_import",
19+
"-p",
20+
"test_*.py"
21+
]
22+
}

‎documentation/revision-history-develop.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,10 @@ bugfix release:
304304

305305
# 8.9.3 - 05.11.2025 DEVELOP
306306
- hotfix missing permissions for app data import in certain constellations
307+
308+
## 8.9.4 - 09.12.2025 DEVELOP
309+
- bugfix release: common service connection not editable
310+
- new custom scripts for iiq and cmdb import
311+
312+
## 8.9.5 - 10.12.2025 DEVELOP
313+
- bugfix release: modelling - change planning showed duplicate NA elements for rule delete requests

‎documentation/revision-history-main.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,3 +562,7 @@ hotfix release
562562

563563
# 8.9.3 - 05.11.2025 MAIN
564564
- hotfix missing permissions for app data import in certain constellations
565+
566+
## 8.9.4 - 09.12.2025 DEVELOP
567+
- bugfix release: common service connection not editable
568+
- new custom scripts for iiq and cmdb import

‎inventory/group_vars/all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### general settings
2-
product_version: "8.9.3"
2+
product_version: "8.9.5"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
##
44
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55
**/.venv/
6+
**/__pycache__/
7+
**/*.pyc
68
# User-specific files
79
*.rsuser
810
*.suo

‎roles/database/files/sql/idempotent/fworch-texts.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ INSERT INTO txt VALUES ('AllOwnerResponsibles', 'German', 'Eigentümer alle
233233
INSERT INTO txt VALUES ('AllOwnerResponsibles', 'English', 'Owner all responsibles');
234234
INSERT INTO txt VALUES ('OwnerGroupOnly', 'German', 'nur Eigentümergruppe');
235235
INSERT INTO txt VALUES ('OwnerGroupOnly', 'English', 'Owner Group only');
236-
INSERT INTO txt VALUES ('FallbackToMainResponsibleIfOwnerGroupEmpty', 'German', 'Hauptverantworlicher wenn Eigentümergruppe nicht spezifiziert');
237-
INSERT INTO txt VALUES ('FallbackToMainResponsibleIfOwnerGroupEmpty', 'English', 'Owner Main Responsible if Owner Group not specified');
236+
INSERT INTO txt VALUES ('FallbackToMainResponsibleIfOwnerGroupEmpty', 'German', 'Hauptverantworlicher wenn Eigentümergruppe nicht spezifiziert oder leer');
237+
INSERT INTO txt VALUES ('FallbackToMainResponsibleIfOwnerGroupEmpty', 'English', 'Owner Main Responsible if Owner Group not specified or empty');
238238
INSERT INTO txt VALUES ('Requester', 'German', 'Antragsteller');
239239
INSERT INTO txt VALUES ('Requester', 'English', 'Requester');
240240
INSERT INTO txt VALUES ('Approver', 'German', 'Genehmiger');

‎roles/lib/files/FWO.Api.Client/FWO.Api.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="IPAddressRange" Version="6.2.0" />
10+
<PackageReference Include="IPAddressRange" Version="6.3.0" />
1111
<PackageReference Include="GraphQL.Client" Version="6.1.0" />
1212
<PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="6.1.0" />
1313
<PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.15" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.22" />
1515
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
1616
<PackageReference Include="RestSharp" Version="112.1.0" />
1717
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="112.1.0" />

‎roles/lib/files/FWO.Basics/FWO.Basics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="DnsClient" Version="1.8.0" />
11-
<PackageReference Include="IPAddressRange" Version="6.2.0" />
11+
<PackageReference Include="IPAddressRange" Version="6.3.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎roles/lib/files/FWO.Data/FWO.Data.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="6.1.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.15" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.22" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)