Resolve Concelier/Excititor merge conflicts

2025-10-20 14:19:25 +03:00
parent 67d581d2e8 5fd4032c7c
commit 09b6a28172
2687 changed files with 212646 additions and 85913 deletions
--- a/docs/security/revocation-bundle-example.json
+++ b/docs/security/revocation-bundle-example.json
@@ -1,56 +1,56 @@
-{
-  "$schema": "../../etc/authority/revocation_bundle.schema.json",
-  "schemaVersion": "1.0.0",
-  "issuer": "https://auth.stella-ops.example",
-  "bundleId": "6f9d08bfa0c24a0a9f7f59e6c17d2f8e8bca2ef34215c3d3ba5a9a1f0fbe2d10",
-  "issuedAt": "2025-10-12T15:00:00Z",
-  "validFrom": "2025-10-12T15:00:00Z",
-  "sequence": 42,
-  "signingKeyId": "authority-signing-20251012",
-  "revocations": [
-    {
-      "id": "7ad4f3d2c21b461d9b3420e1151be9c4",
-      "category": "token",
-      "tokenType": "access_token",
-      "clientId": "feedser-cli",
-      "subjectId": "user:ops-admin",
-      "reason": "compromised",
-      "reasonDescription": "Access token reported by SOC automation run R-2045.",
-      "revokedAt": "2025-10-12T14:32:05Z",
-      "scopes": [
-        "feedser:export",
-        "feedser:jobs"
-      ],
-      "fingerprint": "AD35E719C12204D7E7C92ED3F6DEBF0A44642D41AAF94233F9A47E183F4C5F18",
-      "metadata": {
-        "reportId": "R-2045",
-        "source": "soc-automation"
-      }
-    },
-    {
-      "id": "user:departed-vendor",
-      "category": "subject",
-      "subjectId": "user:departed-vendor",
-      "reason": "lifecycle",
-      "revokedAt": "2025-10-10T18:15:00Z",
-      "metadata": {
-        "ticket": "HR-8821"
-      }
-    },
-    {
-      "id": "ci-runner-legacy",
-      "category": "client",
-      "clientId": "ci-runner-legacy",
-      "reason": "rotation",
-      "revokedAt": "2025-10-09T11:00:00Z",
-      "expiresAt": "2025-11-01T00:00:00Z",
-      "metadata": {
-        "replacement": "ci-runner-2025"
-      }
-    }
-  ],
-  "metadata": {
-    "generator": "stellaops-authority@1.4.0",
-    "jobId": "revocation-export-20251012T1500Z"
-  }
-}
+{
+  "$schema": "../../etc/authority/revocation_bundle.schema.json",
+  "schemaVersion": "1.0.0",
+  "issuer": "https://auth.stella-ops.example",
+  "bundleId": "6f9d08bfa0c24a0a9f7f59e6c17d2f8e8bca2ef34215c3d3ba5a9a1f0fbe2d10",
+  "issuedAt": "2025-10-12T15:00:00Z",
+  "validFrom": "2025-10-12T15:00:00Z",
+  "sequence": 42,
+  "signingKeyId": "authority-signing-20251012",
+  "revocations": [
+    {
+      "id": "7ad4f3d2c21b461d9b3420e1151be9c4",
+      "category": "token",
+      "tokenType": "access_token",
+      "clientId": "concelier-cli",
+      "subjectId": "user:ops-admin",
+      "reason": "compromised",
+      "reasonDescription": "Access token reported by SOC automation run R-2045.",
+      "revokedAt": "2025-10-12T14:32:05Z",
+      "scopes": [
+        "concelier:export",
+        "concelier:jobs"
+      ],
+      "fingerprint": "AD35E719C12204D7E7C92ED3F6DEBF0A44642D41AAF94233F9A47E183F4C5F18",
+      "metadata": {
+        "reportId": "R-2045",
+        "source": "soc-automation"
+      }
+    },
+    {
+      "id": "user:departed-vendor",
+      "category": "subject",
+      "subjectId": "user:departed-vendor",
+      "reason": "lifecycle",
+      "revokedAt": "2025-10-10T18:15:00Z",
+      "metadata": {
+        "ticket": "HR-8821"
+      }
+    },
+    {
+      "id": "ci-runner-legacy",
+      "category": "client",
+      "clientId": "ci-runner-legacy",
+      "reason": "rotation",
+      "revokedAt": "2025-10-09T11:00:00Z",
+      "expiresAt": "2025-11-01T00:00:00Z",
+      "metadata": {
+        "replacement": "ci-runner-2025"
+      }
+    }
+  ],
+  "metadata": {
+    "generator": "stellaops-authority@1.4.0",
+    "jobId": "revocation-export-20251012T1500Z"
+  }
+}