fix: Rename target upsert to resource upsert

ctrlplanedev · Nov 14, 2024 · 71598b8 · 71598b8
1 parent 1526207
commit 71598b8
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 98 deletions.
diff --git a/apps/event-worker/src/target-scan/index.ts b/apps/event-worker/src/target-scan/index.ts
@@ -10,7 +10,7 @@ import {
   resourceProviderGoogle,
   workspace,
 } from "@ctrlplane/db/schema";
-import { upsertTargets } from "@ctrlplane/job-dispatch";
+import { upsertResources } from "@ctrlplane/job-dispatch";
 import { logger } from "@ctrlplane/logger";
 import { Channel } from "@ctrlplane/validators/events";
 
@@ -72,7 +72,7 @@ export const createTargetScanWorker = () =>
           `Upserting ${targets.length} targets for provider ${tp.resource_provider.id}`,
         );
         if (targets.length > 0) {
-          await upsertTargets(db, targets);
+          await upsertResources(db, targets);
         } else {
           logger.info(
             `No targets found for provider ${tp.resource_provider.id}, skipping upsert.`,

diff --git a/apps/webservice/src/app/api/v1/target-providers/[providerId]/set/route.ts b/apps/webservice/src/app/api/v1/target-providers/[providerId]/set/route.ts
@@ -9,7 +9,7 @@ import {
   resourceProvider,
   workspace,
 } from "@ctrlplane/db/schema";
-import { upsertTargets } from "@ctrlplane/job-dispatch";
+import { upsertResources } from "@ctrlplane/job-dispatch";
 import { Permission } from "@ctrlplane/validators/auth";
 
 import { authn, authz } from "~/app/api/v1/auth";
@@ -77,7 +77,7 @@ export const PATCH = request()
       workspaceId: provider.workspaceId,
     }));
 
-    const targets = await upsertTargets(
+    const targets = await upsertResources(
       db,
       targetsToInsert.map((t) => ({
         ...t,

diff --git a/apps/webservice/src/app/api/v1/targets/[targetId]/route.ts b/apps/webservice/src/app/api/v1/targets/[targetId]/route.ts
@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { eq } from "@ctrlplane/db";
 import * as schema from "@ctrlplane/db/schema";
-import { upsertTargets } from "@ctrlplane/job-dispatch";
+import { upsertResources } from "@ctrlplane/job-dispatch";
 import { Permission } from "@ctrlplane/validators/auth";
 
 import { authn, authz } from "../../auth";
@@ -80,7 +80,7 @@ export const PATCH = request()
     if (target == null)
       return NextResponse.json({ error: "Target not found" }, { status: 404 });
 
-    const t = await upsertTargets(db, [_.merge(target, body)]);
+    const t = await upsertResources(db, [_.merge(target, body)]);
 
     return NextResponse.json(t[0]);
   });

diff --git a/apps/webservice/src/app/api/v1/targets/route.ts b/apps/webservice/src/app/api/v1/targets/route.ts
@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { db } from "@ctrlplane/db/client";
 import { createResource } from "@ctrlplane/db/schema";
-import { upsertTargets } from "@ctrlplane/job-dispatch";
+import { upsertResources } from "@ctrlplane/job-dispatch";
 import { Permission } from "@ctrlplane/validators/auth";
 
 import { authn, authz } from "../auth";
@@ -55,7 +55,7 @@ export const POST = request()
           { status: 400 },
         );
 
-      const targets = await upsertTargets(
+      const targets = await upsertResources(
         db,
         ctx.body.targets.map((t) => ({
           ...t,

diff --git a/packages/job-dispatch/src/index.ts b/packages/job-dispatch/src/index.ts
@@ -6,7 +6,7 @@ export * from "./policy-checker.js";
 export * from "./policy-create.js";
 export * from "./release-sequencing.js";
 export * from "./gradual-rollout.js";
-export * from "./new-target.js";
+export * from "./new-resource.js";
 export * from "./target.js";
 export * from "./lock-checker.js";
 export * from "./queue.js";

diff --git a/packages/job-dispatch/src/new-target.ts → packages/job-dispatch/src/new-resource.ts b/packages/job-dispatch/src/new-target.ts → packages/job-dispatch/src/new-resource.ts