fix: Init refactor target -> resource (#213)

apps/event-worker/src/target-scan/index.ts

@@ -47,17 +47,17 @@ export const createTargetScanWorker = () =>
       }
 
       logger.info(
-        `Received scanning request for "${tp.target_provider.name}" (${targetProviderId}).`,
+        `Received scanning request for "${tp.resource_provider.name}" (${targetProviderId}).`,
       );
 
       const targets: InsertTarget[] = [];
 
-      if (tp.target_provider_google != null) {
+      if (tp.resource_provider_google != null) {
         logger.info("Found Google config, scanning for GKE targets");
         try {
           const gkeTargets = await getGkeTargets(
             tp.workspace,
-            tp.target_provider_google,
+            tp.resource_provider_google,
           );
           targets.push(...gkeTargets);
         } catch (error: any) {
@@ -69,18 +69,18 @@ export const createTargetScanWorker = () =>
 
       try {
         logger.info(
-          `Upserting ${targets.length} targets for provider ${tp.target_provider.id}`,
+          `Upserting ${targets.length} targets for provider ${tp.resource_provider.id}`,
         );
         if (targets.length > 0) {
           await upsertTargets(db, targets);
         } else {
           logger.info(
-            `No targets found for provider ${tp.target_provider.id}, skipping upsert.`,
+            `No targets found for provider ${tp.resource_provider.id}, skipping upsert.`,
           );
         }
       } catch (error: any) {
         logger.error(
-          `Error upserting targets for provider ${tp.target_provider.id}: ${error.message}`,
+          `Error upserting targets for provider ${tp.resource_provider.id}: ${error.message}`,
           { error },
         );
       }

apps/webservice/src/app/api/v1/job-agents/[agentId]/jobs/running/route.ts

@@ -47,7 +47,7 @@ export const GET = async (
         ...row.job,
         config: row.release_job_trigger,
         environment: row.environment,
-        target: row.target,
+        target: row.resource,
         deployment: row.deployment,
         release: row.release,
       })),

apps/webservice/src/app/api/v1/jobs/[jobId]/route.ts

@@ -89,7 +89,7 @@ export const GET = request()
         job: row.job,
         runbook: row.runbook,
         environment: row.environment,
-        target: row.target,
+        target: row.resource,
         deployment: row.deployment,
         release: row.release,
       }));

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

@@ -44,7 +44,7 @@ export const PATCH = request()
     authz(({ can, extra }) =>
       can
         .perform(Permission.TargetUpdate)
-        .on({ type: "targetProvider", id: extra.params.providerId }),
+        .on({ type: "resourceProvider", id: extra.params.providerId }),
     ),
   )
   .handle<
@@ -60,7 +60,7 @@ export const PATCH = request()
       .where(eq(targetProvider.id, params.providerId))
       .then(takeFirstOrNull);
 
