Merge pull request #43 from Serverless-Devs/zxy/dev-20240514

feat: add --private for s registry list && fix: path error when props.code is not a str
Serverless-Devs · Jun 14, 2024 · c0da294 · c0da294
2 parents 3d6ec19 + f2f1c9f
commit c0da294
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/packages/credential/package.json b/packages/credential/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/credential",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "credential for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/credential/src/actions/set/type.ts b/packages/credential/src/actions/set/type.ts
@@ -42,12 +42,17 @@ export interface ITencent extends IBaseOptions {
   SecretKey: string;
 }
 
+export interface IVolcengine extends IBaseOptions {
+  AccessKey: string;
+  SecretKey: string;
+}
+
 export interface ICustom extends IBaseOptions {
   keyList: string;
   infoList: string;
 }
 
-export type ISetOptions = IBaseOptions | ICustom | IAlibaba | IAws | IBaidu | IHuawei | IAzure | IGoogle | ITencent | IGoogle;
+export type ISetOptions = IBaseOptions | IVolcengine | ICustom | IAlibaba | IAws | IBaidu | IHuawei | IAzure | IGoogle | ITencent | IGoogle;
 
 export type IResult = {
   access: string;

diff --git a/packages/credential/src/constant.ts b/packages/credential/src/constant.ts
@@ -9,6 +9,7 @@ export enum PROVIDER {
   alibaba = 'Alibaba Cloud',
   baidu = 'Baidu Cloud',
   huawei = 'Huawei Cloud',
+  volcengine = 'Volcengine',
   aws = 'AWS',
   azure = 'Azure',
   google = 'Google Cloud',
@@ -19,6 +20,7 @@ export enum PROVIDER {
 // 选择厂商
 export const PROVIDER_LIST = [
   { name: 'Alibaba Cloud (alibaba)', value: PROVIDER.alibaba },
+  { name: 'Volcengine (volcengine)', value: PROVIDER.volcengine },
   { name: 'AWS (aws)', value: PROVIDER.aws },
   { name: 'Azure (azure)', value: PROVIDER.azure },
   { name: 'Baidu Cloud (baidu)', value: PROVIDER.baidu },
@@ -37,6 +39,7 @@ export const PROVIDER_DOCS = {
   [PROVIDER.baidu]: 'http://config.devsapp.net/account/baidu',
   [PROVIDER.google]: 'http://config.devsapp.net/account/gcp',
   [PROVIDER.tencent]: 'http://config.devsapp.net/account/tencent',
+  [PROVIDER.volcengine]: 'https://www.volcengine.com/docs/6291/65568',
 };
 
 // 厂商密钥Key列表
@@ -48,6 +51,7 @@ export const PROVIDER_CREDENTIAL_KEYS = {
   [PROVIDER.baidu]: ['AccessKeyID', 'SecretAccessKey'],
   [PROVIDER.google]: ['PrivateKeyData'],
   [PROVIDER.tencent]: ['AccountID', 'SecretID', 'SecretKey'],
+  [PROVIDER.volcengine]: ['AccessKey', 'SecretKey'],
 };
 
 export const CRYPTO_STRING = 'SecretKey123';

diff --git a/packages/parse-spec/package.json b/packages/parse-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/parse-spec",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "a parse yaml spec lib for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/parse-spec/src/index.ts b/packages/parse-spec/src/index.ts
@@ -10,7 +10,7 @@ import { getDefaultYamlPath, isExtendMode } from './utils';
 const compile = require('@serverless-devs/art-template/lib/devs-compile');
 import Order from './order';
 import ParseContent from './parse-content';
-import { each, filter, find, get, has, includes, isArray, isEmpty, keys, map, set, split } from 'lodash';
+import { each, filter, find, get, has, includes, isArray, isEmpty, isString, keys, map, set, split } from 'lodash';
 import { ISpec, IYaml, IActionType, IActionLevel, IStep, IRecord } from './types';
 import { ENVIRONMENT_FILE_NAME, ENVIRONMENT_FILE_PATH, ENVIRONMENT_KEY, REGX } from './contants';
 import assert from 'assert';
@@ -56,7 +56,8 @@ class ParseSpec {
 
     // 兼容2.0: 加入项目的.env环境变量
     for (const i of this.yaml.projectNames) {
-      if (get(projects, `${i}.props.code`)) {
+      const code = get(projects, `${i}.props.code`);
+      if (code && isString(code)) {
         const codePath = utils.getAbsolutePath(get(projects, `${i}.props.code`, ''));
         expand(dotenv.config({ path: path.join(codePath, '.env') }));
       }

diff --git a/packages/registry/package.json b/packages/registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/registry",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "request for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/registry/src/actions/package.ts b/packages/registry/src/actions/package.ts
@@ -2,7 +2,7 @@ import zip from '@serverless-devs/zip';
 import { getRootHome, registry } from '@serverless-devs/utils';
 import fs from 'fs';
 import { getYamlContentText, getContentText, request } from '../util';
-import { PUBLISH_URL } from '../request-url';
+import { PUBLISH_URL, PRIVATE_LIST_URL } from '../request-url';
 import logger from '../util/logger';
 import path from 'path';
 import yaml from 'js-yaml';
@@ -165,13 +165,16 @@ export interface IList {
   tag?: string;
   search?: string;
   page?: string;
+  private?: boolean;
 }
 
 export const list = async (options?: IList) => {
   const headers = registry.getSignHeaders();
-  const qs = querystring.stringify((options || {}) as any);
-  const uri = `${PUBLISH_URL}?${qs}`;
+  const { private: _private, ...rest } = options || {};
+  const qs = querystring.stringify((rest || {}) as any);
+  const uri = _private ? `${PRIVATE_LIST_URL}?${qs}` : `${PUBLISH_URL}?${qs}`;
 
+  logger.debug(`Get registry list uri: ${uri}`);
   const { body, request_id } = await request.new_request_get(uri, headers);
   logger.debug(`Get registry list responseId: ${request_id}`);
 

diff --git a/packages/registry/src/request-url.ts b/packages/registry/src/request-url.ts
@@ -11,6 +11,9 @@ export const RESET_URL = `${baseUrl}/user/token`;
 // *** 发布 *** //
 export const PUBLISH_URL = `${baseUrl}/packages/releases`;
 
+// *** 用户Packages查找 *** //
+export const PRIVATE_LIST_URL = `${baseUrl}/package/user`;
+
 // *** 指定仓库详情 *** //
 export const getDetailUrl = (name: string) => `${baseUrl}/packages/${name}/release`;