chore: move handle-provider-scan util to events package

apps/event-worker/src/workers/resource-scan/index.ts

@@ -1,4 +1,4 @@
-import type { ResourceToInsert } from "@ctrlplane/job-dispatch";
+import type { ResourceToInsert } from "@ctrlplane/events";
 import type { Job } from "bullmq";
 
 import { eq, takeFirstOrNull } from "@ctrlplane/db";
@@ -10,8 +10,12 @@ import {
   resourceProviderGoogle,
   workspace,
 } from "@ctrlplane/db/schema";
-import { Channel, createWorker, getQueue } from "@ctrlplane/events";
-import { handleResourceProviderScan } from "@ctrlplane/job-dispatch";
+import {
+  Channel,
+  createWorker,
+  getQueue,
+  handleResourceProviderScan,
+} from "@ctrlplane/events";
 import { logger } from "@ctrlplane/logger";
 
 import { getEksResources } from "./aws/eks.js";

apps/event-worker/src/workers/resource-scan/utils/extract-variables.ts

@@ -1,4 +1,4 @@
-import type { ResourceToInsert } from "@ctrlplane/job-dispatch";
+import type { ResourceToInsert } from "@ctrlplane/events";
 
 const convertToTypedValue = (
   stringValue: string,

apps/pty-proxy/src/controller/agent-socket.ts

@@ -1,4 +1,4 @@
-import type { ResourceToInsert } from "@ctrlplane/job-dispatch";
+import type { ResourceToInsert } from "@ctrlplane/events";
 import type {
   SessionCreate,
   SessionDelete,

apps/webservice/src/app/api/v1/resource-providers/[providerId]/set/route.ts

@@ -9,7 +9,7 @@ import {
   resourceProvider,
   workspace,
 } from "@ctrlplane/db/schema";
-import { handleResourceProviderScan } from "@ctrlplane/job-dispatch";
+import { handleResourceProviderScan } from "@ctrlplane/events";
 import { Permission } from "@ctrlplane/validators/auth";
 
 import { authn, authz } from "~/app/api/v1/auth";

packages/events/package.json

@@ -21,6 +21,7 @@
   "dependencies": {
     "@ctrlplane/db": "workspace:*",
     "@ctrlplane/logger": "workspace:*",
+    "@ctrlplane/rule-engine": "workspace:*",
     "@ctrlplane/validators": "workspace:*",
     "@t3-oss/env-core": "catalog:",
     "bullmq": "catalog:",

packages/events/src/index.ts

@@ -35,3 +35,4 @@ export const getQueue = <T extends keyof ChannelMap>(name: T) => {
 
 export * from "./types.js";
 export * from "./redis.js";
+export * from "./resource-provider-scan/handle-provider-scan.js";

packages/job-dispatch/src/resource/handle-provider-scan.ts → packages/events/src/resource-provider-scan/handle-provider-scan.ts

@@ -3,10 +3,11 @@ import type { InsertResource } from "@ctrlplane/db/schema";
 
 import { and, eq, inArray, upsertResources } from "@ctrlplane/db";
 import * as schema from "@ctrlplane/db/schema";
-import { Channel, getQueue } from "@ctrlplane/events";
 import { logger } from "@ctrlplane/logger";
 import { getAffectedVariables } from "@ctrlplane/rule-engine";
 
+import { getQueue } from "../index.js";
+import { Channel } from "../types.js";
 import { groupResourcesByHook } from "./group-resources-by-hook.js";
 
 const log = logger.child({ label: "upsert-resources" });

packages/job-dispatch/src/index.ts

@@ -4,4 +4,3 @@ export * from "./job-update.js";
 export * from "./job-dispatch.js";
 
 export * from "./events/index.js";
-export * from "./resource/index.js";

packages/rule-engine/package.json

@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "@ctrlplane/db": "workspace:*",
-    "@ctrlplane/events": "workspace:*",
     "@ctrlplane/logger": "workspace:*",
     "@ctrlplane/validators": "workspace:*",
     "@date-fns/tz": "^1.2.0",