From 9b59d90654ff0a52894e4153812ccb560fe8d135 Mon Sep 17 00:00:00 2001 From: Owen Date: Fri, 16 Oct 2026 11:46:56 -0400 Subject: [PATCH] Move mtls schema to private --- server/db/pg/schema/privateSchema.ts | 19 +++++++++++++++++++ server/db/pg/schema/schema.ts | 19 ------------------- server/db/sqlite/schema/privateSchema.ts | 24 ++++++++++++++++++++++++ server/db/sqlite/schema/schema.ts | 24 ------------------------ 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/server/db/pg/schema/privateSchema.ts b/server/db/pg/schema/privateSchema.ts index bd79fc7f4..c3b9d8d9d 100644 --- a/server/db/pg/schema/privateSchema.ts +++ b/server/db/pg/schema/privateSchema.ts @@ -697,6 +697,22 @@ export const aiSessionLog = pgTable( ] ); +export const resourceMtlsCertificates = pgTable("resourceMtlsCertificates", { + mtlsCertificateId: serial("mtlsCertificateId").primaryKey(), + resourceId: integer("resourceId") + .notNull() + .references(() => resources.resourceId, { onDelete: "cascade" }), + name: varchar("name"), + certificate: text("certificate").notNull(), + subject: varchar("subject"), + issuer: varchar("issuer"), + serialNumber: varchar("serialNumber"), + fingerprint: varchar("fingerprint"), + notBefore: bigint("notBefore", { mode: "number" }), + notAfter: bigint("notAfter", { mode: "number" }), + createdAt: bigint("createdAt", { mode: "number" }).notNull() +}); + export type Approval = InferSelectModel; export type Limit = InferSelectModel; export type Account = InferSelectModel; @@ -744,3 +760,6 @@ export type AlertEmailRecipients = InferSelectModel< export type AlertWebhookActions = InferSelectModel; export type TrialNotification = InferSelectModel; export type AiSessionLog = InferSelectModel; +export type ResourceMtlsCertificate = InferSelectModel< + typeof resourceMtlsCertificates +>; diff --git a/server/db/pg/schema/schema.ts b/server/db/pg/schema/schema.ts index 9c6f883b9..7af863962 100644 --- a/server/db/pg/schema/schema.ts +++ b/server/db/pg/schema/schema.ts @@ -1169,22 +1169,6 @@ export const resourceWhitelist = pgTable("resourceWhitelist", { .references(() => resources.resourceId, { onDelete: "cascade" }) }); -export const resourceMtlsCertificates = pgTable("resourceMtlsCertificates", { - mtlsCertificateId: serial("mtlsCertificateId").primaryKey(), - resourceId: integer("resourceId") - .notNull() - .references(() => resources.resourceId, { onDelete: "cascade" }), - name: varchar("name"), - certificate: text("certificate").notNull(), - subject: varchar("subject"), - issuer: varchar("issuer"), - serialNumber: varchar("serialNumber"), - fingerprint: varchar("fingerprint"), - notBefore: bigint("notBefore", { mode: "number" }), - notAfter: bigint("notAfter", { mode: "number" }), - createdAt: bigint("createdAt", { mode: "number" }).notNull() -}); - export const resourceOtp = pgTable("resourceOtp", { otpId: serial("otpId").primaryKey(), resourceId: integer("resourceId") @@ -2098,9 +2082,6 @@ export type ResourceHeaderAuthExtendedCompatibility = InferSelectModel< export type ResourceOtp = InferSelectModel; export type ResourceAccessToken = InferSelectModel; export type ResourceWhitelist = InferSelectModel; -export type ResourceMtlsCertificate = InferSelectModel< - typeof resourceMtlsCertificates ->; export type ResourcePolicyPincode = InferSelectModel< typeof resourcePolicyPincode >; diff --git a/server/db/sqlite/schema/privateSchema.ts b/server/db/sqlite/schema/privateSchema.ts index 8db5bf99d..4f0ae60c9 100644 --- a/server/db/sqlite/schema/privateSchema.ts +++ b/server/db/sqlite/schema/privateSchema.ts @@ -696,6 +696,27 @@ export const aiSessionLog = sqliteTable( ] ); +export const resourceMtlsCertificates = sqliteTable( + "resourceMtlsCertificates", + { + mtlsCertificateId: integer("mtlsCertificateId").primaryKey({ + autoIncrement: true + }), + resourceId: integer("resourceId") + .notNull() + .references(() => resources.resourceId, { onDelete: "cascade" }), + name: text("name"), + certificate: text("certificate").notNull(), + subject: text("subject"), + issuer: text("issuer"), + serialNumber: text("serialNumber"), + fingerprint: text("fingerprint"), + notBefore: integer("notBefore"), + notAfter: integer("notAfter"), + createdAt: integer("createdAt").notNull() + } +); + export type Approval = InferSelectModel; export type Limit = InferSelectModel; export type Account = InferSelectModel; @@ -735,3 +756,6 @@ export type AlertEmailRecipient = InferSelectModel; export type AlertWebhookAction = InferSelectModel; export type TrialNotification = InferSelectModel; export type AiSessionLog = InferSelectModel; +export type ResourceMtlsCertificate = InferSelectModel< + typeof resourceMtlsCertificates +>; diff --git a/server/db/sqlite/schema/schema.ts b/server/db/sqlite/schema/schema.ts index 50163ba50..68f8e27d3 100644 --- a/server/db/sqlite/schema/schema.ts +++ b/server/db/sqlite/schema/schema.ts @@ -1443,27 +1443,6 @@ export const resourceWhitelist = sqliteTable("resourceWhitelist", { .references(() => resources.resourceId, { onDelete: "cascade" }) }); -export const resourceMtlsCertificates = sqliteTable( - "resourceMtlsCertificates", - { - mtlsCertificateId: integer("mtlsCertificateId").primaryKey({ - autoIncrement: true - }), - resourceId: integer("resourceId") - .notNull() - .references(() => resources.resourceId, { onDelete: "cascade" }), - name: text("name"), - certificate: text("certificate").notNull(), - subject: text("subject"), - issuer: text("issuer"), - serialNumber: text("serialNumber"), - fingerprint: text("fingerprint"), - notBefore: integer("notBefore"), - notAfter: integer("notAfter"), - createdAt: integer("createdAt").notNull() - } -); - export const resourceOtp = sqliteTable("resourceOtp", { otpId: integer("otpId").primaryKey({ autoIncrement: true @@ -2150,9 +2129,6 @@ export type ResourceHeaderAuthExtendedCompatibility = InferSelectModel< export type ResourceOtp = InferSelectModel; export type ResourceAccessToken = InferSelectModel; export type ResourceWhitelist = InferSelectModel; -export type ResourceMtlsCertificate = InferSelectModel< - typeof resourceMtlsCertificates ->; export type VersionMigration = InferSelectModel; export type ResourceRule = InferSelectModel; export type Domain = InferSelectModel;