Resolve Concelier/Excititor merge conflicts

docs/events/attestor.logged@1.json

@@ -0,0 +1,38 @@
+{
+  "$id": "https://stella-ops.org/schemas/events/attestor.logged@1.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": ["eventId", "kind", "tenant", "ts", "payload"],
+  "properties": {
+    "eventId": {"type": "string", "format": "uuid"},
+    "kind": {"const": "attestor.logged"},
+    "tenant": {"type": "string"},
+    "ts": {"type": "string", "format": "date-time"},
+    "payload": {
+      "type": "object",
+      "required": ["artifactSha256", "rekor", "subject"],
+      "properties": {
+        "artifactSha256": {"type": "string"},
+        "rekor": {
+          "type": "object",
+          "required": ["uuid", "url"],
+          "properties": {
+            "uuid": {"type": "string"},
+            "url": {"type": "string", "format": "uri"},
+            "index": {"type": "integer", "minimum": 0}
+          }
+        },
+        "subject": {
+          "type": "object",
+          "required": ["type", "name"],
+          "properties": {
+            "type": {"enum": ["sbom", "report", "vex-export"]},
+            "name": {"type": "string"}
+          }
+        }
+      },
+      "additionalProperties": true
+    }
+  },
+  "additionalProperties": false
+}