fix: Rename to resourceMatches

ctrlplanedev · Nov 13, 2024 · 4606845 · 4606845
1 parent 57d3467
commit 4606845
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 23 deletions.
diff --git a/packages/api/src/router/deployment-variable.ts b/packages/api/src/router/deployment-variable.ts
@@ -22,8 +22,8 @@ import {
   deploymentVariableValue,
   environment,
   resource,
+  resourceMatchesMetadata,
   system,
-  targetMatchesMetadata,
   updateDeploymentVariable,
   updateDeploymentVariableValue,
 } from "@ctrlplane/db/schema";
@@ -214,11 +214,11 @@ const valueRouter = createTRPCRouter({
       };
 
       const oldTargets = await ctx.db.query.resource.findMany({
-        where: targetMatchesMetadata(ctx.db, oldTargetFilter),
+        where: resourceMatchesMetadata(ctx.db, oldTargetFilter),
       });
 
       const newTargets = await ctx.db.query.resource.findMany({
-        where: targetMatchesMetadata(ctx.db, newTargetFilter),
+        where: resourceMatchesMetadata(ctx.db, newTargetFilter),
       });
 
       const oldTargetIds = new Set(oldTargets.map((t) => t.id));
@@ -331,7 +331,7 @@ export const deploymentVariableRouter = createTRPCRouter({
             .where(
               and(
                 eq(resource.id, input),
-                targetMatchesMetadata(ctx.db, targetFilter),
+                resourceMatchesMetadata(ctx.db, targetFilter),
               ),
             )
             .then(takeFirstOrNull);

diff --git a/packages/api/src/router/deployment.ts b/packages/api/src/router/deployment.ts
@@ -25,8 +25,8 @@ import {
   releaseJobTrigger,
   releaseMatchesCondition,
   resource,
+  resourceMatchesMetadata,
   system,
-  targetMatchesMetadata,
   updateDeployment,
   updateReleaseChannel,
   workspace,
@@ -440,7 +440,7 @@ export const deploymentRouter = createTRPCRouter({
             .leftJoin(release, eq(release.deploymentId, deployment.id))
             .innerJoin(
               resource,
-              targetMatchesMetadata(ctx.db, env.environment.resourceFilter),
+              resourceMatchesMetadata(ctx.db, env.environment.resourceFilter),
             )
             .leftJoin(
               releaseJobTrigger,

diff --git a/packages/api/src/router/environment.ts b/packages/api/src/router/environment.ts
@@ -19,8 +19,8 @@ import {
   environmentReleaseChannel,
   releaseChannel,
   resource,
+  resourceMatchesMetadata,
   system,
-  targetMatchesMetadata,
   updateEnvironment,
 } from "@ctrlplane/db/schema";
 import { getEventsForEnvironmentDeleted, handleEvent } from "@ctrlplane/events";
@@ -160,7 +160,10 @@ export const environmentRouter = createTRPCRouter({
                   .select()
                   .from(resource)
                   .where(
-                    targetMatchesMetadata(ctx.db, e.environment.resourceFilter),
+                    resourceMatchesMetadata(
+                      ctx.db,
+                      e.environment.resourceFilter,
+                    ),
                   )
               : [],
         })),
@@ -231,7 +234,7 @@ export const environmentRouter = createTRPCRouter({
         );
 
         if (hasTargetFiltersChanged) {
-          const oldQuery = targetMatchesMetadata(
+          const oldQuery = resourceMatchesMetadata(
             ctx.db,
             oldEnv.environment.resourceFilter,
           );
@@ -241,7 +244,7 @@ export const environmentRouter = createTRPCRouter({
             .where(
               and(
                 eq(resource.workspaceId, oldEnv.system.workspaceId),
-                targetMatchesMetadata(ctx.db, resourceFilter),
+                resourceMatchesMetadata(ctx.db, resourceFilter),
                 oldQuery && not(oldQuery),
               ),
             );

diff --git a/packages/api/src/router/target.ts b/packages/api/src/router/target.ts
@@ -184,7 +184,7 @@ const targetViews = createTRPCRouter({
           const total = await ctx.db
             .select({ count: count() })
             .from(schema.resource)
-            .where(schema.targetMatchesMetadata(ctx.db, view.filter))
+            .where(schema.resourceMatchesMetadata(ctx.db, view.filter))
             .then(takeFirst)
             .then((t) => t.count);
 
@@ -353,7 +353,7 @@ export const targetRouter = createTRPCRouter({
           schema.resource.workspaceId,
           input.workspaceId,
         );
-        const targetConditions = schema.targetMatchesMetadata(
+        const targetConditions = schema.resourceMatchesMetadata(
           ctx.db,
           input.filter,
         );

diff --git a/packages/db/src/schema/target.ts b/packages/db/src/schema/target.ts
@@ -224,7 +224,7 @@ const buildCondition = (tx: Tx, cond: TargetCondition): SQL => {
   return cond.not ? not(con) : con;
 };
 
-export function targetMatchesMetadata(
+export function resourceMatchesMetadata(
   tx: Tx,
   metadata?: TargetCondition | null,
 ): SQL<unknown> | undefined {

diff --git a/packages/events/src/triggers/deployment-deleted.ts b/packages/events/src/triggers/deployment-deleted.ts
@@ -31,7 +31,7 @@ export const getEventsForDeploymentDeleted = async (
   };
 
   const targets = await db.query.resource.findMany({
-    where: SCHEMA.targetMatchesMetadata(db, systemFilter),
+    where: SCHEMA.resourceMatchesMetadata(db, systemFilter),
   });
 
   return targets.map((target) => ({

diff --git a/packages/events/src/triggers/environment-deleted.ts b/packages/events/src/triggers/environment-deleted.ts
@@ -15,7 +15,7 @@ export const getEventsForEnvironmentDeleted = async (
   const targets = await db
     .select()
     .from(SCHEMA.resource)
-    .where(SCHEMA.targetMatchesMetadata(db, environment.resourceFilter));
+    .where(SCHEMA.resourceMatchesMetadata(db, environment.resourceFilter));
   if (targets.length === 0) return [];
 
   const checks = and(
@@ -46,7 +46,7 @@ export const getEventsForEnvironmentDeleted = async (
           .from(SCHEMA.resource)
           .where(
             and(
-              SCHEMA.targetMatchesMetadata(db, removedFromSystemFilter),
+              SCHEMA.resourceMatchesMetadata(db, removedFromSystemFilter),
               inArray(
                 SCHEMA.resource.id,
                 targets.map((t) => t.id),

diff --git a/packages/events/src/triggers/target-deleted.ts b/packages/events/src/triggers/target-deleted.ts
@@ -37,7 +37,7 @@ export const getEventsForTargetDeleted = async (
     };
 
     const matchedTarget = await db.query.resource.findFirst({
-      where: SCHEMA.targetMatchesMetadata(db, systemFilter),
+      where: SCHEMA.resourceMatchesMetadata(db, systemFilter),
     });
     if (matchedTarget == null) return [];
 

diff --git a/packages/job-dispatch/src/environment-creation.ts b/packages/job-dispatch/src/environment-creation.ts
@@ -43,7 +43,7 @@ export const createJobsForNewEnvironment = async (
     .where(
       and(
         eq(SCHEMA.resource.workspaceId, workspaceId),
-        SCHEMA.targetMatchesMetadata(db, resourceFilter),
+        SCHEMA.resourceMatchesMetadata(db, resourceFilter),
       ),
     );
   if (resources.length === 0) return;

diff --git a/packages/job-dispatch/src/job-variables-deployment/utils.ts b/packages/job-dispatch/src/job-variables-deployment/utils.ts
@@ -71,7 +71,7 @@ export const getMatchedTarget = (
     .where(
       and(
         eq(SCHEMA.resource.id, targetId),
-        SCHEMA.targetMatchesMetadata(tx, targetFilter),
+        SCHEMA.resourceMatchesMetadata(tx, targetFilter),
       ),
     )
     .then(takeFirstOrNull);

diff --git a/packages/job-dispatch/src/release-job-trigger.ts b/packages/job-dispatch/src/release-job-trigger.ts
@@ -16,8 +16,8 @@ import {
   release,
   releaseJobTrigger,
   resource,
+  resourceMatchesMetadata,
   system,
-  targetMatchesMetadata,
 } from "@ctrlplane/db/schema";
 
 type FilterFunc = (
@@ -142,7 +142,7 @@ class ReleaseJobTriggerBuilder {
           .from(resource)
           .where(
             and(
-              targetMatchesMetadata(this.tx, resourceFilter),
+              resourceMatchesMetadata(this.tx, resourceFilter),
               eq(resource.workspaceId, workspaceId),
               isNull(resource.lockedAt),
               this.targetIds && inArray(resource.id, this.targetIds),

diff --git a/packages/job-dispatch/src/target.ts b/packages/job-dispatch/src/target.ts
@@ -14,10 +14,10 @@ import { db } from "@ctrlplane/db/client";
 import {
   environment,
   resource,
+  resourceMatchesMetadata,
   resourceMetadata,
   resourceVariable,
   system,
-  targetMatchesMetadata,
 } from "@ctrlplane/db/schema";
 import { logger } from "@ctrlplane/logger";
 import { variablesAES256 } from "@ctrlplane/secrets";
@@ -53,7 +53,7 @@ const dispatchNewTargets = async (db: Tx, newTargets: Target[]) => {
       .where(
         and(
           inArray(resource.id, targetIds),
-          targetMatchesMetadata(db, env.resourceFilter),
+          resourceMatchesMetadata(db, env.resourceFilter),
         ),
       )
       .then((tgs) => {