Skip to content

fix: 修改更新逻辑,完成旧版本兼容 #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 11, 2022
Merged

fix: 修改更新逻辑,完成旧版本兼容 #270

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
929ca00
fix: 修改更新逻辑,完成旧版本兼容
Jan 10, 2022
53f4568
fix: 完善更新逻辑,兼容老项目
Jan 10, 2022
94f0b94
fix: 修改output输出服务名
Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/modules/apigw/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ export default class Apigw {
oldState = {},
serviceId,
isAutoRelease = true,
serviceName,
serviceDesc,
} = inputs;
inputs.protocols = getProtocolString(inputs.protocols as ('http' | 'https')[]);

Expand All @@ -248,6 +250,27 @@ export default class Apigw {

const detail = await this.service.getById(serviceId);
if (detail) {
// 如果 serviceName，serviceDesc，protocols任意字段更新了，则更新服务
if (
!(serviceName === detail.ServiceName && serviceDesc === detail.ServiceDesc) &&
!(serviceName === undefined && serviceDesc === undefined)
) {
const apiInputs = {
Action: 'ModifyService' as const,
serviceId,
serviceDesc: serviceDesc || detail.ServiceDesc || undefined,
serviceName: serviceName || detail.ServiceName || undefined,
};
if (!serviceName) {
delete apiInputs.serviceName;
}
if (!serviceDesc) {
delete apiInputs.serviceDesc;
}

await this.request(apiInputs);
}

const apiList: ApiEndpoint[] = await this.api.bulkDeploy({
apiList: endpoints,
stateList: stateApiList,
Expand All @@ -269,7 +292,7 @@ export default class Apigw {
const outputs: ApigwDeployOutputs = {
created: false,
serviceId,
serviceName: detail.ServiceName,
serviceName: serviceName || detail.ServiceName,
subDomain: subDomain,
protocols: inputs.protocols,
environment: environment,
Expand All @@ -291,7 +314,8 @@ export default class Apigw {
}));
}

return this.formatApigwOutputs(outputs);
// return this.formatApigwOutputs(outputs);
return outputs;
}
throw new ApiError({
type: 'API_APIGW_DescribeService',
Expand Down