isar 1.34.0__tar.gz → 1.34.2__tar.gz

isar-1.34.2/.github/workflows/trivy-config.yml

@@ -0,0 +1,43 @@
+# from https://github.com/equinor/appsec-ghas-examples/blob/main/.github/workflows/trivy-config.yml
+name: Trivy IaC & Dockerfile Scanning
+permissions: {}
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '36 0 * * 3'
+
+jobs:
+  trivy-scan:
+    name: Scan on Main with Trivy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      security-events: write 
+
+      contents: read
+      actions: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+
+      - name: Run Trivy vulnerability Scanner
+        uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
+        with:
+          scan-type: 'config'
+          severity: 'CRITICAL,HIGH'
+          limit-severities-for-sarif: true 
+          format: 'sarif'
+          output: 'trivy-results-iac.sarif'
+          exit-code: '0'
+
+      - name: Upload scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: 'trivy-results-iac.sarif'
+

{isar-1.34.0 → isar-1.34.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.34.0
+Version: 1.34.2
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0

{isar-1.34.0 → isar-1.34.2}/src/isar/robot/robot_monitor_mission.py

@@ -350,8 +350,8 @@ class RobotMonitorMissionThread(Thread):
 
             try:
                 new_mission_status = self._get_mission_status(self.current_mission.id)
-            except RobotMissionStatusException as e:
-                self.logger.error("Failed to collect mission status", e)
+            except RobotMissionStatusException:
+                self.logger.exception("Failed to collect mission status")
                 break
             if new_mission_status != last_mission_status:
                 self.current_mission.status = new_mission_status

{isar-1.34.0 → isar-1.34.2}/src/isar/state_machine/transitions/functions/robot_status.py

@@ -11,6 +11,11 @@ def is_offline(state_machine: "StateMachine") -> bool:
     return robot_status == RobotStatus.Offline
 
 
+def is_available(state_machine: "StateMachine") -> bool:
+    robot_status = state_machine.shared_state.robot_status.check()
+    return robot_status == RobotStatus.Available
+
+
 def is_available_or_home(state_machine: "StateMachine") -> bool:
     robot_status = state_machine.shared_state.robot_status.check()
     return robot_status == RobotStatus.Available or robot_status == RobotStatus.Home

{isar-1.34.0 → isar-1.34.2}/src/isar/state_machine/transitions/robot_status.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING, List
 
 from isar.state_machine.transitions.functions.robot_status import (
+    is_available,
     is_available_or_home,
     is_blocked_protective_stop,
     is_offline,
@@ -13,6 +14,14 @@ if TYPE_CHECKING:
 
 def get_robot_status_transitions(state_machine: "StateMachine") -> List[dict]:
     robot_status_transitions: List[dict] = [
+        {
+            "trigger": "robot_status_changed",
+            "source": [
+                state_machine.unknown_status_state,
+            ],
+            "dest": state_machine.await_next_mission_state,
+            "conditions": def_transition(state_machine, is_available),
+        },
         {
             "trigger": "robot_status_changed",
             "source": [

{isar-1.34.0 → isar-1.34.2}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.34.0
+Version: 1.34.2
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0

{isar-1.34.0 → isar-1.34.2}/src/isar.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ requirements.txt
 .github/workflows/pythonpackage.yml
 .github/workflows/pythonpublish.yml
 .github/workflows/stale.yml
+.github/workflows/trivy-config.yml
 docs/Makefile
 docs/full_state_machine_diagram.png
 docs/make.bat

{isar-1.34.0 → isar-1.34.2}/tests/isar/state_machine/test_state_machine.py

@@ -128,7 +128,7 @@ def test_state_machine_transitions_when_running_full_mission(
     assert state_machine_thread.state_machine.transitions_list == deque(
         [
             States.UnknownStatus,
-            States.Home,
+            States.AwaitNextMission,
             States.Monitor,
             States.AwaitNextMission,
             States.ReturningHome,
@@ -341,7 +341,7 @@ def test_state_machine_failed_dependency(
     assert state_machine_thread.state_machine.transitions_list == deque(
         [
             States.UnknownStatus,
-            States.Home,
+            States.AwaitNextMission,
             States.Monitor,
             States.AwaitNextMission,
             States.ReturningHome,
@@ -523,7 +523,7 @@ def test_state_machine_with_unsuccessful_mission_stop_with_mission_id(
     assert state_machine_thread.state_machine.transitions_list == deque(
         [
             States.UnknownStatus,
-            States.Home,
+            States.AwaitNextMission,
             States.Monitor,
         ]
     )
@@ -559,7 +559,7 @@ def test_state_machine_with_unsuccessful_mission_stop(
     assert state_machine_thread.state_machine.transitions_list == deque(
         [
             States.UnknownStatus,
-            States.Home,
+            States.AwaitNextMission,
             States.Monitor,
             States.Stopping,
             States.Monitor,