Skip to content

Commit 5e61348

Browse files
Y4nnikHY4nnikH
committed
Merge remote-tracking branch 'CactuseSecurity/develop' into feat/test-ui-rsb
2 parents 274f628 + 722abe9 commit 5e61348

34 files changed

+186
-119
lines changed

‎.github/workflows/test-install.yml‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11

22
name: Build
33

4-
# Controls when the action will run. Triggers the workflow on push or pull request
5-
# events but only for the master branch
6-
# test change
7-
84
on:
95
push:
106
branches: [ main, develop ]
@@ -19,33 +15,17 @@ on:
1915
- 'documentation/**'
2016
- 'design/**'
2117

22-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2318
jobs:
24-
# # ubuntu18 was unstable at github (2022-07-06 - 2022-07-11)
25-
# # does not seem to be supported by hithub anymore (2024-05-01)
26-
27-
# test_ubuntu_20:
28-
# name: test build on ubuntu_20
29-
# runs-on: ubuntu-20.04
30-
# steps:
31-
# - uses: actions/checkout@v3
32-
# - name: do test install in case of merged pull request
33-
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
34-
35-
# test_ubuntu_22:
36-
# name: test build on ubuntu_22
37-
# runs-on: ubuntu-22.04
38-
# steps:
39-
# - uses: actions/checkout@v3
40-
# - name: do test install in case of merged pull request
41-
# run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
42-
4319
test_ubuntu_latest:
4420
name: test build on ubuntu latest
4521
runs-on: ubuntu-latest
4622
steps:
4723
- uses: actions/checkout@v3
4824

25+
- name: Set environment variable
26+
run: echo "RUNNING_ON_GITHUB=1" >> $GITHUB_ENV
27+
4928
- name: do test install in case of merged pull request
5029
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
51-
30+
env:
31+
RUNNING_ON_GITHUB_ACTIONS: ${{ env.RUNNING_ON_GITHUB }}

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"name": "py-generate-tenant-data",
146146
"type": "debugpy",
147147
"request": "launch",
148-
"program": "${workspaceFolder}/roles/test/files/tenant_networks/create_tenant_network_data.py",
148+
"program": "${workspaceFolder}/roles/tests-unit/files/tenant_networks/create_tenant_network_data.py",
149149
"console": "integratedTerminal",
150150
"env": {
151151
"PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
@@ -352,7 +352,7 @@
352352
"args": [
353353
"test"
354354
],
355-
"cwd": "${workspaceFolder}/roles/test/files/FWO.Test",
355+
"cwd": "${workspaceFolder}/roles/tests-unit/files/FWO.Test",
356356
"stopAtEntry": false,
357357
"console": "integratedTerminal"
358358
},

‎documentation/revision-history-main.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,7 @@ Fixes network modelling
475475
- UI interface search pop-up transformed into filterable table
476476

477477
Upgrade Hasura API to v2.45.1
478+
479+
# 8.6.2 03.01.2025 MAIN
480+
Hotfix for network modelling:
481+
- fix: when visiting the library for the second time, app servers were missing due to uninitialized area data.

‎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.6.1"
2+
product_version: "8.6.2"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/FWO.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{CE55F125-0CD
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Middleware.Client", "lib\files\FWO.Middleware.Client\FWO.Middleware.Client.csproj", "{ECB165CE-BE81-4C5C-B27A-D73177D73E28}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "test\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Test", "tests-unit\files\FWO.Test\FWO.Test.csproj", "{9C66B86B-FFB2-44A9-A944-54B33D31D413}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FWO.Report", "lib\files\FWO.Report\FWO.Report.csproj", "{84CA4892-7C35-4F1F-AF25-2A379112DFCA}"
1313
EndProject

‎roles/api/tasks/main.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@
88
- api handler
99
when: installation_mode == "upgrade"
1010

11+
- name: stop MW for upgrading
12+
ansible.builtin.systemd:
13+
name: "{{ product_name }}-middleware"
14+
state: stopped
15+
become: true
16+
when: "'middlewareserver' in group_names and installation_mode == 'upgrade'"
17+
18+
- name: stop UI for upgrading
19+
ansible.builtin.systemd:
20+
name: "{{ product_name }}-ui"
21+
state: stopped
22+
become: true
23+
when: "'frontends' in group_names and installation_mode == 'upgrade'"
24+
1125
- name: check for api dir
1226
stat:
1327
path: "{{ fworch_home }}/api"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,6 +2255,8 @@ INSERT INTO txt VALUES ('allowServiceInConn', 'German', 'Einfache Dienste in
22552255
INSERT INTO txt VALUES ('allowServiceInConn', 'English', 'Allow Simple Services in Connection');
22562256
INSERT INTO txt VALUES ('overviewDisplayLines', 'German', 'Max. Anzahl Zeilen in Übersicht');
22572257
INSERT INTO txt VALUES ('overviewDisplayLines', 'English', 'Max. Number of Rows in Overview');
2258+
INSERT INTO txt VALUES ('maxModellingTableRows', 'German', 'Max. Anzahl Zeilen in Tabellen');
2259+
INSERT INTO txt VALUES ('maxModellingTableRows', 'English', 'Max. Number of Rows in Tables');
22582260
INSERT INTO txt VALUES ('reducedProtocolSet', 'German', 'Reduzierten Protokollset darstellen');
22592261
INSERT INTO txt VALUES ('reducedProtocolSet', 'English', 'Display reduced Protocol set');
22602262
INSERT INTO txt VALUES ('importAppDataPath', 'German', 'Pfad und Name von Appdaten-Import (ohne Endung)');

‎roles/docker/tasks/main.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
lineinfile:
2626
path: "/etc/apt/sources.list.d/docker.list"
2727
create: true
28-
line: "deb [arch=amd64] https://download.docker.com/linux/debian buster stable"
28+
regexp: 'download.docker.com'
29+
line: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_lsb.codename | lower }} stable"
2930

3031
- name: apt update
3132
apt: update_cache=true

‎roles/finalize/tasks/main.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,18 @@
130130
name: "{{ webserver_package_name }}"
131131
state: restarted
132132
become: true
133+
134+
- name: finally restart MW
135+
ansible.builtin.systemd:
136+
name: "{{ product_name }}-middleware"
137+
state: restarted
138+
become: true
139+
when: "'middlewareserver' in group_names"
140+
141+
# TODO - find out why UI sometimes crashes during upgrade of heavy data installations
142+
- name: finally restart UI
143+
ansible.builtin.systemd:
144+
name: "{{ product_name }}-ui"
145+
state: restarted
146+
become: true
147+
when: "'frontends' in group_names"

‎roles/lib/files/FWO.Api.Client/APIConnection.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public abstract GraphQlApiSubscription<SubscriptionResponseType> GetSubscription
2929
GraphQlApiSubscription<SubscriptionResponseType>.SubscriptionUpdate subscriptionUpdateHandler, string subscription, object? variables = null, string? operationName = null);
3030

3131
protected abstract void Dispose(bool disposing);
32+
public abstract void DisposeSubscriptions<T>();
3233

3334
~ ApiConnection()
3435
{

0 commit comments

Comments
 (0)