From f649315463acbada041b1e0040d4c3c8a62ecde0 Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Tue, 29 Sep 2026 15:09:32 +1000 Subject: [PATCH] refactor: move core service to runtime role --- docs/service-interfaces.yaml | 4 ++-- spinifex/{services => runtime/roles}/spinifex/spinifex.go | 0 spinifex/runtime/service/service.go | 2 +- tests/e2e/select-suites/selector_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename spinifex/{services => runtime/roles}/spinifex/spinifex.go (100%) diff --git a/docs/service-interfaces.yaml b/docs/service-interfaces.yaml index 7c50aeccc..93f08f1e3 100644 --- a/docs/service-interfaces.yaml +++ b/docs/service-interfaces.yaml @@ -43,12 +43,12 @@ services: - "ochre.vector.*" spinifex_daemon: - path: spinifex/services/spinifex + path: spinifex/runtime/roles/spinifex # Orchestrator. Owns most ec2.* + all elbv2.* + iam event publication. # Translates VPC / EBS / S3 operations into vpc.* / ebs.* / s3.* and # forwards to vpcd / viperblockd / predastore. # - # Source layout: spinifex/services/spinifex (entry), spinifex/daemon + # Source layout: spinifex/runtime/roles/spinifex (entry), spinifex/daemon # (subscribe registration), spinifex/handlers/{ec2,elbv2,iam} (per- # subject handler bodies). Selector treats all four paths as belonging # to this service via the `additional_paths` field. diff --git a/spinifex/services/spinifex/spinifex.go b/spinifex/runtime/roles/spinifex/spinifex.go similarity index 100% rename from spinifex/services/spinifex/spinifex.go rename to spinifex/runtime/roles/spinifex/spinifex.go diff --git a/spinifex/runtime/service/service.go b/spinifex/runtime/service/service.go index cf66dd318..325047626 100644 --- a/spinifex/runtime/service/service.go +++ b/spinifex/runtime/service/service.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/services/predastore" "github.com/mulgadc/spinifex/spinifex/runtime/roles/qemunbdd" "github.com/mulgadc/spinifex/spinifex/runtime/roles/qmpcollector" - "github.com/mulgadc/spinifex/spinifex/services/spinifex" + "github.com/mulgadc/spinifex/spinifex/runtime/roles/spinifex" "github.com/mulgadc/spinifex/spinifex/runtime/roles/spinifexui" "github.com/mulgadc/spinifex/spinifex/services/viperblockd" "github.com/mulgadc/spinifex/spinifex/vpcd" diff --git a/tests/e2e/select-suites/selector_test.go b/tests/e2e/select-suites/selector_test.go index b096a9c9b..3e01a079b 100644 --- a/tests/e2e/select-suites/selector_test.go +++ b/tests/e2e/select-suites/selector_test.go @@ -26,7 +26,7 @@ func testManifest() *Manifest { Subscribes: []string{}, }, "spinifex_daemon": { - Path: "spinifex/services/spinifex", + Path: "spinifex/runtime/roles/spinifex", AdditionalPaths: []string{"spinifex/daemon", "spinifex/handlers/ec2"}, Subscribes: []string{"ec2.RunInstances", "elbv2.CreateLoadBalancer"}, Publishes: []string{"vpc.create", "ebs.mount", "s3.*", "iam.account.created"},