-    const provider = query?.target_provider;
+    const provider = query?.resource_provider;
     if (!provider)
       return NextResponse.json(
         { error: "Provider not found" },

apps/webservice/src/app/api/v1/targets/[targetId]/route.ts

@@ -17,7 +17,7 @@ export const GET = request()
     authz(({ can, extra }) => {
       return can
         .perform(Permission.TargetGet)
-        .on({ type: "target", id: extra.params.targetId });
+        .on({ type: "resource", id: extra.params.targetId });
     }),
   )
   .handle(async ({ db }, { params }: { params: { targetId: string } }) => {
@@ -65,7 +65,7 @@ export const PATCH = request()
     authz(({ can, extra }) =>
       can
         .perform(Permission.TargetUpdate)
-        .on({ type: "target", id: extra.params.targetId }),
+        .on({ type: "resource", id: extra.params.targetId }),
     ),
   )
   .use(parseBody(patchSchema))
@@ -91,7 +91,7 @@ export const DELETE = request()
     authz(({ can, extra }) =>
       can
         .perform(Permission.TargetDelete)
-        .on({ type: "target", id: extra.params.targetId }),
+        .on({ type: "resource", id: extra.params.targetId }),
     ),
   )
   .handle(async ({ db }, { params }: { params: { targetId: string } }) => {

apps/webservice/src/app/api/v1/workspaces/[workspaceId]/targets/identifier/[identifier]/route.ts

@@ -24,7 +24,7 @@ export const GET = request()
       if (target == null) return false;
       return can
         .perform(Permission.TargetGet)
-        .on({ type: "target", id: target.id });
+        .on({ type: "resource", id: target.id });
     }),
   )
   .handle<unknown, { params: { workspaceId: string; identifier: string } }>(
@@ -72,7 +72,7 @@ export const DELETE = request()
       if (target == null) return false;
       return can
         .perform(Permission.TargetDelete)
-        .on({ type: "target", id: target.id });
+        .on({ type: "resource", id: target.id });
     }),
   )
   .handle<unknown, { params: { workspaceId: string; identifier: string } }>(

packages/api/src/router/deployment-variable.ts

@@ -292,7 +292,7 @@ export const deploymentVariableRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.DeploymentGet)
-          .on({ type: "target", id: input }),
+          .on({ type: "resource", id: input }),
     })
     .input(z.string().uuid())
     .query(async ({ ctx, input }) => {

packages/api/src/router/deployment.ts

@@ -219,7 +219,7 @@ export const deploymentRouter = createTRPCRouter({
           r.map((row) => ({
             ...row.latest_jobs,
             release: row.release,
-            target: row.target,
+            target: row.resource,
             releaseJobTrigger: row.release_job_trigger,
           })),
         );
@@ -410,7 +410,7 @@ export const deploymentRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.DeploymentList)
-          .on({ type: "target", id: input }),
+          .on({ type: "resource", id: input }),
     })
     .query(async ({ ctx, input }) => {
       const tg = await ctx.db

packages/api/src/router/job.ts

@@ -76,7 +76,7 @@ const processReleaseJobTriggerWithAdditionalDataRows = (
   rows: Array<{
     release_job_trigger: ReleaseJobTrigger;
     job: Job;
-    target: Target;
+    resource: Target;
     release: Release;
     deployment: Deployment;
     environment: Environment;
@@ -110,7 +110,7 @@ const processReleaseJobTriggerWithAdditionalDataRows = (
           .value(),
       },
       jobAgent: v[0]!.job_agent,
-      target: v[0]!.target,
+      target: v[0]!.resource,
       release: { ...v[0]!.release, deployment: v[0]!.deployment },
       environment: v[0]!.environment,
       releaseDependencies: v
@@ -173,7 +173,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
               ...t.release_job_trigger,
               job: t.job,
               agent: t.job_agent,
-              target: t.target,
+              target: t.resource,
               release: { ...t.release, deployment: t.deployment },
               environment: t.environment,
             })),
@@ -291,7 +291,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
             ...t.release_job_trigger,
             job: t.job,
             jobAgent: t.job_agent,
-            target: t.target,
+            target: t.resource,
             release: { ...t.release, deployment: t.deployment },
             environment: t.environment,
           })),
@@ -387,7 +387,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
                 NULL::uuid AS tr_id,
                 NULL::uuid AS source_id,
                 NULL::uuid AS target_id,
-                NULL::target_relationship_type AS type
+                NULL::resource_relationship_type AS type
             UNION ALL
             -- Recursive case: find all relationships connected to the current set of IDs
             SELECT
@@ -404,7 +404,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
                 tr.target_id,
                 tr.type
             FROM reachable_relationships rr
-            JOIN target_relationship tr ON tr.source_id = rr.id OR tr.target_id = rr.id
+            JOIN resource_relationship tr ON tr.source_id = rr.id OR tr.target_id = rr.id
             WHERE
                 NOT CASE
                     WHEN tr.source_id = rr.id THEN tr.target_id
