feat: 🎸 #336 获取密钥列表的时候也要按照这个规范去读环境变量，可以选择环境变量的密钥

src/common/credential/getCredential/index.ts

@@ -8,7 +8,7 @@ import getYamlContent from '../../getYamlContent';
 import { logger } from '../../../libs/utils';
 import { getRootHome } from '../../../libs/common';
 import chalk from 'chalk';
-import { transformInputs, trim, getServerlessDevsAccessFromEnv } from './utils'
+import { transformInputs, trim, getServerlessDevsAccessFromEnv } from './utils';
 
 const Crypto = require('crypto-js');
 
@@ -78,9 +78,9 @@ async function getCredentialWithAccess(access?: string, ...args: any[]) {
       SecurityToken: get(process, 'env.SecurityToken'),
     });
   }
-  const serverlessDevsAccessFromEnv = getServerlessDevsAccessFromEnv()
+  const serverlessDevsAccessFromEnv = getServerlessDevsAccessFromEnv(access);
   if (serverlessDevsAccessFromEnv) {
-    return trim(serverlessDevsAccessFromEnv)
+    return trim(serverlessDevsAccessFromEnv);
   }
 
   const accessContent = await getAccess(accessAlias);

src/common/credential/getCredential/utils.ts

@@ -1,5 +1,3 @@
-import { jsonparse } from '../../../libs/utils';
-
 export function transformInputs(inputs, result) {
   if (!inputs || !result) return;
   const { Alias } = result;
@@ -18,8 +16,29 @@ export function trim(obj) {
   return obj;
 }
 
-export function getServerlessDevsAccessFromEnv() {
+function parse(key: string) {
+  try {
+    const params = JSON.parse(process.env[key]);
+    return Object.keys(params).length > 0 ? params : undefined;
+  } catch (error) {}
+}
+
+export function getServerlessDevsAccessFromEnv(access?: string) {
+  if (access) {
+    const data = parse(access);
+    return data
+      ? {
+          Alias: access,
+          ...parse(access),
+        }
+      : undefined;
+  }
   for (const key in process.env) {
-    if (key.endsWith('serverless_devs_access')) return jsonparse(process.env[key]);
+    if (key.endsWith('serverless_devs_access')) {
+      return {
+        Alias: key,
+        ...parse(key),
+      };
+    }
   }
 }

src/common/credential/setCredential.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import yaml from 'js-yaml';
 import { providerCollection, checkProviderList } from './constant';
 import getYamlContent from '../getYamlContent';
-import { jsonparse } from '../../libs/utils';
+import { getServerlessDevsTempArgv } from '../../libs/utils';
 import { getRootHome } from '../../libs/common';
 
 const Crypto = require('crypto-js');
@@ -65,8 +65,8 @@ async function writeData(data: any) {
   const content = await getYamlContent(filePath);
   if (content) {
     const providerAliasKeys = Object.keys(content);
-    const Temp_Params = jsonparse(process.env.Temp_Params);
-    if (providerAliasKeys.includes(accessAlias) && !Temp_Params.f) {
+    const tempArgv = getServerlessDevsTempArgv();
+    if (providerAliasKeys.includes(accessAlias) && !tempArgv.find((i) => i === '-f')) {
       const option = [
         {
           type: 'list',

src/libs/utils.ts

@@ -9,15 +9,13 @@ import report from '../common/report';
 
 export const logger = new Logger('S-CORE');
 
-export const jsonparse = (value) => {
+export function getServerlessDevsTempArgv() {
   try {
-    const data = JSON.parse(value);
-    return typeof data === 'object' ? data : {};
+    return JSON.parse(process.env.serverless_devs_temp_argv);
   } catch (error) {
-    return {};
+    return [];
   }
-};
-
+}
 export const merge = require('lodash.merge');
 
 export const isUndefined = (obj: any): obj is undefined => typeof obj === 'undefined';