Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/event-worker/src/workers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { evaluateReleaseTargetWorker } from "./evaluate-release-target.js";
import { dispatchJobWorker } from "./job-dispatch/index.js";
import { newDeploymentVersionWorker } from "./new-deployment-version.js";
import { newDeploymentWorker } from "./new-deployment.js";
import { newEnvironmentWorker } from "./new-environment.js";
import { newPolicyWorker } from "./new-policy.js";
import { newResourceWorker } from "./new-resource.js";
import { resourceScanWorker } from "./resource-scan/index.js";
Expand All @@ -24,7 +25,7 @@ type Workers<T extends keyof ChannelMap> = {
export const workers: Workers<keyof ChannelMap> = {
[Channel.NewDeployment]: newDeploymentWorker,
[Channel.NewDeploymentVersion]: newDeploymentVersionWorker,
[Channel.NewEnvironment]: null,
[Channel.NewEnvironment]: newEnvironmentWorker,
[Channel.UpdateEnvironment]: updateEnvironmentWorker,
[Channel.UpdateDeployment]: updateDeploymentWorker,
[Channel.UpdateDeploymentVariable]: updateDeploymentVariableWorker,
Expand Down
28 changes: 28 additions & 0 deletions apps/event-worker/src/workers/new-environment.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { eq, selector, takeFirst } from "@ctrlplane/db";
import { db } from "@ctrlplane/db/client";
import * as schema from "@ctrlplane/db/schema";
import { Channel, createWorker } from "@ctrlplane/events";

import { dispatchEvaluateJobs } from "../utils/dispatch-evaluate-jobs.js";

const recomputeReleaseTargets = async (environment: schema.Environment) => {
const computeBuilder = selector().compute();
await computeBuilder.environments([environment]).resourceSelectors();
const { systemId } = environment;
const system = await db
.select()
.from(schema.system)
.where(eq(schema.system.id, systemId))
.then(takeFirst);
const { workspaceId } = system;
return computeBuilder.allResources(workspaceId).releaseTargets();
};

export const newEnvironmentWorker = createWorker(
Channel.NewEnvironment,
async (job) => {
const { data: environment } = job;
const releaseTargets = await recomputeReleaseTargets(environment);
await dispatchEvaluateJobs(releaseTargets);
},
);
22 changes: 13 additions & 9 deletions apps/webservice/src/app/api/v1/environments/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const POST = request()
const releaseChannels = body.releaseChannels?.length ?? 0;
const deploymentVersionChannels =
body.deploymentVersionChannels?.length ?? 0;
const channels =
const versionChannels =
releaseChannels + deploymentVersionChannels > 0
? await tx
.select()
Expand All @@ -62,15 +62,19 @@ export const POST = request()
.where(eq(schema.environment.name, body.name))
.then(takeFirstOrNull);

const environment = await upsertEnv(tx, {
...body,
versionChannels: channels,
});
const environment = await upsertEnv(tx, { ...body, versionChannels });

getQueue(Channel.UpdateEnvironment).add(environment.id, {
...environment,
oldSelector: existingEnv?.resourceSelector ?? null,
});
if (existingEnv != null)
await getQueue(Channel.UpdateEnvironment).add(environment.id, {
...environment,
oldSelector: existingEnv.resourceSelector,
});

if (existingEnv == null)
await getQueue(Channel.NewEnvironment).add(
environment.id,
environment,
);

await createJobsForNewEnvironment(tx, environment);
const { metadata } = body;
Expand Down
6 changes: 5 additions & 1 deletion packages/api/src/router/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,11 @@ export const environmentRouter = createTRPCRouter({
})
.input(createEnvironment)
.mutation(({ ctx, input }) =>
ctx.db.transaction((db) => upsertEnv(db, input)),
ctx.db.transaction(async (db) => {
const env = await upsertEnv(db, input);
await getQueue(Channel.NewEnvironment).add(env.id, env);
return env;
}),
),

update: protectedProcedure
Expand Down
Loading