@serverless-devs/s 2.1.10-beta.3 → 2.1.11-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/add/index.js +11 -11
- package/lib/index.js +102 -102
- package/lib/utils/common.js +11 -2
- package/package.json +1 -1
package/lib/config/add/index.js
CHANGED
|
@@ -87,12 +87,12 @@ function run(program) {
|
|
|
87
87
|
});
|
|
88
88
|
}); });
|
|
89
89
|
var doAction = function (options) { return __awaiter(_this, void 0, void 0, function () {
|
|
90
|
-
var argvData, AccountID, AccessKeyID, AccessKeySecret, SecretAccessKey, AccessKey, SecretKey, PrivateKeyData, SecretID, keyList, infoList, SecurityToken, f, access, aliasName, help, keyInformation, infoKeyList, infoValueList, i, data, error_4;
|
|
91
|
-
return __generator(this, function (
|
|
92
|
-
switch (
|
|
90
|
+
var argvData, AccountID, AccessKeyID, AccessKeySecret, SecretAccessKey, AccessKey, SecretKey, PrivateKeyData, SecretID, _a, keyList, _b, infoList, SecurityToken, f, access, aliasName, help, keyInformation, infoKeyList, infoValueList, i, data, error_4;
|
|
91
|
+
return __generator(this, function (_c) {
|
|
92
|
+
switch (_c.label) {
|
|
93
93
|
case 0:
|
|
94
94
|
argvData = core_1.default.getGlobalArgs(process.argv.slice(2));
|
|
95
|
-
AccountID = argvData.AccountID, AccessKeyID = argvData.AccessKeyID, AccessKeySecret = argvData.AccessKeySecret, SecretAccessKey = argvData.SecretAccessKey, AccessKey = argvData.AccessKey, SecretKey = argvData.SecretKey, PrivateKeyData = argvData.PrivateKeyData, SecretID = argvData.SecretID,
|
|
95
|
+
AccountID = argvData.AccountID, AccessKeyID = argvData.AccessKeyID, AccessKeySecret = argvData.AccessKeySecret, SecretAccessKey = argvData.SecretAccessKey, AccessKey = argvData.AccessKey, SecretKey = argvData.SecretKey, PrivateKeyData = argvData.PrivateKeyData, SecretID = argvData.SecretID, _a = argvData.keyList, keyList = _a === void 0 ? (0, utils_1.getParams)('-kl') : _a, _b = argvData.infoList, infoList = _b === void 0 ? (0, utils_1.getParams)('-il') : _b, SecurityToken = argvData.SecurityToken, f = argvData.f, access = argvData.access, aliasName = argvData.aliasName, help = argvData.help;
|
|
96
96
|
help && command.help();
|
|
97
97
|
keyInformation = {};
|
|
98
98
|
if (keyList && infoList) {
|
|
@@ -117,16 +117,16 @@ function run(program) {
|
|
|
117
117
|
keyInformation['SecurityToken'] = SecurityToken;
|
|
118
118
|
}
|
|
119
119
|
if (!(AccessKeyID && AccessKeySecret && !AccountID)) return [3 /*break*/, 4];
|
|
120
|
-
|
|
120
|
+
_c.label = 1;
|
|
121
121
|
case 1:
|
|
122
|
-
|
|
122
|
+
_c.trys.push([1, 3, , 4]);
|
|
123
123
|
return [4 /*yield*/, getAccountId({ AccessKeyID: AccessKeyID, AccessKeySecret: AccessKeySecret, SecurityToken: SecurityToken })];
|
|
124
124
|
case 2:
|
|
125
|
-
data =
|
|
125
|
+
data = _c.sent();
|
|
126
126
|
keyInformation['AccountID'] = data.AccountId;
|
|
127
127
|
return [3 /*break*/, 4];
|
|
128
128
|
case 3:
|
|
129
|
-
error_4 =
|
|
129
|
+
error_4 = _c.sent();
|
|
130
130
|
if (!f) {
|
|
131
131
|
new error_2.HumanWarning({
|
|
132
132
|
warningMessage: 'You may be configuring an incorrect Alibaba Cloud SecretKey.',
|
|
@@ -159,14 +159,14 @@ function run(program) {
|
|
|
159
159
|
}
|
|
160
160
|
if (!(Object.keys(keyInformation).length > 0)) return [3 /*break*/, 6];
|
|
161
161
|
return [4 /*yield*/, setKnownCredential(keyInformation, access || aliasName)];
|
|
162
|
-
case 5: return [2 /*return*/,
|
|
162
|
+
case 5: return [2 /*return*/, _c.sent()];
|
|
163
163
|
case 6: return [4 /*yield*/, setCredential()];
|
|
164
164
|
case 7:
|
|
165
|
-
|
|
165
|
+
_c.sent();
|
|
166
166
|
return [2 /*return*/];
|
|
167
167
|
}
|
|
168
168
|
});
|
|
169
169
|
}); };
|
|
170
170
|
}
|
|
171
171
|
module.exports = run;
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
172
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29uZmlnL2FkZC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EscUNBQTJDO0FBQzNDLHFDQUErQztBQUMvQywwREFBb0M7QUFDNUIsSUFBQSxhQUFhLEdBQWtFLGNBQUksY0FBdEUsRUFBRSxrQkFBa0IsR0FBOEMsY0FBSSxtQkFBbEQsRUFBRSxNQUFNLEdBQXNDLGNBQUksT0FBMUMsRUFBRSxZQUFZLEdBQXdCLGNBQUksYUFBNUIsRUFBRSxVQUFVLEdBQVksY0FBSSxXQUFoQixFQUFFLEtBQUssR0FBSyxjQUFJLE1BQVQsQ0FBVTtBQUM1RixxQ0FBd0Q7QUFFeEQsSUFBTSxXQUFXLEdBQUcsZ29CQWdCbEIsSUFBQSxhQUFLLEVBQUMsSUFBSSxDQUFDLGtDQUF3QixNQUFNLENBQUMsU0FBUyxDQUNuRCwrRUFBK0UsQ0FDaEYsQ0FBRSxDQUFDO0FBRUosU0FBUyxHQUFHLENBQUMsT0FBZ0I7SUFBN0IsaUJBbUhDO0lBbEhDLElBQU0sT0FBTyxHQUFHLE9BQU87U0FDcEIsT0FBTyxDQUFDLEtBQUssQ0FBQztTQUNkLEtBQUssQ0FBQyxXQUFXLENBQUM7U0FDbEIsTUFBTSxDQUFDLHlCQUF5QixFQUFFLDhCQUE4QixDQUFDO1NBQ2pFLE1BQU0sQ0FBQyw2QkFBNkIsRUFBRSxnQ0FBZ0MsQ0FBQztTQUN2RSxNQUFNLENBQUMscUNBQXFDLEVBQUUsb0NBQW9DLENBQUM7U0FDbkYsTUFBTSxDQUFDLGlDQUFpQyxFQUFFLGtDQUFrQyxDQUFDO1NBQzdFLE1BQU0sQ0FBQyxxQ0FBcUMsRUFBRSxvQ0FBb0MsQ0FBQztTQUNuRixNQUFNLENBQUMseUJBQXlCLEVBQUUsOEJBQThCLENBQUM7U0FDakUsTUFBTSxDQUFDLHlCQUF5QixFQUFFLDhCQUE4QixDQUFDO1NBQ2pFLE1BQU0sQ0FBQyx1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
|