Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

feat: Webhooks inititate all applications with the correct branch

Browse Source
This commit is contained in:
Andras Bacsai 2022-03-11 21:18:12 +01:00
parent 16ea9a3e07
commit c5c9f84503
7 changed files with 256 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/common.ts
View File

@ -11,6 +11,7 @@ import { version as currentVersion } from '../../package.json';
import dayjs from 'dayjs';
import Cookie from 'cookie';
import os from 'os';
import cuid from 'cuid';
try {
if (!dev) {

51
src/lib/database/applications.ts
View File

@ -58,15 +58,6 @@ export async function removeApplication({ id, teamId }) {
const id = containerObj.ID;
const preview = containerObj.Image.split('-')[1];
await removeDestinationDocker({ id, engine: destinationDocker.engine });
try {
if (preview) {
await removeProxyConfiguration({ domain: `${preview}.${domain}` });
} else {
await removeProxyConfiguration({ domain });
}
} catch (error) {
console.log(error);
}
}
}
}
@ -79,7 +70,7 @@ export async function removeApplication({ id, teamId }) {
export async function getApplicationWebhook({ projectId, branch }) {
try {
let body = await prisma.application.findFirst({
let applications = await prisma.application.findMany({
where: { projectId, branch },
include: {
destinationDocker: true,
@ -88,30 +79,40 @@ export async function getApplicationWebhook({ projectId, branch }) {
secrets: true
}
});
if (body.gitSource?.githubApp?.clientSecret) {
body.gitSource.githubApp.clientSecret = decrypt(body.gitSource.githubApp.clientSecret);
for (const application of applications) {
if (application.gitSource?.githubApp?.clientSecret) {
application.gitSource.githubApp.clientSecret = decrypt(
application.gitSource.githubApp.clientSecret
);
}
if (body.gitSource?.githubApp?.webhookSecret) {
body.gitSource.githubApp.webhookSecret = decrypt(body.gitSource.githubApp.webhookSecret);
if (application.gitSource?.githubApp?.webhookSecret) {
application.gitSource.githubApp.webhookSecret = decrypt(
application.gitSource.githubApp.webhookSecret
);
}
if (body.gitSource?.githubApp?.privateKey) {
body.gitSource.githubApp.privateKey = decrypt(body.gitSource.githubApp.privateKey);
if (application.gitSource?.githubApp?.privateKey) {
application.gitSource.githubApp.privateKey = decrypt(
application.gitSource.githubApp.privateKey
);
}
if (body?.gitSource?.gitlabApp?.appSecret) {
body.gitSource.gitlabApp.appSecret = decrypt(body.gitSource.gitlabApp.appSecret);
if (application?.gitSource?.gitlabApp?.appSecret) {
application.gitSource.gitlabApp.appSecret = decrypt(
application.gitSource.gitlabApp.appSecret
);
}
if (body?.gitSource?.gitlabApp?.webhookToken) {
body.gitSource.gitlabApp.webhookToken = decrypt(body.gitSource.gitlabApp.webhookToken);
if (application?.gitSource?.gitlabApp?.webhookToken) {
application.gitSource.gitlabApp.webhookToken = decrypt(
application.gitSource.gitlabApp.webhookToken
);
}
if (body?.secrets.length > 0) {
body.secrets = body.secrets.map((s) => {
if (application?.secrets.length > 0) {
application.secrets = application.secrets.map((s) => {
s.value = decrypt(s.value);
return s;
});
}
return { ...body };
}
return [...applications];
} catch (e) {
throw { status: 404, body: { message: e.message } };
}

2
src/lib/queues/index.ts
View File

@ -120,7 +120,7 @@ buildWorker.on('completed', async (job: Bullmq.Job) => {
} catch (err) {
console.log(err);
} finally {
const workdir = `/tmp/build-sources/${job.data.repository}/`;
const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
await asyncExecShell(`rm -fr ${workdir}`);
}
return;

2
src/routes/applications/[id]/configuration/_GithubRepositories.svelte
View File

@ -172,7 +172,7 @@
class="w-96"
disabled={!selected.repository}
bind:value={selected.branch}
on:change={isBranchAlreadyUsed}
on:change={() => (showSave = true)}
>
{#if !selected.repository}
<option value="" disabled selected>Select a repository first</option>

2
src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
View File

@ -305,7 +305,7 @@
name="branch"
class="w-96"
bind:value={selected.branch}
on:change={isBranchAlreadyUsed}
on:change={() => (showSave = true)}
disabled={!selected.project}
>
<option value="" disabled selected>Please select a branch</option>

51
src/routes/webhooks/github/events.ts
View File

@ -20,7 +20,6 @@ export const options: RequestHandler = async () => {
export const post: RequestHandler = async (event) => {
try {
const buildId = cuid();
const allowedGithubEvents = ['push', 'pull_request'];
const allowedActions = ['opened', 'reopened', 'synchronize', 'closed'];
const githubEvent = event.request.headers.get('x-github-event')?.toLowerCase();
@ -45,9 +44,12 @@ export const post: RequestHandler = async (event) => {
branch = body.pull_request.head.ref.split('/')[2];
}
const applicationFound = await db.getApplicationWebhook({ projectId, branch });
if (applicationFound) {
const webhookSecret = applicationFound.gitSource.githubApp.webhookSecret;
const applications = await db.getApplicationWebhook({ projectId, branch });
if (applications.length > 0) {
for (const application of applications) {
const buildId = cuid();
const webhookSecret = application.gitSource.githubApp.webhookSecret;
const hmac = crypto.createHmac('sha256', webhookSecret);
const digest = Buffer.from(
'sha256=' + hmac.update(JSON.stringify(body)).digest('hex'),
@ -66,16 +68,16 @@ export const post: RequestHandler = async (event) => {
}
if (githubEvent === 'push') {
if (!applicationFound.configHash) {
if (!application.configHash) {
const configHash = crypto
.createHash('sha256')
.update(
JSON.stringify({
buildPack: applicationFound.buildPack,
port: applicationFound.port,
installCommand: applicationFound.installCommand,
buildCommand: applicationFound.buildCommand,
startCommand: applicationFound.startCommand
buildPack: application.buildPack,
port: application.port,
installCommand: application.installCommand,
buildCommand: application.buildCommand,
startCommand: application.startCommand
})
)
.digest('hex');
@ -85,13 +87,13 @@ export const post: RequestHandler = async (event) => {
});
}
await db.prisma.application.update({
where: { id: applicationFound.id },
where: { id: application.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_commit',
...applicationFound
...application
});
return {
status: 200,
@ -112,11 +114,11 @@ export const post: RequestHandler = async (event) => {
};
}
if (applicationFound.settings.previews) {
if (applicationFound.destinationDockerId) {
if (application.settings.previews) {
if (application.destinationDockerId) {
const isRunning = await checkContainer(
applicationFound.destinationDocker.engine,
applicationFound.id
application.destinationDocker.engine,
application.id
);
if (!isRunning) {
return {
@ -133,13 +135,13 @@ export const post: RequestHandler = async (event) => {
pullmergeRequestAction === 'synchronize'
) {
await db.prisma.application.update({
where: { id: applicationFound.id },
where: { id: application.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_pr',
...applicationFound,
...application,
sourceBranch,
pullmergeRequestId
});
@ -150,9 +152,9 @@ export const post: RequestHandler = async (event) => {
}
};
} else if (pullmergeRequestAction === 'closed') {
if (applicationFound.destinationDockerId) {
const id = `${applicationFound.id}-${pullmergeRequestId}`;
const engine = applicationFound.destinationDocker.engine;
if (application.destinationDockerId) {
const id = `${application.id}-${pullmergeRequestId}`;
const engine = application.destinationDocker.engine;
await removeDestinationDocker({ id, engine });
}
return {
@ -178,6 +180,13 @@ export const post: RequestHandler = async (event) => {
message: 'Not handled event.'
}
};
}
return {
status: 500,
body: {
message: 'No applications configured in Coolify.'
}
};
} catch (err) {
console.log(err);
return {

60
src/routes/webhooks/gitlab/events.ts
View File

@ -21,25 +21,27 @@ export const options: RequestHandler = async () => {
export const post: RequestHandler = async (event) => {
const allowedActions = ['opened', 'reopen', 'close', 'open', 'update'];
const body = await event.request.json();
const buildId = cuid();
try {
const { object_kind: objectKind } = body;
if (objectKind === 'push') {
const { ref } = body;
const projectId = Number(body['project_id']);
const branch = ref.split('/')[2];
const applicationFound = await db.getApplicationWebhook({ projectId, branch });
if (applicationFound) {
if (!applicationFound.configHash) {
const applications = await db.getApplicationWebhook({ projectId, branch });
if (applications.length > 0) {
for (const application of applications) {
const buildId = cuid();
if (!application.configHash) {
const configHash = crypto
.createHash('sha256')
.update(
JSON.stringify({
buildPack: applicationFound.buildPack,
port: applicationFound.port,
installCommand: applicationFound.installCommand,
buildCommand: applicationFound.buildCommand,
startCommand: applicationFound.startCommand
buildPack: application.buildPack,
port: application.port,
installCommand: application.installCommand,
buildCommand: application.buildCommand,
startCommand: application.startCommand
})
)
.digest('hex');
@ -49,14 +51,16 @@ export const post: RequestHandler = async (event) => {
});
}
await db.prisma.application.update({
where: { id: applicationFound.id },
where: { id: application.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_commit',
...applicationFound
...application
});
}
return {
status: 200,
body: {
@ -64,6 +68,12 @@ export const post: RequestHandler = async (event) => {
}
};
}
return {
status: 500,
body: {
message: 'No applications configured in Coolify.'
}
};
} else if (objectKind === 'merge_request') {
const webhookToken = event.request.headers.get('x-gitlab-token');
if (!webhookToken) {
@ -98,13 +108,15 @@ export const post: RequestHandler = async (event) => {
};
}
const applicationFound = await db.getApplicationWebhook({ projectId, branch: targetBranch });
if (applicationFound) {
if (applicationFound.settings.previews) {
if (applicationFound.destinationDockerId) {
const applications = await db.getApplicationWebhook({ projectId, branch: targetBranch });
if (applications.length > 0) {
for (const application of applications) {
const buildId = cuid();
if (application.settings.previews) {
if (application.destinationDockerId) {
const isRunning = await checkContainer(
applicationFound.destinationDocker.engine,
applicationFound.id
application.destinationDocker.engine,
application.id
);
if (!isRunning) {
return {
@ -115,7 +127,7 @@ export const post: RequestHandler = async (event) => {
};
}
}
if (!dev && applicationFound.gitSource.gitlabApp.webhookToken !== webhookToken) {
if (!dev && application.gitSource.gitlabApp.webhookToken !== webhookToken) {
return {
status: 500,
body: {
@ -130,13 +142,13 @@ export const post: RequestHandler = async (event) => {
action === 'update'
) {
await db.prisma.application.update({
where: { id: applicationFound.id },
where: { id: application.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_mr',
...applicationFound,
...application,
sourceBranch,
pullmergeRequestId
});
@ -147,9 +159,9 @@ export const post: RequestHandler = async (event) => {
}
};
} else if (action === 'close') {
if (applicationFound.destinationDockerId) {
const id = `${applicationFound.id}-${pullmergeRequestId}`;
const engine = applicationFound.destinationDocker.engine;
if (application.destinationDockerId) {
const id = `${application.id}-${pullmergeRequestId}`;
const engine = application.destinationDocker.engine;
await removeDestinationDocker({ id, engine });
}
@ -161,6 +173,8 @@ export const post: RequestHandler = async (event) => {
};
}
}
}
return {
status: 500,
body: {