cerc-io/snowballtools-base
11
0
Fork 3
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Send multiple domains in deployment request

Browse Source
This commit is contained in:
IshaVenikar 2025-02-05 10:49:09 +05:30
parent 285d0e86bf
commit d75be96d70
2 changed files with 177 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/backend/src/database.ts
View File

@ -619,25 +619,6 @@ export class Database {
return domains; return domains;
} }
async getOldestDomainByProjectId(
projectId: string,
): Promise<Domain | null> {
const domainRepository = this.dataSource.getRepository(Domain);
const domain = await domainRepository.findOne({
where: {
project: {
id: projectId
},
},
order: {
createdAt: 'ASC'
}
});
return domain;
}
async getLatestDNSRecordByProjectId( async getLatestDNSRecordByProjectId(
projectId: string, projectId: string,
): Promise<DNSRecordAttributes | null> { ): Promise<DNSRecordAttributes | null> {

198
packages/backend/src/service.ts
View File

@ -7,7 +7,12 @@ import { DateTime } from 'luxon';
import { OAuthApp } from '@octokit/oauth-app'; import { OAuthApp } from '@octokit/oauth-app';
import { Database } from './database'; import { Database } from './database';
import { ApplicationRecord, Deployment, DeploymentStatus, Environment } from './entity/Deployment'; import {
ApplicationRecord,
Deployment,
DeploymentStatus,
Environment,
} from './entity/Deployment';
import { Domain } from './entity/Domain'; import { Domain } from './entity/Domain';
import { EnvironmentVariable } from './entity/EnvironmentVariable'; import { EnvironmentVariable } from './entity/EnvironmentVariable';
import { Organization } from './entity/Organization'; import { Organization } from './entity/Organization';
@ -119,7 +124,8 @@ export class Service {
} }
// Fetch ApplicationDeploymentRecord for deployments // Fetch ApplicationDeploymentRecord for deployments
const records = await this.laconicRegistry.getDeploymentRecords(deployments); const records =
await this.laconicRegistry.getDeploymentRecords(deployments);
log(`Found ${records.length} ApplicationDeploymentRecords`); log(`Found ${records.length} ApplicationDeploymentRecords`);
// Update deployments for which ApplicationDeploymentRecords were returned // Update deployments for which ApplicationDeploymentRecords were returned
@ -204,7 +210,9 @@ export class Service {
return; return;
} }
const registryRecord = await this.laconicRegistry.getRecordById(record.attributes.dns); const registryRecord = await this.laconicRegistry.getRecordById(
record.attributes.dns,
);
if (!registryRecord) { if (!registryRecord) {
log(`DNS record not found for deployment ${deployment.id}`); log(`DNS record not found for deployment ${deployment.id}`);
@ -219,7 +227,7 @@ export class Service {
resourceType: dnsRecord.attributes.resource_type, resourceType: dnsRecord.attributes.resource_type,
value: dnsRecord.attributes.value, value: dnsRecord.attributes.value,
version: dnsRecord.attributes.version, version: dnsRecord.attributes.version,
} };
deployment.applicationDeploymentRecordId = record.id; deployment.applicationDeploymentRecordId = record.id;
deployment.applicationDeploymentRecordData = record.attributes; deployment.applicationDeploymentRecordData = record.attributes;
@ -239,18 +247,21 @@ export class Service {
relations: { relations: {
project: true, project: true,
deployer: true, deployer: true,
} },
}); });
if (previousCanonicalDeployment) { if (previousCanonicalDeployment) {
// Send removal request for the previous canonical deployment and delete DB entry // Send removal request for the previous canonical deployment and delete DB entry
if (previousCanonicalDeployment.url !== deployment.url) { if (previousCanonicalDeployment.url !== deployment.url) {
await this.laconicRegistry.createApplicationDeploymentRemovalRequest({ await this.laconicRegistry.createApplicationDeploymentRemovalRequest(
deploymentId: previousCanonicalDeployment.applicationDeploymentRecordId!, {
deploymentId:
previousCanonicalDeployment.applicationDeploymentRecordId!,
deployerLrn: previousCanonicalDeployment.deployer.deployerLrn, deployerLrn: previousCanonicalDeployment.deployer.deployerLrn,
auctionId: previousCanonicalDeployment.project.auctionId, auctionId: previousCanonicalDeployment.project.auctionId,
payment: previousCanonicalDeployment.project.txHash payment: previousCanonicalDeployment.project.txHash,
}); },
);
} }
await this.db.deleteDeploymentById(previousCanonicalDeployment.id); await this.db.deleteDeploymentById(previousCanonicalDeployment.id);
@ -261,7 +272,9 @@ export class Service {
// Release deployer funds on successful deployment // Release deployer funds on successful deployment
if (!deployment.project.fundsReleased) { if (!deployment.project.fundsReleased) {
const fundsReleased = await this.releaseDeployerFundsByProjectId(deployment.projectId); const fundsReleased = await this.releaseDeployerFundsByProjectId(
deployment.projectId,
);
// Return remaining amount to owner // Return remaining amount to owner
await this.returnUserFundsByProjectId(deployment.projectId, true); await this.returnUserFundsByProjectId(deployment.projectId, true);
@ -485,12 +498,17 @@ export class Service {
return dbProjects; return dbProjects;
} }
async getNonCanonicalDeploymentsByProjectId(projectId: string): Promise<Deployment[]> { async getNonCanonicalDeploymentsByProjectId(
const nonCanonicalDeployments = await this.db.getNonCanonicalDeploymentsByProjectId(projectId); projectId: string,
): Promise<Deployment[]> {
const nonCanonicalDeployments =
await this.db.getNonCanonicalDeploymentsByProjectId(projectId);
return nonCanonicalDeployments; return nonCanonicalDeployments;
} }
async getLatestDNSRecordByProjectId(projectId: string): Promise<DNSRecordAttributes | null> { async getLatestDNSRecordByProjectId(
projectId: string,
): Promise<DNSRecordAttributes | null> {
const dnsRecord = await this.db.getLatestDNSRecordByProjectId(projectId); const dnsRecord = await this.db.getLatestDNSRecordByProjectId(projectId);
return dnsRecord; return dnsRecord;
} }
@ -655,7 +673,7 @@ export class Service {
environment: Environment.Production, environment: Environment.Production,
commitHash: oldDeployment.commitHash, commitHash: oldDeployment.commitHash,
commitMessage: oldDeployment.commitMessage, commitMessage: oldDeployment.commitMessage,
deployer: oldDeployment.deployer deployer: oldDeployment.deployer,
}); });
} }
return newDeployment; return newDeployment;
@ -665,7 +683,7 @@ export class Service {
userId: string, userId: string,
octokit: Octokit, octokit: Octokit,
data: DeepPartial<Deployment>, data: DeepPartial<Deployment>,
deployerLrn?: string deployerLrn?: string,
): Promise<Deployment> { ): Promise<Deployment> {
assert(data.project?.repository, 'Project repository not found'); assert(data.project?.repository, 'Project repository not found');
log( log(
@ -688,33 +706,61 @@ export class Service {
deployer = data.deployer; deployer = data.deployer;
} }
const deployment = await this.createDeploymentFromData(userId, data, deployer!.deployerLrn!, applicationRecordId, applicationRecordData, false); const deployment = await this.createDeploymentFromData(
userId,
data,
deployer!.deployerLrn!,
applicationRecordId,
applicationRecordData,
false,
);
const address = await this.getAddress(); const address = await this.getAddress();
const { repo, repoUrl } = await getRepoDetails(octokit, data.project.repository, data.commitHash); const { repo, repoUrl } = await getRepoDetails(
const environmentVariablesObj = await this.getEnvVariables(data.project!.id!); octokit,
data.project.repository,
data.commitHash,
);
const environmentVariablesObj = await this.getEnvVariables(
data.project!.id!,
);
// To set project DNS // To set project DNS
if (data.environment === Environment.Production) { if (data.environment === Environment.Production) {
const canonicalDeployment = await this.createDeploymentFromData(userId, data, deployer!.deployerLrn!, applicationRecordId, applicationRecordData, true); const canonicalDeployment = await this.createDeploymentFromData(
userId,
data,
deployer!.deployerLrn!,
applicationRecordId,
applicationRecordData,
true,
);
// If a custom domain is present then use that as the DNS in the deployment request // If a custom domain is present then use that as the DNS in the deployment request
const customDomain = await this.db.getOldestDomainByProjectId(data.project!.id!); const customDomains = await this.db.getDomainsByProjectId(
data.project!.id!,
);
const dns =
customDomains.length > 0
? customDomains.map((d) => d.name).join(',')
: `${canonicalDeployment.project.name}`;
// On deleting deployment later, project canonical deployment is also deleted // On deleting deployment later, project canonical deployment is also deleted
// So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
const { applicationDeploymentRequestData, applicationDeploymentRequestId } = const {
await this.laconicRegistry.createApplicationDeploymentRequest({ applicationDeploymentRequestData,
applicationDeploymentRequestId,
} = await this.laconicRegistry.createApplicationDeploymentRequest({
deployment: canonicalDeployment, deployment: canonicalDeployment,
appName: repo, appName: repo,
repository: repoUrl, repository: repoUrl,
environmentVariables: environmentVariablesObj, environmentVariables: environmentVariablesObj,
dns: customDomain?.name ?? `${canonicalDeployment.project.name}`, dns,
lrn: deployer!.deployerLrn!, lrn: deployer!.deployerLrn!,
apiUrl: deployer!.deployerApiUrl!, apiUrl: deployer!.deployerApiUrl!,
payment: data.project.txHash, payment: data.project.txHash,
auctionId: data.project.auctionId, auctionId: data.project.auctionId,
requesterAddress: address, requesterAddress: address,
publicKey: deployer!.publicKey! publicKey: deployer!.publicKey!,
}); });
await this.db.updateDeploymentById(canonicalDeployment.id, { await this.db.updateDeploymentById(canonicalDeployment.id, {
@ -735,7 +781,7 @@ export class Service {
payment: data.project.txHash, payment: data.project.txHash,
auctionId: data.project.auctionId, auctionId: data.project.auctionId,
requesterAddress: address, requesterAddress: address,
publicKey: deployer!.publicKey! publicKey: deployer!.publicKey!,
}); });
await this.db.updateDeploymentById(deployment.id, { await this.db.updateDeploymentById(deployment.id, {
@ -748,7 +794,7 @@ export class Service {
async createDeploymentFromAuction( async createDeploymentFromAuction(
project: DeepPartial<Project>, project: DeepPartial<Project>,
deployer: Deployer deployer: Deployer,
): Promise<Deployment> { ): Promise<Deployment> {
const octokit = await this.getOctokit(project.ownerId!); const octokit = await this.getOctokit(project.ownerId!);
const [owner, repo] = project.repository!.split('/'); const [owner, repo] = project.repository!.split('/');
@ -774,7 +820,7 @@ export class Service {
const applicationRecordId = record.id; const applicationRecordId = record.id;
const applicationRecordData = record.attributes; const applicationRecordData = record.attributes;
const deployerLrn = deployer!.deployerLrn const deployerLrn = deployer!.deployerLrn;
// Create deployment with prod branch and latest commit // Create deployment with prod branch and latest commit
const deploymentData = { const deploymentData = {
@ -786,30 +832,49 @@ export class Service {
commitMessage: latestCommit.commit.message, commitMessage: latestCommit.commit.message,
}; };
const deployment = await this.createDeploymentFromData(project.ownerId!, deploymentData, deployerLrn, applicationRecordId, applicationRecordData, false); const deployment = await this.createDeploymentFromData(
project.ownerId!,
deploymentData,
deployerLrn,
applicationRecordId,
applicationRecordData,
false,
);
const address = await this.getAddress(); const address = await this.getAddress();
const environmentVariablesObj = await this.getEnvVariables(project!.id!); const environmentVariablesObj = await this.getEnvVariables(project!.id!);
// To set project DNS // To set project DNS
if (deploymentData.environment === Environment.Production) { if (deploymentData.environment === Environment.Production) {
const canonicalDeployment = await this.createDeploymentFromData(project.ownerId!, deploymentData, deployerLrn, applicationRecordId, applicationRecordData, true); const canonicalDeployment = await this.createDeploymentFromData(
project.ownerId!,
deploymentData,
deployerLrn,
applicationRecordId,
applicationRecordData,
true,
);
// If a custom domain is present then use that as the DNS in the deployment request // If a custom domain is present then use that as the DNS in the deployment request
const customDomain = await this.db.getOldestDomainByProjectId(project!.id!); const customDomains = await this.db.getDomainsByProjectId(project!.id!);
const dns =
customDomains.length > 0
? customDomains.map((d) => d.name).join(',')
: `${canonicalDeployment.project.name}`;
// On deleting deployment later, project canonical deployment is also deleted // On deleting deployment later, project canonical deployment is also deleted
// So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
const { applicationDeploymentRequestId, applicationDeploymentRequestData } = const {
await this.laconicRegistry.createApplicationDeploymentRequest({ applicationDeploymentRequestId,
applicationDeploymentRequestData,
} = await this.laconicRegistry.createApplicationDeploymentRequest({
deployment: canonicalDeployment, deployment: canonicalDeployment,
appName: repo, appName: repo,
repository: repoUrl, repository: repoUrl,
environmentVariables: environmentVariablesObj, environmentVariables: environmentVariablesObj,
dns: customDomain?.name ?? `${canonicalDeployment.project.name}`, dns,
auctionId: project.auctionId!, auctionId: project.auctionId!,
lrn: deployerLrn, lrn: deployerLrn,
apiUrl: deployer!.deployerApiUrl!, apiUrl: deployer!.deployerApiUrl!,
requesterAddress: address, requesterAddress: address,
publicKey: deployer!.publicKey! publicKey: deployer!.publicKey!,
}); });
await this.db.updateDeploymentById(canonicalDeployment.id, { await this.db.updateDeploymentById(canonicalDeployment.id, {
@ -830,7 +895,7 @@ export class Service {
environmentVariables: environmentVariablesObj, environmentVariables: environmentVariablesObj,
dns: `${deployment.project.name}-${deployment.id}`, dns: `${deployment.project.name}-${deployment.id}`,
requesterAddress: address, requesterAddress: address,
publicKey: deployer!.publicKey! publicKey: deployer!.publicKey!,
}); });
await this.db.updateDeploymentById(deployment.id, { await this.db.updateDeploymentById(deployment.id, {
@ -864,7 +929,7 @@ export class Service {
deployer: Object.assign(new Deployer(), { deployer: Object.assign(new Deployer(), {
deployerLrn, deployerLrn,
}), }),
isCanonical isCanonical,
}); });
log(`Created deployment ${newDeployment.id}`); log(`Created deployment ${newDeployment.id}`);
@ -874,11 +939,11 @@ export class Service {
async updateProjectWithDeployer( async updateProjectWithDeployer(
projectId: string, projectId: string,
deployer: Deployer deployer: Deployer,
): Promise<Deployer> { ): Promise<Deployer> {
const deploymentProject = await this.db.getProjects({ const deploymentProject = await this.db.getProjects({
where: { id: projectId }, where: { id: projectId },
relations: ['deployers'] relations: ['deployers'],
}); });
if (!deploymentProject[0].deployers) { if (!deploymentProject[0].deployers) {
@ -923,15 +988,22 @@ export class Service {
const prodBranch = createdTemplateRepo.data.default_branch ?? 'main'; const prodBranch = createdTemplateRepo.data.default_branch ?? 'main';
const project = await this.addProject(user, organizationSlug, { const project = await this.addProject(
user,
organizationSlug,
{
name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`, name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`,
prodBranch, prodBranch,
repository: gitRepo.data.full_name, repository: gitRepo.data.full_name,
// TODO: Set selected template // TODO: Set selected template
template: 'webapp', template: 'webapp',
paymentAddress: data.paymentAddress, paymentAddress: data.paymentAddress,
txHash: data.txHash txHash: data.txHash,
}, lrn, auctionParams, environmentVariables); },
lrn,
auctionParams,
environmentVariables,
);
if (!project || !project.id) { if (!project || !project.id) {
throw new Error('Failed to create project from template'); throw new Error('Failed to create project from template');
@ -1172,19 +1244,20 @@ export class Service {
let newDeployment: Deployment; let newDeployment: Deployment;
if (oldDeployment.project.auctionId) { if (oldDeployment.project.auctionId) {
newDeployment = await this.createDeploymentFromAuction(oldDeployment.project, oldDeployment.deployer); newDeployment = await this.createDeploymentFromAuction(
oldDeployment.project,
oldDeployment.deployer,
);
} else { } else {
newDeployment = await this.createDeployment(user.id, octokit, newDeployment = await this.createDeployment(user.id, octokit, {
{
project: oldDeployment.project, project: oldDeployment.project,
// TODO: Put isCurrent field in project // TODO: Put isCurrent field in project
branch: oldDeployment.branch, branch: oldDeployment.branch,
environment: Environment.Production, environment: Environment.Production,
commitHash: oldDeployment.commitHash, commitHash: oldDeployment.commitHash,
commitMessage: oldDeployment.commitMessage, commitMessage: oldDeployment.commitMessage,
deployer: oldDeployment.deployer deployer: oldDeployment.deployer,
} });
);
} }
return newDeployment; return newDeployment;
@ -1231,18 +1304,24 @@ export class Service {
return false; return false;
} }
const newCurrentDeployment = await this.db.getDeployment({ where: { id: deploymentId }, relations: { project: true, deployer: true } }); const newCurrentDeployment = await this.db.getDeployment({
where: { id: deploymentId },
relations: { project: true, deployer: true },
});
if (!newCurrentDeployment) { if (!newCurrentDeployment) {
throw new Error(`Deployment with Id ${deploymentId} not found`); throw new Error(`Deployment with Id ${deploymentId} not found`);
} }
const applicationDeploymentRequestData = newCurrentDeployment.applicationDeploymentRequestData; const applicationDeploymentRequestData =
newCurrentDeployment.applicationDeploymentRequestData;
const customDomain = await this.db.getOldestDomainByProjectId(projectId); const customDomains = await this.db.getDomainsByProjectId(projectId);
if (customDomain && applicationDeploymentRequestData) { if (customDomains.length > 0 && applicationDeploymentRequestData) {
applicationDeploymentRequestData.dns = customDomain.name applicationDeploymentRequestData.dns = customDomains
.map((d) => d.name)
.join(',');
} }
// Create a canonical deployment for the new current deployment // Create a canonical deployment for the new current deployment
@ -1258,20 +1337,23 @@ export class Service {
applicationDeploymentRequestData!.meta = JSON.stringify({ applicationDeploymentRequestData!.meta = JSON.stringify({
...JSON.parse(applicationDeploymentRequestData!.meta), ...JSON.parse(applicationDeploymentRequestData!.meta),
note: `Updated by Snowball @ ${DateTime.utc().toFormat( note: `Updated by Snowball @ ${DateTime.utc().toFormat(
"EEE LLL dd HH:mm:ss 'UTC' yyyy" "EEE LLL dd HH:mm:ss 'UTC' yyyy",
)}` )}`,
}); });
const result = await this.laconicRegistry.publishRecord( const result = await this.laconicRegistry.publishRecord(
applicationDeploymentRequestData, applicationDeploymentRequestData,
); );
log(`Application deployment request record published: ${result.id}`) log(`Application deployment request record published: ${result.id}`);
const updateResult = await this.db.updateDeploymentById(canonicalDeployment.id, { const updateResult = await this.db.updateDeploymentById(
canonicalDeployment.id,
{
applicationDeploymentRequestId: result.id, applicationDeploymentRequestId: result.id,
applicationDeploymentRequestData, applicationDeploymentRequestData,
}); },
);
return updateResult; return updateResult;
} }