From 1a84fc09e13f019f20a03d326c0eadffb7b50915 Mon Sep 17 00:00:00 2001 From: Anirudh Oppiliappan Date: Fri, 13 Jun 2025 12:03:58 +0300 Subject: [PATCH] notifier: move package to top-level As it sees use in both spindle and knotserver. Signed-off-by: Anirudh Oppiliappan --- knotserver/db/events.go | 2 +- knotserver/handler.go | 2 +- knotserver/internal.go | 2 +- knotserver/server.go | 2 +- {knotserver/notifier => notifier}/notifier.go | 0 spindle/db/pipelines.go | 2 +- spindle/engine/engine.go | 2 +- spindle/server.go | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename {knotserver/notifier => notifier}/notifier.go (100%) diff --git a/knotserver/db/events.go b/knotserver/db/events.go index d66b2d0a..2836581a 100644 --- a/knotserver/db/events.go +++ b/knotserver/db/events.go @@ -3,7 +3,7 @@ package db import ( "fmt" - "tangled.sh/tangled.sh/core/knotserver/notifier" + "tangled.sh/tangled.sh/core/notifier" ) type Event struct { diff --git a/knotserver/handler.go b/knotserver/handler.go index 27142c03..29124766 100644 --- a/knotserver/handler.go +++ b/knotserver/handler.go @@ -11,7 +11,7 @@ import ( "tangled.sh/tangled.sh/core/jetstream" "tangled.sh/tangled.sh/core/knotserver/config" "tangled.sh/tangled.sh/core/knotserver/db" - "tangled.sh/tangled.sh/core/knotserver/notifier" + "tangled.sh/tangled.sh/core/notifier" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/knotserver/internal.go b/knotserver/internal.go index c7989e7e..ab8749f6 100644 --- a/knotserver/internal.go +++ b/knotserver/internal.go @@ -15,7 +15,7 @@ import ( "tangled.sh/tangled.sh/core/knotserver/config" "tangled.sh/tangled.sh/core/knotserver/db" "tangled.sh/tangled.sh/core/knotserver/git" - "tangled.sh/tangled.sh/core/knotserver/notifier" + "tangled.sh/tangled.sh/core/notifier" "tangled.sh/tangled.sh/core/rbac" "tangled.sh/tangled.sh/core/workflow" ) diff --git a/knotserver/server.go b/knotserver/server.go index ee0d7a55..984aabca 100644 --- a/knotserver/server.go +++ b/knotserver/server.go @@ -11,8 +11,8 @@ import ( "tangled.sh/tangled.sh/core/jetstream" "tangled.sh/tangled.sh/core/knotserver/config" "tangled.sh/tangled.sh/core/knotserver/db" - "tangled.sh/tangled.sh/core/knotserver/notifier" "tangled.sh/tangled.sh/core/log" + "tangled.sh/tangled.sh/core/notifier" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/knotserver/notifier/notifier.go b/notifier/notifier.go similarity index 100% rename from knotserver/notifier/notifier.go rename to notifier/notifier.go diff --git a/spindle/db/pipelines.go b/spindle/db/pipelines.go index d5073f1a..205835e7 100644 --- a/spindle/db/pipelines.go +++ b/spindle/db/pipelines.go @@ -5,7 +5,7 @@ import ( "time" "tangled.sh/tangled.sh/core/api/tangled" - "tangled.sh/tangled.sh/core/knotserver/notifier" + "tangled.sh/tangled.sh/core/notifier" ) type PipelineRunStatus string diff --git a/spindle/engine/engine.go b/spindle/engine/engine.go index 8ba534ca..11e30eda 100644 --- a/spindle/engine/engine.go +++ b/spindle/engine/engine.go @@ -19,8 +19,8 @@ import ( "github.com/docker/docker/pkg/stdcopy" "golang.org/x/sync/errgroup" "tangled.sh/tangled.sh/core/api/tangled" - "tangled.sh/tangled.sh/core/knotserver/notifier" "tangled.sh/tangled.sh/core/log" + "tangled.sh/tangled.sh/core/notifier" "tangled.sh/tangled.sh/core/spindle/db" ) diff --git a/spindle/server.go b/spindle/server.go index 42d10042..0decc7da 100644 --- a/spindle/server.go +++ b/spindle/server.go @@ -11,8 +11,8 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/jetstream" "tangled.sh/tangled.sh/core/knotclient" - "tangled.sh/tangled.sh/core/knotserver/notifier" "tangled.sh/tangled.sh/core/log" + "tangled.sh/tangled.sh/core/notifier" "tangled.sh/tangled.sh/core/rbac" "tangled.sh/tangled.sh/core/spindle/config" "tangled.sh/tangled.sh/core/spindle/db" -- 2.51.2