fix: Init deployment version refactor

apps/webservice/src/app/api/v1/config/route.ts

@@ -174,7 +174,9 @@ const upsertReleases = async (db: Tx, config: CacV1, userId: string) => {
         .groupBy((d) => d.deployment.id)
         .map((deploymentGroup) => ({
           ...deploymentGroup[0]!,
-          releases: deploymentGroup.map((d) => d.release).filter(isPresent),
+          releases: deploymentGroup
+            .map((d) => d.deployment_version)
+            .filter(isPresent),
         }))
         .value(),
     );

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

@@ -59,11 +59,11 @@ export const GET = async (
           target: jobRows[0]!.resource,
           deployment: jobRows[0]!.deployment,
           release:
-            jobRows[0]!.release != null
+            jobRows[0]!.deployment_version != null
               ? {
-                  ...jobRows[0]!.release,
+                  ...jobRows[0]!.deployment_version,
                   metadata: jobRows
-                    .map((r) => r.release_metadata)
+                    .map((r) => r.deployment_version_metadata)
                     .filter(isPresent),
                 }
               : null,

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

@@ -102,7 +102,9 @@ export const GET = request()
       );
 
     const release =
-      row.release != null ? { ...row.release, metadata: {} } : null;
+      row.deployment_version != null
+        ? { ...row.deployment_version, metadata: {} }
+        : null;
 
     const je = {
       job: row.job,

integrations/kubernetes-job-agent/src/index.ts

@@ -94,7 +94,7 @@ const spinUpNewJobs = async () => {
         );
         if (!parseResult.success) {
           await job.update({
-            status: "failed",
+            status: "failure",
             message:
               "Invalid job agent configuration: " + parseResult.error.message,
           });

integrations/kubernetes-job-agent/src/k8s.ts

@@ -68,7 +68,7 @@ export const getJobStatus = async (namespace: string, name: string) => {
       logger.info(
         `Job ${name} in namespace ${namespace} completed successfully`,
       );
-      return { status: "completed" as const, message };
+      return { status: "successful" as const, message };
     }
 
     logger.warn(`Job ${name} in namespace ${namespace} has an unknown status`);

packages/api/src/router/deployment.ts

@@ -402,7 +402,7 @@ export const deploymentRouter = createTRPCRouter({
         .then((r) =>
           r.map((row) => ({
             ...row.latest_jobs,
-            release: row.release,
+            release: row.deployment_version,
             resource: row.resource,
             releaseJobTrigger: row.release_job_trigger,
           })),
@@ -533,7 +533,7 @@ export const deploymentRouter = createTRPCRouter({
                 system: { ...r[0].system, workspace: r[0].workspace },
                 agent: r[0].job_agent,
                 releaseChannels: r
-                  .map((r) => r.release_channel)
+                  .map((r) => r.deployment_version_channel)
                   .filter(isPresent),
               },
         ),
@@ -565,7 +565,7 @@ export const deploymentRouter = createTRPCRouter({
               ...t[0]!.deployment,
               system: t[0]!.system,
               releaseChannels: _.chain(t)
-                .map((a) => a.release_channel)
+                .map((a) => a.deployment_version_channel)
                 .filter(isPresent)
                 .uniqBy((a) => a.id)
                 .value(),
@@ -645,7 +645,7 @@ export const deploymentRouter = createTRPCRouter({
                     ? {
                         ...row.release_job_trigger,
                         job: row.job!,
-                        release: row.release!,
+                        release: row.deployment_version!,
                         resourceId: row.resource.id,
                       }
                     : null,

packages/api/src/router/environment-policy.ts

@@ -157,7 +157,7 @@ export const policyRouter = createTRPCRouter({
         .then((rows) => {
           const policy = rows.at(0)!;
           const releaseChannels = _.chain(rows)
-            .map((r) => r.release_channel)
+            .map((r) => r.deployment_version_channel)
             .filter(isPresent)
             .uniqBy((r) => r.id)
             .value();
@@ -196,7 +196,7 @@ export const policyRouter = createTRPCRouter({
         .then((rows) => {
           const policy = rows.at(0)!;
           const releaseChannels = _.chain(rows)
-            .map((r) => r.release_channel)
+            .map((r) => r.deployment_version_channel)
             .filter(isPresent)
             .uniqBy((r) => r.id)
             .value();

packages/api/src/router/job.ts

@@ -192,7 +192,10 @@ const releaseJobTriggerRouter = createTRPCRouter({
                 },
                 jobAgent: v[0]!.job_agent,
                 resource: v[0]!.resource,
-                release: { ...v[0]!.release, deployment: v[0]!.deployment },
+                release: {
+                  ...v[0]!.deployment_version,
+                  deployment: v[0]!.deployment,
+                },
                 environment: v[0]!.environment,
               }))
               .value(),
@@ -420,6 +423,12 @@ const releaseJobTriggerRouter = createTRPCRouter({
         .orderBy(desc(schema.releaseJobTrigger.createdAt))
         .limit(input.limit)
         .offset(input.offset)
+        .then((r) =>
+          r.map((row) => ({
+            ...row,
+            release: row.deployment_version,
+          })),
+        )
         .then(processReleaseJobTriggerWithAdditionalDataRows),
     ),
 
@@ -474,6 +483,12 @@ const releaseJobTriggerRouter = createTRPCRouter({
           ),
         )
         .where(and(eq(schema.job.id, input), isNull(schema.resource.deletedAt)))
+        .then((r) =>
+          r.map((row) => ({
+            ...row,
+            release: row.deployment_version,
+          })),
+        )
         .then(processReleaseJobTriggerWithAdditionalDataRows)
         .then(takeFirst);
 
@@ -768,7 +783,7 @@ export const jobRouter = createTRPCRouter({
             agent: t.job_agent,
             resource: t.resource,
             deployment: t.deployment,
-            release: { ...t.release },
+            release: { ...t.deployment_version },
             environment: t.environment,
           })),
         ),

packages/api/src/router/release.ts

@@ -105,11 +105,11 @@ export const releaseRouter = createTRPCRouter({
           .offset(input.offset)
           .then((data) =>
             _.chain(data)
-              .groupBy((r) => r.release.id)
+              .groupBy((r) => r.deployment_version.id)
               .map((r) => ({
-                ...r[0]!.release,
+                ...r[0]!.deployment_version,
                 releaseDependencies: r
-                  .map((rd) => rd.release_dependency)
+                  .map((rd) => rd.deployment_version_dependency)
                   .filter(isPresent),
               }))
               .value(),
@@ -150,12 +150,12 @@ export const releaseRouter = createTRPCRouter({
         .where(eq(release.id, input))
         .then((rows) =>
           _.chain(rows)
-            .groupBy((r) => r.release.id)
+            .groupBy((r) => r.deployment_version.id)
             .map((r) => ({
-              ...r[0]!.release,
+              ...r[0]!.deployment_version,
               dependencies: r
                 .filter(isPresent)
-                .map((r) => r.release_dependency!),
+                .map((r) => r.deployment_version_dependency!),
             }))
             .value()
             .at(0),
@@ -289,9 +289,9 @@ export const releaseRouter = createTRPCRouter({
         .where(inArray(release.id, input))
         .then((rows) =>
           _.chain(rows)
-            .groupBy((e) => [e.environment.id, e.release.id])
+            .groupBy((e) => [e.environment.id, e.deployment_version.id])
             .map((v) => ({
-              release: v[0]!.release,
+              release: v[0]!.deployment_version,
               environment: v[0]!.environment,
               environmentPolicy: v[0]!.environment_policy
                 ? {
@@ -489,7 +489,7 @@ export const releaseRouter = createTRPCRouter({
           .orderBy(desc(release.createdAt))
           .limit(1)
           .then(takeFirstOrNull)
-          .then((r) => r?.release ?? null),
+          .then((r) => r?.deployment_version ?? null),
       ),
 
     byDeploymentAndEnvironment: protectedProcedure
@@ -557,10 +557,10 @@ export const releaseRouter = createTRPCRouter({
             and(
               eq(release.status, ReleaseStatus.Ready),
               eq(release.deploymentId, deploymentId),
-              env.release_channel != null
+              env.deployment_version_channel != null
                 ? releaseMatchesCondition(
                     ctx.db,
-                    env.release_channel.releaseFilter,
+                    env.deployment_version_channel.releaseFilter,
                   )
                 : undefined,
             ),
@@ -579,7 +579,7 @@ export const releaseRouter = createTRPCRouter({
 
         if (env.environment.resourceFilter == null)
           return {
-            ...rel.release,
+            ...rel.deployment_version,
             approval: rel.environment_policy_approval,
             resourceCount: 0,
           };
@@ -606,7 +606,7 @@ export const releaseRouter = createTRPCRouter({
           .then(takeFirst);
 
         return {
-          ...rel.release,
+          ...rel.deployment_version,
           approval: rel.environment_policy_approval,
           resourceCount: resourceCount.count,
         };

packages/api/src/router/resource-stats.ts

@@ -102,7 +102,7 @@ const healthRouter = createTRPCRouter({
           rows.map((row) => ({
             ...row.job,
             deployment: row.deployment,
-            release: row.release,
+            release: row.deployment_version,
           })),
         );
     }),

packages/api/src/router/resources.ts

@@ -157,7 +157,7 @@ const latestActiveReleaseByResourceAndEnvironmentId = (
         releaseJobTrigger: {
           ...row.release_job_trigger,
           job: row.job,
-          release: row.release,
+          release: row.deployment_version,
           resourceId: row.resource.id,
         },
       })),

packages/auth/src/utils/rbac.ts

@@ -99,8 +99,8 @@ const getReleaseScopes = async (id: string) => {
     .then(takeFirst);
 
   return [
-    { type: "release" as const, id: result.release.id },
-    { type: "deployment" as const, id: result.deployment.id },
+    { type: "release" as const, id: result.deployment_version.id },
+    { type: "deployment" as const, id: result.deployment_version.id },
     { type: "system" as const, id: result.system.id },
     { type: "workspace" as const, id: result.workspace.id },
   ];
@@ -117,7 +117,10 @@ const getReleaseChannelScopes = async (id: string) => {
     .then(takeFirst);
 
   return [
-    { type: "releaseChannel" as const, id: result.release_channel.id },
+    {
+      type: "releaseChannel" as const,
+      id: result.deployment_version_channel.id,
+    },
     { type: "deployment" as const, id: result.deployment.id },
     { type: "system" as const, id: result.system.id },
     { type: "workspace" as const, id: result.workspace.id },
@@ -363,7 +366,7 @@ const getJobScopes = async (id: string) => {
     { type: "job" as const, id: result.job.id },
     { type: "resource" as const, id: result.resource.id },
     { type: "environment" as const, id: result.environment.id },
-    { type: "release" as const, id: result.release.id },
+    { type: "release" as const, id: result.deployment_version.id },
     { type: "deployment" as const, id: result.deployment.id },
     { type: "system" as const, id: result.system.id },
     { type: "workspace" as const, id: result.workspace.id },

packages/db/drizzle/0075_safe_red_wolf.sql

@@ -0,0 +1,105 @@
+ALTER TABLE "release" RENAME TO "deployment_version";--> statement-breakpoint
+ALTER TABLE "release_channel" RENAME TO "deployment_version_channel";--> statement-breakpoint
+ALTER TABLE "release_dependency" RENAME TO "deployment_version_dependency";--> statement-breakpoint
+ALTER TABLE "release_metadata" RENAME TO "deployment_version_metadata";--> statement-breakpoint
+ALTER TABLE "environment_policy_release_channel" RENAME TO "environment_policy_deployment_version_channel";--> statement-breakpoint
+ALTER TABLE "deployment_version" RENAME COLUMN "version" TO "tag";--> statement-breakpoint
+ALTER TABLE "deployment_version_channel" RENAME COLUMN "release_filter" TO "deployment_version_selector";--> statement-breakpoint
+ALTER TABLE "deployment_version_dependency" RENAME COLUMN "release_id" TO "deployment_version_id";--> statement-breakpoint
+ALTER TABLE "deployment_version_dependency" RENAME COLUMN "release_filter" TO "deployment_version_selector";--> statement-breakpoint
+ALTER TABLE "release_job_trigger" RENAME COLUMN "release_id" TO "deployment_version_id";--> statement-breakpoint
+ALTER TABLE "deployment_version_metadata" RENAME COLUMN "release_id" TO "deployment_version_id";--> statement-breakpoint
+ALTER TABLE "environment_policy_approval" DROP CONSTRAINT "environment_policy_approval_release_id_release_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_version" DROP CONSTRAINT "release_deployment_id_deployment_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_version_channel" DROP CONSTRAINT "release_channel_deployment_id_deployment_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_version_dependency" DROP CONSTRAINT "release_dependency_release_id_release_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_version_dependency" DROP CONSTRAINT "release_dependency_deployment_id_deployment_id_fk";
+--> statement-breakpoint
+ALTER TABLE "release_job_trigger" DROP CONSTRAINT "release_job_trigger_release_id_release_id_fk";
+--> statement-breakpoint
+ALTER TABLE "deployment_version_metadata" DROP CONSTRAINT "release_metadata_release_id_release_id_fk";
+--> statement-breakpoint
+ALTER TABLE "environment_policy_deployment_version_channel" DROP CONSTRAINT "environment_policy_release_channel_policy_id_environment_policy_id_fk";
+--> statement-breakpoint
+ALTER TABLE "environment_policy_deployment_version_channel" DROP CONSTRAINT "environment_policy_release_channel_channel_id_release_channel_id_fk";
+--> statement-breakpoint
+ALTER TABLE "environment_policy_deployment_version_channel" DROP CONSTRAINT "environment_policy_release_channel_deployment_id_deployment_id_fk";
+--> statement-breakpoint
+DROP INDEX IF EXISTS "release_deployment_id_version_index";--> statement-breakpoint
+DROP INDEX IF EXISTS "release_created_at_idx";--> statement-breakpoint
+DROP INDEX IF EXISTS "release_channel_deployment_id_name_index";--> statement-breakpoint
+DROP INDEX IF EXISTS "release_dependency_release_id_deployment_id_index";--> statement-breakpoint
+DROP INDEX IF EXISTS "release_metadata_key_release_id_index";--> statement-breakpoint
+DROP INDEX IF EXISTS "environment_policy_release_channel_policy_id_channel_id_index";--> statement-breakpoint
+DROP INDEX IF EXISTS "environment_policy_release_channel_policy_id_deployment_id_index";--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "environment_policy_approval" ADD CONSTRAINT "environment_policy_approval_release_id_deployment_version_id_fk" FOREIGN KEY ("release_id") REFERENCES "public"."deployment_version"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_version" ADD CONSTRAINT "deployment_version_deployment_id_deployment_id_fk" FOREIGN KEY ("deployment_id") REFERENCES "public"."deployment"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_version_channel" ADD CONSTRAINT "deployment_version_channel_deployment_id_deployment_id_fk" FOREIGN KEY ("deployment_id") REFERENCES "public"."deployment"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_version_dependency" ADD CONSTRAINT "deployment_version_dependency_deployment_version_id_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."deployment_version"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_version_dependency" ADD CONSTRAINT "deployment_version_dependency_deployment_id_deployment_id_fk" FOREIGN KEY ("deployment_id") REFERENCES "public"."deployment"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "release_job_trigger" ADD CONSTRAINT "release_job_trigger_deployment_version_id_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."deployment_version"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "deployment_version_metadata" ADD CONSTRAINT "deployment_version_metadata_deployment_version_id_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."deployment_version"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "environment_policy_deployment_version_channel" ADD CONSTRAINT "environment_policy_deployment_version_channel_policy_id_environment_policy_id_fk" FOREIGN KEY ("policy_id") REFERENCES "public"."environment_policy"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "environment_policy_deployment_version_channel" ADD CONSTRAINT "environment_policy_deployment_version_channel_channel_id_deployment_version_channel_id_fk" FOREIGN KEY ("channel_id") REFERENCES "public"."deployment_version_channel"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "environment_policy_deployment_version_channel" ADD CONSTRAINT "environment_policy_deployment_version_channel_deployment_id_deployment_id_fk" FOREIGN KEY ("deployment_id") REFERENCES "public"."deployment"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "deployment_version_deployment_id_tag_index" ON "deployment_version" USING btree ("deployment_id","tag");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "deployment_version_created_at_idx" ON "deployment_version" USING btree ("created_at");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "deployment_version_channel_deployment_id_name_index" ON "deployment_version_channel" USING btree ("deployment_id","name");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "deployment_version_dependency_deployment_version_id_deployment_id_index" ON "deployment_version_dependency" USING btree ("deployment_version_id","deployment_id");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "deployment_version_metadata_key_deployment_version_id_index" ON "deployment_version_metadata" USING btree ("key","deployment_version_id");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "environment_policy_deployment_version_channel_policy_id_channel_id_index" ON "environment_policy_deployment_version_channel" USING btree ("policy_id","channel_id");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "environment_policy_deployment_version_channel_policy_id_deployment_id_index" ON "environment_policy_deployment_version_channel" USING btree ("policy_id","deployment_id");