isar 1.34.1__tar.gz → 1.34.3__tar.gz

isar-1.34.3/.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.1 → isar-1.34.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.34.1
+Version: 1.34.3
 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.1 → isar-1.34.3}/src/isar/robot/robot_monitor_mission.py

@@ -324,6 +324,7 @@ class RobotMonitorMissionThread(Thread):
                     )
                     break
                 except Exception:
+                    self.logger.exception("Failed to collect task status")
                     break
 
                 if current_task.status != new_task_status:
@@ -351,7 +352,13 @@ 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)
+                self.logger.exception("Failed to collect mission status")
+                self.robot_service_events.mission_failed.trigger_event(
+                    ErrorMessage(
+                        error_reason=e.error_reason,
+                        error_description=e.error_description,
+                    )
+                )
                 break
             if new_mission_status != last_mission_status:
                 self.current_mission.status = new_mission_status

{isar-1.34.1 → isar-1.34.3}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.34.1
+Version: 1.34.3
 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.1 → isar-1.34.3}/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