Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions src/modules/scf/entities/alias.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,21 @@ import BaseEntity from './base';

export default class AliasEntity extends BaseEntity {
async create(inputs: ScfCreateAlias) {
const publishInputs = {
const publishInputs: any = {
Action: 'CreateAlias' as const,
FunctionName: inputs.functionName,
FunctionVersion: inputs.functionVersion,
FunctionVersion: inputs.functionVersion || '$LATEST',
Name: inputs.aliasName,
Namespace: inputs.namespace || 'default',
RoutingConfig: {
AdditionalVersionWeights: [{ Version: inputs.lastVersion, Weight: inputs.traffic }],
},
Description: inputs.description || 'Published by Serverless Component',
};
if (inputs.lastVersion && inputs.traffic) {
publishInputs.RoutingConfig = {
AdditionalVersionWeights: [
{ Version: inputs.lastVersion, Weight: strip(1 - inputs.traffic) },
],
};
}
const Response = await this.request(publishInputs);
return Response;
}
Expand Down
61 changes: 49 additions & 12 deletions src/modules/scf/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,19 +321,56 @@ export default class Scf {
});
}

const aliasAddionalVersion = inputs.aliasAddionalVersion || inputs.lastVersion;
const needSetTraffic =
inputs.traffic != null && inputs.lastVersion && inputs.lastVersion !== '$LATEST';
if (needSetTraffic) {
await this.alias.update({
namespace,
functionName,
region: this.region,
additionalVersions: needSetTraffic
? [{ weight: strip(1 - inputs.traffic!), version: inputs.lastVersion! }]
: [],
aliasName: inputs.aliasName,
description: inputs.aliasDescription,
});
inputs.traffic != null && aliasAddionalVersion && aliasAddionalVersion !== '$LATEST';
const needSetAlias = (inputs.aliasName && inputs.aliasName !== '$DEFAULT') || needSetTraffic;
if (needSetAlias) {
let needCreateAlias = false;
if (inputs.aliasName && inputs.aliasName !== '$DEFAULT') {
try {
const aliasInfo = await this.alias.get({
namespace,
functionName,
region: this.region,
aliasName: inputs.aliasName,
});
if (!aliasInfo?.Name) {
needCreateAlias = true;
}
} catch (error: any) {
if (
error.message &&
(error.message.includes('未找到指定的') || error.message.include('is not found'))
) {
needCreateAlias = true;
}
}
}
if (needCreateAlias) {
await this.alias.create({
namespace,
functionName,
functionVersion: inputs.aliasFunctionVersion || funcInfo?.Qualifier,
aliasName: inputs.aliasName!,
lastVersion: aliasAddionalVersion!,
traffic: inputs.traffic!,
description: inputs.aliasDescription,
});
} else {
await this.alias.update({
namespace,
functionName,
functionVersion: inputs.aliasFunctionVersion || funcInfo?.Qualifier,
additionalVersions: needSetTraffic
? [{ weight: strip(1 - inputs.traffic!), version: aliasAddionalVersion! }]
: [],
region: this.region,
aliasName: inputs.aliasName,
description: inputs.aliasDescription,
});
}

outputs.Traffic = inputs.traffic;
outputs.ConfigTrafficVersion = inputs.lastVersion;
}
Expand Down
4 changes: 3 additions & 1 deletion src/modules/scf/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export interface ScfListAliasInputs extends ScfGetAliasInputs {}

export interface ScfCreateAlias {
functionName: string;
functionVersion: string;
functionVersion?: string;
aliasName: string;
namespace?: string;
lastVersion: string;
Expand Down Expand Up @@ -279,6 +279,8 @@ export interface ScfDeployInputs extends ScfCreateFunctionInputs {

aliasName?: string;
aliasDescription?: string;
aliasFunctionVersion?: string;
aliasAddionalVersion?: string;

tags?: Record<string, string>;

Expand Down