Pre 0.1.58 (#107)

Author: xsahxl

.gitignore

@@ -16,3 +16,4 @@ dist
 .s.lock
 website-base/
 .s
+__tests__

.signore

@@ -2,6 +2,7 @@ node_modules
 lib
 docs
 src
+__tests__
 jest.config.ts
 jest.setup.ts
 lerna.json

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/core",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "Serverless Devs Tool Core Component",
   "keywords": [
     "Serverless",
@@ -38,7 +38,9 @@
     "fix": "f2elint fix",
     "pub": "npm run build && npm publish",
     "typecheck": "npx tsc -p tsconfig.json --noEmit",
-    "beta": "npm publish --tag=beta"
+    "beta": "npm publish --tag=beta",
+    "preln": "rm -rf ~/.s/cache/core/dist",
+    "ln": "ln -s $(pwd)/lib ~/.s/cache/core/dist"
   },
   "autoInstall": false,
   "main": "./dist/index.js",
@@ -48,7 +50,7 @@
     "@serverless-devs/acc": "^1.1.3",
     "@serverless-devs/got": "^8.3.2",
     "@serverless-devs/s-progress-bar": "^0.0.8",
-    "@serverless-devs/utils": "^0.0.4",
+    "@serverless-devs/utils": "^0.0.5",
     "@types/archiver": "^5.1.1",
     "@types/command-exists": "^1.2.0",
     "@types/command-line-usage": "^5.0.1",

package.json

@@ -2,7 +2,7 @@ Type: Component
 Name: core
 Provider:
   - 阿里云
-Version: 0.1.57
+Version: 0.1.58
 Description: Serverless Devs 核心组件
 HomePage: https://github.com/Serverless-Devs/core
 Tags: #标签详情

publish.yaml

@@ -12,6 +12,7 @@ import { ALIYUN_CLI, ALIYUN_CONFIG_FILE } from '../../constant';
 import Acc from '@serverless-devs/acc/commands/run';
 import fs from 'fs-extra';
 import getAccountId from '../getAccountId';
+import { isCiCdEnvironment } from '@serverless-devs/utils';
 
 const Crypto = require('crypto-js');
 
@@ -46,6 +47,10 @@ async function getCredential(...args: any[]) {
   if (access === ALIYUN_CLI) {
     result = await getAcc();
   } else {
+    const aliasFromEnv = process.env.serverless_devs_access_cicd_alias_name;
+    if (isCiCdEnvironment() && aliasFromEnv) {
+      access = aliasFromEnv;
+    }
     result = await getCredentialWithAccess(access, ...params);
   }
 
@@ -127,6 +132,10 @@ async function getCredentialWithAccess(access?: string, ...args: any[]) {
     logger.debug(`access information: ${JSON.stringify(result, null, 2)}`);
     return trim(result);
   }
+  if (isCiCdEnvironment()) {
+    // cicd 环境未获取到密钥信息，抛出异常
+    throw new Error(`The access ${accessAlias} is not found.`);
+  }
 
   const userInfo = await getYamlContent(path.join(getRootHome(), 'access.yaml'));
 
@@ -161,8 +170,7 @@ async function getCredentialWithAccess(access?: string, ...args: any[]) {
   }
   const result = formatValue(userInfo, selectAccess);
   logger.warn(
-    `\n\n${
-      os.platform() == 'win32' ? '' : '🤡'
+    `\n\n${os.platform() == 'win32' ? '' : '🤡'
     }   If you don't want to select access every time, configure it in yaml：${chalk.underline.cyan(
       'https://github.com/Serverless-Devs/Serverless-Devs/discussions/149',
     )}\n\n`,

src/common/credential/getCredential/index.ts

@@ -1,3 +1,3 @@
 module.exports = {
-  DEFAULT_CORE_VERSION: '0.1.57',
+  DEFAULT_CORE_VERSION: '0.1.58',
 };

src/daemon/constant.js

@@ -1,9 +1,5 @@
 process.setMaxListeners(0);
 (process as any).noDeprecation = true;
-import { isCiCdEnvironment, getCurrentEnvironment } from '@serverless-devs/utils';
-export const isCiCdEnv = isCiCdEnvironment;
-export const getCicdEnv = getCurrentEnvironment;
-
 
 export { IInputs } from './interface';
 export { Logger, ILogger, makeLogFile } from './logger';
@@ -36,6 +32,6 @@ export { default as popCore } from '@alicloud/pop-core';
 export { default as extend2 } from 'extend2';
 export { default as stringArgv } from 'string-argv';
 export { default as tracker } from '@serverless-cd/tracker';
-export * from '@serverless-devs/utils';
+export { isDebugMode, isCiCdEnvironment as isCiCdEnv, getCurrentEnvironment as getCicdEnv, getCurrentEnvironment } from '@serverless-devs/utils';
 
 

src/index.ts

@@ -19,7 +19,7 @@ name: hello-world-app
 # access 是当前应用所需要的密钥信息配置：
 # 密钥配置可以参考：https://www.serverless-devs.com/serverless-devs/command/config
 # 密钥使用顺序可以参考：https://www.serverless-devs.com/serverless-devs/tool#密钥使用顺序与规范
-access: default
+access: defaultxxx
 extend: base.yaml
 
 vars: # 全局变量