Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

Author: tpurschke

documentation/revision-history-develop.md

@@ -297,3 +297,7 @@ bugfix release:
 
 # 8.9.1 - 02.10.2025 DEVELOP
 - owner-recertification
+
+# 8.9.2 - 17.10.2025 DEVELOP
+- add ownerLifeCycleState 
+- add manageable ownerLifeCycleState menu

inventory/group_vars/all.yml

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

roles/api/files/replace_metadata.json

@@ -10485,6 +10485,12 @@
                 }
               ]
             },
+            {
+              "table": {
+                "name": "owner_lifecycle_state",
+                "schema": "public"
+              }
+            },
             {
               "table": {
                 "name": "owner_network",
@@ -26177,4 +26183,4 @@
       ]
     }
   }
-}
+}

roles/database/files/sql/creation/fworch-create-foreign-keys.sql

@@ -231,6 +231,7 @@ ALTER TABLE request.ticket ADD CONSTRAINT request_ticket_current_handler_foreign
 ALTER TABLE request.ticket ADD CONSTRAINT request_ticket_recent_handler_foreign_key FOREIGN KEY (recent_handler) REFERENCES uiuser(uiuser_id) ON UPDATE RESTRICT ON DELETE CASCADE;
 --- owner ---
 ALTER TABLE owner ADD CONSTRAINT owner_tenant_foreign_key FOREIGN KEY (tenant_id) REFERENCES tenant(tenant_id) ON UPDATE RESTRICT ON DELETE CASCADE;
+ALTER TABLE owner ADD CONSTRAINT owner_owner_lifecycle_state_foreign_key FOREIGN KEY (owner_lifecycle_state_id) REFERENCES owner_lifecycle_state(id) ON DELETE SET NULL;
 --- comment ---
 ALTER TABLE request.comment ADD CONSTRAINT request_comment_uiuser_foreign_key FOREIGN KEY (creator_id) REFERENCES uiuser(uiuser_id) ON UPDATE RESTRICT ON DELETE CASCADE;
 ALTER TABLE request.comment ADD CONSTRAINT request_comment_request_comment_foreign_key FOREIGN KEY (ref_id) REFERENCES request.comment(id) ON UPDATE RESTRICT ON DELETE CASCADE;

roles/database/files/sql/creation/fworch-create-tables.sql

@@ -1069,6 +1069,7 @@ create table owner
     last_recert_check Timestamp,
     recert_check_params Varchar,
 	criticality Varchar,
+	owner_lifecycle_state_id int,
 	active boolean default true,
 	import_source Varchar,
 	common_service_possible boolean default false,
@@ -1079,6 +1080,11 @@ create table owner
 	recert_active boolean default false
 );
 
