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

Remove check for deployer version number
All checks were successful
Lint / lint (20.x) (pull_request) Successful in 1m46s
Details

Browse Source
This commit is contained in:
IshaVenikar 2025-02-06 19:02:57 +05:30
parent 4476de6faf
commit b5d84470ff
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,10 @@ export class Database {
id: projectId id: projectId
}, },
...filter ...filter
} },
order: {
createdAt: 'DESC',
},
}); });
return domains; return domains;

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

@ -262,6 +262,7 @@ export class Service {
const previousDnsSet = new Set( const previousDnsSet = new Set(
previousDnsList.split(',').map((item) => item.trim()), previousDnsList.split(',').map((item) => item.trim()),
); );
const newDnsSet = new Set( const newDnsSet = new Set(
newDnsList.split(',').map((item) => item.trim()), newDnsList.split(',').map((item) => item.trim()),
); );
@ -756,7 +757,7 @@ export class Service {
true, true,
); );
const dns = await this.getDnsForDeployerByProjectId(data.project.id!, deployer!.version, canonicalDeployment.project.name) const dns = await this.getDnsForDeployerByProjectId(data.project.id!, deployer!.version, 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
@ -854,6 +855,7 @@ export class Service {
applicationRecordData, applicationRecordData,
false, 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!);
@ -867,12 +869,10 @@ export class Service {
applicationRecordData, applicationRecordData,
true, 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 customDomains = await this.db.getDomainsByProjectId(project!.id!); const dns = await this.getDnsForDeployerByProjectId(project.id!, deployer.version, project.name!);
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 { const {
@ -1748,7 +1748,8 @@ export class Service {
let dns; let dns;
// 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
// Only deployers with version > 1 support multiple custom domains // Only deployers with version > 1 support multiple custom domains
if (deployerVersion && Number(deployerVersion) >= 1) { // TODO: Check version number
if (deployerVersion) {
const customDomains = await this.db.getDomainsByProjectId( const customDomains = await this.db.getDomainsByProjectId(
projectId, projectId,
); );