Commit 9fa660bc authored by xsahxl's avatar xsahxl
Browse files

fix: :bug: getAccountId兼容临时密钥

Showing with 8 additions and 29 deletions
+8 -29
{
"name": "@serverless-devs/s",
"version": "2.0.97",
"version": "2.0.98-beta.1",
"description": "Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",
"homepage": "https://www.serverless-devs.com",
"keywords": [
......@@ -93,6 +93,6 @@
]
},
"dependencies": {
"@serverless-devs/core": "latest"
"@serverless-devs/core": "beta"
}
}
......@@ -83,39 +83,21 @@ program
if (AccountID) {
keyInformation['AccountID'] = AccountID;
}
const akRegx = /^[A-Za-z0-9-]+$/;
if (AccessKeyID) {
if (akRegx.test(AccessKeyID)) {
keyInformation['AccessKeyID'] = AccessKeyID;
} else {
new HumanError({
errorMessage: 'Your AccessKeyID id is not correct.',
tips: `Please check if your AccessKeyID is correct. documents: ${colors.underline(
'https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/default_provider_config/alibabacloud.md',
)}`,
});
process.exit(1);
}
keyInformation['AccessKeyID'] = AccessKeyID;
}
if (AccessKeySecret) {
if (akRegx.test(AccessKeySecret)) {
keyInformation['AccessKeySecret'] = AccessKeySecret;
} else {
new HumanError({
errorMessage: 'Your AccessKeySecret id is not correct.',
tips: `Please check if your AccessKeySecret is correct. documents: ${colors.underline(
'https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/default_provider_config/alibabacloud.md',
)}`,
});
process.exit(1);
}
keyInformation['AccessKeySecret'] = AccessKeySecret;
}
if (SecurityToken) {
keyInformation['SecurityToken'] = SecurityToken;
}
// 同时存在ak/sk 认为是阿里云密钥
if (AccessKeyID && AccessKeySecret) {
try {
const data = await getAccountId({ AccessKeyID, AccessKeySecret });
const data = await getAccountId({ AccessKeyID, AccessKeySecret, SecurityToken });
keyInformation['AccountID'] = data.AccountId;
} catch (error) {
if (!f) {
......@@ -129,9 +111,6 @@ program
}
}
}
if (SecurityToken) {
keyInformation['SecurityToken'] = SecurityToken;
}
if (SecretAccessKey) {
keyInformation['SecretAccessKey'] = SecretAccessKey;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment