Remove check for deployer version number
All checks were successful
Lint / lint (20.x) (pull_request) Successful in 1m46s
All checks were successful
Lint / lint (20.x) (pull_request) Successful in 1m46s
This commit is contained in:
parent
4476de6faf
commit
b5d84470ff
@ -613,7 +613,10 @@ export class Database {
|
||||
id: projectId
|
||||
},
|
||||
...filter
|
||||
}
|
||||
},
|
||||
order: {
|
||||
createdAt: 'DESC',
|
||||
},
|
||||
});
|
||||
|
||||
return domains;
|
||||
|
@ -262,6 +262,7 @@ export class Service {
|
||||
const previousDnsSet = new Set(
|
||||
previousDnsList.split(',').map((item) => item.trim()),
|
||||
);
|
||||
|
||||
const newDnsSet = new Set(
|
||||
newDnsList.split(',').map((item) => item.trim()),
|
||||
);
|
||||
@ -756,7 +757,7 @@ export class Service {
|
||||
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
|
||||
// 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,
|
||||
false,
|
||||
);
|
||||
|
||||
const address = await this.getAddress();
|
||||
|
||||
const environmentVariablesObj = await this.getEnvVariables(project!.id!);
|
||||
@ -867,12 +869,10 @@ export class Service {
|
||||
applicationRecordData,
|
||||
true,
|
||||
);
|
||||
|
||||
// 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 =
|
||||
customDomains.length > 0
|
||||
? customDomains.map((d) => d.name).join(',')
|
||||
: `${canonicalDeployment.project.name}`;
|
||||
const dns = await this.getDnsForDeployerByProjectId(project.id!, deployer.version, project.name!);
|
||||
|
||||
// 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
|
||||
const {
|
||||
@ -1748,7 +1748,8 @@ export class Service {
|
||||
let dns;
|
||||
// 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
|
||||
if (deployerVersion && Number(deployerVersion) >= 1) {
|
||||
// TODO: Check version number
|
||||
if (deployerVersion) {
|
||||
const customDomains = await this.db.getDomainsByProjectId(
|
||||
projectId,
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user