awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 11:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: addressed failing github actions

Browse Source
This commit is contained in:
Sheen Capadngan
2024-08-16 23:14:45 +08:00
parent ed0463e3e4
commit d529670a52
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20240815045235_add-certificate-template.ts
+6 -6
View File
@@ -36,12 +36,6 @@ export async function up(knex: Knex): Promise<void> {
} }
export async function down(knex: Knex): Promise<void> { export async function down(knex: Knex): Promise<void> {
const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate);
if (hasCertificateTemplateTable) {
await knex.schema.dropTable(TableName.CertificateTemplate);
await dropOnUpdateTrigger(knex, TableName.CertificateTemplate);
}
const doesCertificateTableHaveTemplateId = await knex.schema.hasColumn( const doesCertificateTableHaveTemplateId = await knex.schema.hasColumn(
TableName.Certificate, TableName.Certificate,
"certificateTemplateId" "certificateTemplateId"
@@ -52,4 +46,10 @@ export async function down(knex: Knex): Promise<void> {
t.dropColumn("certificateTemplateId"); t.dropColumn("certificateTemplateId");
}); });
} }
const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate);
if (hasCertificateTemplateTable) {
await knex.schema.dropTable(TableName.CertificateTemplate);
await dropOnUpdateTrigger(knex, TableName.CertificateTemplate);
}
} }
backend/src/services/certificate-authority/certificate-authority-service.ts
+2 -2
View File
@@ -1218,7 +1218,7 @@ export const certificateAuthorityServiceFactory = ({
await certificateDAL.transaction(async (tx) => { await certificateDAL.transaction(async (tx) => {
const cert = await certificateDAL.create( const cert = await certificateDAL.create(
{ {
caId: ca.id, caId: (ca as TCertificateAuthorities).id,
caCertId: caCert.id, caCertId: caCert.id,
certificateTemplateId: certificateTemplate?.id, certificateTemplateId: certificateTemplate?.id,
status: CertStatus.ACTIVE, status: CertStatus.ACTIVE,
@@ -1474,7 +1474,7 @@ export const certificateAuthorityServiceFactory = ({
await certificateDAL.transaction(async (tx) => { await certificateDAL.transaction(async (tx) => {
const cert = await certificateDAL.create( const cert = await certificateDAL.create(
{ {
caId: ca.id, caId: (ca as TCertificateAuthorities).id,
caCertId: caCert.id, caCertId: caCert.id,
certificateTemplateId: certificateTemplate?.id, certificateTemplateId: certificateTemplate?.id,
status: CertStatus.ACTIVE, status: CertStatus.ACTIVE,