+CREATE TABLE owner_lifecycle_state (
+    id SERIAL PRIMARY KEY,
+    name Varchar NOT NULL
+);
+
 create table owner_network
 (
     id BIGSERIAL PRIMARY KEY,

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

@@ -2098,6 +2098,8 @@ INSERT INTO txt VALUES ('write_user_pwd',       'German', 	'Passwort Schreibende
 INSERT INTO txt VALUES ('write_user_pwd',       'English', 	'Write User Password');
 INSERT INTO txt VALUES ('tenant',               'German', 	'Mandant');
 INSERT INTO txt VALUES ('tenant',               'English', 	'Tenant');
+INSERT INTO txt VALUES ('owner_lc_state',       'German', 	'Produktionsstatus');
+INSERT INTO txt VALUES ('owner_lc_state',       'English', 	'Production state');
 INSERT INTO txt VALUES ('global_tenant_name',   'German', 	'Globaler Mandantenname');
 INSERT INTO txt VALUES ('global_tenant_name',   'English', 	'Global Tenant Name');
 INSERT INTO txt VALUES ('pwMinLength',          'German', 	'Mindestlänge');
@@ -2402,6 +2404,16 @@ INSERT INTO txt VALUES ('assign_state_to',      'German',   'Status zuordnen zu:
 INSERT INTO txt VALUES ('assign_state_to',      'English',  'Assign state to: ');
 INSERT INTO txt VALUES ('select_action',        'German',   'Aktion auswählen');
 INSERT INTO txt VALUES ('select_action',        'English',  'Select action');
+INSERT INTO txt VALUES ('manage_owner_lc_state','German',   'Produktions-Lifecylce-Status ändern');
+INSERT INTO txt VALUES ('manage_owner_lc_state','English',  'Manage production lifecycle states');
+INSERT INTO txt VALUES ('add_owner_lc_state',   'German',   'Lifecycle Status hinzufügen');
+INSERT INTO txt VALUES ('add_owner_lc_state',   'English',  'Add Owner Lifecycle State');
+INSERT INTO txt VALUES ('owner_lc_states',      'German',   'Produktions-Status');
+INSERT INTO txt VALUES ('owner_lc_states',      'English',  'Production Lifecycle States');
+INSERT INTO txt VALUES ('edit_owner_lc_state',  'German',   'Lifecycle Status bearbeiten');
+INSERT INTO txt VALUES ('edit_owner_lc_state',  'English',  'Edit Owner Lifecycle State');
+INSERT INTO txt VALUES ('delete_owner_lc_state','German',   'Lifecycle Status löschen');
+INSERT INTO txt VALUES ('delete_owner_lc_state','English',  'Delete Owner Lifecycle State');
 INSERT INTO txt VALUES ('owners',               'German',   'Eigentümer');
 INSERT INTO txt VALUES ('owners',               'English',  'Owners');
 INSERT INTO txt VALUES ('add_owner',            'German',   'Eigentümer hinzufügen');
@@ -2987,6 +2999,8 @@ INSERT INTO txt VALUES ('U5217', 'German',  'Sind sie sicher, dass sie folgenden
 INSERT INTO txt VALUES ('U5217', 'English', 'Are you sure you want to delete owner: ');
 INSERT INTO txt VALUES ('U5218', 'German',  'Löscht alle Beispiel-Eigentümer (auf "_demo" endend)');
 INSERT INTO txt VALUES ('U5218', 'English', 'Deletes all sample owners (ending with "_demo")');
+INSERT INTO txt VALUES ('U5219', 'German',  'Sind sie sicher, dass sie folgenden Lifecycle Status löschen wollen: ');
+INSERT INTO txt VALUES ('U5219', 'English', 'Are you sure you want to delete Owner Lifecycle State: ');
 
 INSERT INTO txt VALUES ('U5301', 'German',  'Einstellungen geändert.');
 INSERT INTO txt VALUES ('U5301', 'English', 'Settings changed.');
@@ -3351,6 +3365,8 @@ INSERT INTO txt VALUES ('E5291', 'German',  'Eigentümer konnte nicht gespei
 INSERT INTO txt VALUES ('E5291', 'English', 'Owner could not be saved');
 INSERT INTO txt VALUES ('E5292', 'German',  'Dn oder Gruppe muss gefüllt sein');
 INSERT INTO txt VALUES ('E5292', 'English', 'Dn or group has to be filled');
+INSERT INTO txt VALUES ('E5293', 'German',  'Lifecycle Status konnte nicht gespeichert werden');
+INSERT INTO txt VALUES ('E5293', 'English', 'Owner Lifecycle State could not be saved');
 
 INSERT INTO txt VALUES ('E5301', 'German',  'Konfiguration konnte nicht gelesen oder verarbeitet werden.');
 INSERT INTO txt VALUES ('E5301', 'English', 'Error reading or processing Config.');
@@ -5706,6 +5722,12 @@ INSERT INTO txt VALUES ('H5662', 'English', 'Body of decommission emails: Text o
 ');
 INSERT INTO txt VALUES ('H5663', 'German',  'Alle Regeln modelliert erwarten: Alle dem Eigentümer zugeordneten Regeln müssen modelliert sein.');
 INSERT INTO txt VALUES ('H5663', 'English', 'Expect all rules as modelled: All rules associated to the owner have to be modelled.');
+INSERT INTO txt VALUES ('H5664', 'German',  'Produktionsstatus: Gibt an, in welchem Lifecycle Status sich der Eigentümer befindet.');
+INSERT INTO txt VALUES ('H5664', 'English', 'Production state: The Owner Lifecycle State assigned to the owner.');
+INSERT INTO txt VALUES ('H5665', 'German',  'Name: Name des Produktionsstatus');
+INSERT INTO txt VALUES ('H5665', 'English', 'Name: Owner Lifecycle State name');
+INSERT INTO txt VALUES ('H5666', 'German',  'In diesem Kapitel können die Produktions-Status von Eigentümern eingesehen, erstellt, bearbeitet und gelöscht werden. Produktions-Status definieren den aktuellen Zustand eines Eigentümers (z. B. Geplant, Im Betrieb, Auslaufend).');
+INSERT INTO txt VALUES ('H5666', 'English', 'In this chapter, Production Lifecycle States of owners can be viewed, created, edited, and deleted. Production Lifecycle States define the current status of an owner (e.g., Planned, In Production, End of Life).');
 
 INSERT INTO txt VALUES ('H5701', 'German',  'Die in der Datenbank hinterlegten sprachabhängigen Texte können individuell überschrieben werden.
     Dabei werden die vom System vorgegebenen Texte nicht geändert, sondern nur durch die hier definierten Texte - falls vorhanden - überblendet.

roles/database/files/upgrade/8.9.2.sql

@@ -0,0 +1,9 @@
+CREATE TABLE if not exists owner_lifecycle_state (
+    id SERIAL PRIMARY KEY,
+    name Varchar NOT NULL
+);
+
+alter table owner add column if not exists owner_lifecycle_state_id int;
+
+alter table owner drop constraint if exists owner_owner_lifecycle_state_foreign_key;
+ALTER TABLE owner ADD CONSTRAINT owner_owner_lifecycle_state_foreign_key FOREIGN KEY (owner_lifecycle_state_id)REFERENCES owner_lifecycle_state(id) ON DELETE SET NULL;

roles/lib/files/FWO.Api.Client/APIcalls/owner/deleteLifeCycle.graphql

@@ -0,0 +1,5 @@
+mutation deleteLifeCycle($id: Int!) {
+  delete_owner_lifecycle_state(where: {id: {_eq: $id}}) {
+    affected_rows
+  }
+}

roles/lib/files/FWO.Api.Client/APIcalls/owner/fragments/ownerDetails.graphql

@@ -10,6 +10,7 @@ fragment ownerDetails on owner {
   recert_check_params
   last_recert_check
   criticality
+  owner_lifecycle_state_id
   active
   import_source
   common_service_possible

roles/lib/files/FWO.Api.Client/APIcalls/owner/getOwnerLifeCycleStates.graphql

@@ -0,0 +1,6 @@
+query getOwnerLifeCycleStates {
+  owner_lifecycle_state (order_by: { name: asc }){
+    id
+    name
+  }
+}