@@ -617,7 +617,7 @@ export const jobRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.SystemList)
-          .on({ type: "target", id: input }),
+          .on({ type: "resource", id: input }),
     })
     .input(z.string())
     .query(({ ctx, input }) =>
@@ -630,7 +630,7 @@ export const jobRouter = createTRPCRouter({
             ...t.release_job_trigger,
             job: t.job,
             agent: t.job_agent,
-            target: t.target,
+            target: t.resource,
             deployment: t.deployment,
             release: { ...t.release },
             environment: t.environment,

packages/api/src/router/release-deploy.ts

@@ -108,7 +108,7 @@ export const releaseDeployRouter = createTRPCRouter({
           .perform(Permission.ReleaseGet, Permission.TargetUpdate)
           .on(
             { type: "release", id: input.releaseId },
-            { type: "target", id: input.targetId },
+            { type: "resource", id: input.targetId },
           ),
     })
     .input(

packages/api/src/router/release.ts

@@ -119,7 +119,7 @@ export const releaseRouter = createTRPCRouter({
             .map((j) => ({
               ...j.release_job_trigger,
               job: j.job,
-              target: j.target,
+              target: j.resource,
             })),
         }));
       };

packages/api/src/router/target-metadata-group.ts

@@ -113,7 +113,7 @@ export const targetMetadataGroupRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.TargetMetadataGroupGet)
-          .on({ type: "targetMetadataGroup", id: input }),
+          .on({ type: "resourceMetadataGroup", id: input }),
     })
     .input(z.string().uuid())
     .query(async ({ ctx, input }) => {
@@ -209,7 +209,7 @@ export const targetMetadataGroupRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.TargetMetadataGroupUpdate)
-          .on({ type: "targetMetadataGroup", id: input.id }),
+          .on({ type: "resourceMetadataGroup", id: input.id }),
     })
     .input(
       z.object({
@@ -231,7 +231,7 @@ export const targetMetadataGroupRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.TargetMetadataGroupDelete)
-          .on({ type: "targetMetadataGroup", id: input }),
+          .on({ type: "resourceMetadataGroup", id: input }),
     })
     .input(z.string().uuid())
     .mutation(({ ctx, input }) =>

packages/api/src/router/target-provider.ts

@@ -45,7 +45,7 @@ export const targetProviderRouter = createTRPCRouter({
         .where(
           inArray(
             target.providerId,
-            providers.map((p) => p.target_provider.id),
+            providers.map((p) => p.resource_provider.id),
           ),
         )
         .groupBy(target.providerId);
@@ -61,21 +61,21 @@ export const targetProviderRouter = createTRPCRouter({
         .where(
           inArray(
             target.providerId,
-            providers.map((p) => p.target_provider.id),
+            providers.map((p) => p.resource_provider.id),
           ),
         )
         .groupBy(target.providerId, target.kind, target.version)
         .orderBy(sql`count(*) DESC`);
 
       return providers.map((provider) => ({
-        ...provider.target_provider,
-        googleConfig: provider.target_provider_google,
+        ...provider.resource_provider,
+        googleConfig: provider.resource_provider_google,
         targetCount:
           providerCounts.find(
-            (pc) => pc.providerId === provider.target_provider.id,
+            (pc) => pc.providerId === provider.resource_provider.id,
           )?.count ?? 0,
         kinds: providerKinds
-          .filter((pk) => pk.providerId === provider.target_provider.id)
+          .filter((pk) => pk.providerId === provider.resource_provider.id)
           .map(({ kind, version, count }) => ({ kind, version, count })),
       }));
     }),
@@ -85,7 +85,7 @@ export const targetProviderRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.TargetList)
-          .on({ type: "targetProvider", id: input }),
+          .on({ type: "resourceProvider", id: input }),
     })
     .input(z.string().uuid())
     .query(({ ctx, input }) =>
@@ -102,7 +102,7 @@ export const targetProviderRouter = createTRPCRouter({
         authorizationCheck: ({ canUser, input }) =>
           canUser
             .perform(Permission.TargetProviderUpdate)
-            .on({ type: "targetProvider", id: input }),
+            .on({ type: "resourceProvider", id: input }),
       })
       .input(z.string().uuid())
       .mutation(async ({ input }) =>
@@ -209,7 +209,7 @@ export const targetProviderRouter = createTRPCRouter({
       authorizationCheck: ({ canUser, input }) =>
         canUser
           .perform(Permission.TargetDelete)
-          .on({ type: "targetProvider", id: input.providerId }),
+          .on({ type: "resourceProvider", id: input.providerId }),
     })
     .input(
       z.object({