From 7e504c1dd2925a1e57af77df16940894d7fbe632 Mon Sep 17 00:00:00 2001
From: joshsiv-mulga <mrk@mulgadc.com>
Date: Fri, 9 Oct 2026 10:52:58 +1000
Subject: [PATCH] fix: point UI build, CI and lint rules at moved package paths

---
 .github/CODEOWNERS       |  4 ++--
 .github/dependabot.yml   |  2 +-
 .github/workflows/ui.yml | 14 +++++++-------
 .gitignore               |  2 +-
 .golangci.yml            |  7 ++++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a9eddb867..6bf7dec0f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,10 +6,10 @@
 # Set the matching branch protection rule on `dev` and `main` to
 # "Require review from Code Owners" or this file is advisory only.
 
-# Network layer is governed by ADR-0006 invariant tests.
+# Network layer is governed by its invariant tests.
 # Changes here must respect those clauses
 # see spinifex/domains/network/invariants/
-# docs/development/proposals/az-local-architecture/0006-spinifex-network-layer-contract.md
+# mulga docs/development/proposals/region-local-architecture/0006-spinifex-network-layer-contract.md (proposal, not accepted)
 /spinifex/domains/network/          @joshsiv-mulga
 /spinifex/vpcd/             @joshsiv-mulga
 /spinifex/domains/network/invariants/ @joshsiv-mulga
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3cf8ea237..0af63eb18 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -35,7 +35,7 @@ updates:
 
   - package-ecosystem: npm
     target-branch: dev
-    directory: /spinifex/services/spinifexui/frontend
+    directory: /spinifex/runtime/roles/spinifexui/frontend
     schedule:
       interval: weekly
       day: sunday
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index a1f1b292b..9ba542920 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -6,14 +6,14 @@ on:
       - main
       - dev
     paths:
-      - spinifex/services/spinifexui/frontend/**
+      - spinifex/runtime/roles/spinifexui/frontend/**
       - .github/workflows/ui.yml
   pull_request:
     branches:
       - main
       - dev
     paths:
-      - spinifex/services/spinifexui/frontend/**
+      - spinifex/runtime/roles/spinifexui/frontend/**
       - .github/workflows/ui.yml
   workflow_dispatch:
 
@@ -26,25 +26,25 @@ jobs:
     runs-on: ubuntu-26.04
     defaults:
       run:
-        working-directory: spinifex/services/spinifexui/frontend
+        working-directory: spinifex/runtime/roles/spinifexui/frontend
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@v7
         with:
-          sparse-checkout: spinifex/services/spinifexui/frontend
+          sparse-checkout: spinifex/runtime/roles/spinifexui/frontend
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6
         with:
-          package_json_file: spinifex/services/spinifexui/frontend/package.json
+          package_json_file: spinifex/runtime/roles/spinifexui/frontend/package.json
 
       - name: Setup Node.js
         uses: actions/setup-node@v7
         with:
           cache: "pnpm"
-          cache-dependency-path: spinifex/services/spinifexui/frontend/pnpm-lock.yaml
-          node-version-file: spinifex/services/spinifexui/frontend/.nvmrc
+          cache-dependency-path: spinifex/runtime/roles/spinifexui/frontend/pnpm-lock.yaml
+          node-version-file: spinifex/runtime/roles/spinifexui/frontend/.nvmrc
 
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.gitignore b/.gitignore
index 0b2dab0fc..2d23a0513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ bin/
 dist/
 build/microvm/vmlinuz
 build/microvm/initramfs.cpio.gz
-!spinifex/services/spinifexui/frontend/dist/
+!spinifex/runtime/roles/spinifexui/frontend/dist/
 tmp/
 *.test
 *.out
diff --git a/.golangci.yml b/.golangci.yml
index b5a2d717b..95a22b7bc 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -71,17 +71,18 @@ linters:
             - pkg: math/rand$
               desc: Use math/rand/v2 instead, see https://go.dev/blog/randv2
 
-        # The EC2 control plane reaches block storage through ebsprovider, not
+        # The control plane reaches block storage through the EBS provider, not
         # by importing the engine. viperblock.New starts a chunk uploader, so
         # every construction is a writer against a volume viperblockd serves.
-        # Nothing under handlers/ may import viperblock, in any form, tests
+        # No domain or legacy handler may import viperblock, in any form, tests
         # included. A types-only import counts: one became an engine import.
         ec2-control-plane:
           files:
+            - '**/spinifex/domains/**'
             - '**/spinifex/handlers/**'
           deny:
             - pkg: github.com/mulgadc/viperblock
-              desc: Use the ebsprovider.EBSProvider interface; the control plane must not construct or name viperblock types.
+              desc: Use the providers/ebs EBSProvider interface; the control plane must not construct or name viperblock types.
 
     embeddedstructfieldcheck:
       forbid-mutex: true