迭代新版本

Author: wss-git

examples/s.yaml

@@ -0,0 +1,19 @@
+edition: 1.0.0
+name: buildApp
+# access: aliyun-release
+
+services:
+  image-test:
+    component: ${path(..)}
+    # component: wss-git/upload-oss-regions
+    props:
+      Region: cn-shenzhen # 上传到指定的单个地区
+      # Region: all # 上传到所有地区
+      # Region: # 上传到指定的多个地区
+      #   - cn-shenzhen
+      #   - cn-hangzhou
+      Uri: ../src # 制定要上传的文件夹
+      BucketName: cn-shenzhen-images # 指定上传的 bucket; 支持 {region} 和 {accountId} 写法
+      ObjectPath: create-function-demo-code # 上传到 oss 的哪个目录下
+      Ignore: # 指定哪些文件不上传
+        - .DS_Store

src/package.json renamed to package.json

@@ -1,8 +1,9 @@
 {
   "name": "upload-oss-regions",
   "version": "0.0.1",
+  "main": "./src/index.js",
   "dependencies": {
-    "@serverless-devs/s-core": "0.0.22",
+    "@serverless-devs/core": "^0.0.*",
     "ali-oss": "^6.12.0",
     "inquirer": "^7.3.3",
     "ora": "^5.1.0",

readme.md

@@ -2,21 +2,24 @@
 
 yml 配置
 ````
-UploadOssComponent:
-  Component: upload-oss-regions
-  Provider: alibaba
-  # Access: wss # 密钥别名
-  Properties:
-    # Region: cn-shenzhen # 上传到指定的单个地区
-    # Region: all # 上传到所有地区
-    Region: # 上传到指定的多个地区
-      - cn-shenzhen
-      - cn-hangzhou
-    Uri: ./zips # 制定要上传的文件夹
-    BucketName: fc-console-gen-{region}-{accountId} # 指定上传的 bucket; 支持 {region} 和 {accountId} 写法
-    ObjectPath: create-function-demo-code # 上传到 oss 的哪个目录下
-    Ignore: # 指定哪些文件不上传
-      - .DS_Store
+edition: 1.0.0
+name: buildApp
+# access: aliyun-release
+
+services:
+  image-test:
+    component: wss-git/upload-oss-regions
+    props:
+      # Region: cn-shenzhen # 上传到指定的单个地区
+      # Region: all # 上传到所有地区
+      Region: # 上传到指定的多个地区
+        - cn-shenzhen
+        - cn-hangzhou
+      Uri: ./zips # 制定要上传的文件夹
+      BucketName: fc-console-gen-{region}-{accountId} # 指定上传的 bucket; 支持 {region} 和 {accountId} 写法
+      ObjectPath: create-function-demo-code # 上传到 oss 的哪个目录下
+      Ignore: # 指定哪些文件不上传
+        - .DS_Store
 ````
 #### BucketName 占位符
 

src/index.js

@@ -1,27 +1,31 @@
 /** @format */
 
-const { Component } = require('@serverless-devs/s-core');
+const { commandParse, help, getCredential } = require('@serverless-devs/core');
 const ClientProvider = require('./utils/client-provider');
 const { REGIONLIST } = require('./utils/constants');
 
-class MyComponent extends Component {
-  handlerInput (inputs) {
-    const {
-      Credentials,
-      Properties
+class MyComponent {
+  async handlerInput (inputs) {
+    let {
+      credentials,
+      props,
+      project = {},
     } = inputs;
+    if (!(credentials && credentials.AccessKeyID)) {
+      credentials = await getCredential(project.access);
+    }
 
     return {
-      accessKeyId: Credentials.AccessKeyID,
-      accessKeySecret: Credentials.AccessKeySecret,
-      securityToken: Credentials.SecurityToken,
-      accountID: Credentials.AccountID,
+      accessKeyId: credentials.AccessKeyID,
+      accessKeySecret: credentials.AccessKeySecret,
+      securityToken: credentials.SecurityToken,
+      accountID: credentials.AccountID,
 
-      region: Properties.Region,
-      bucketName: Properties.BucketName,
-      objectPath: Properties.ObjectPath || '',
-      ignore: Properties.Ignore || [],
-      uri: Properties.Uri
+      region: props.Region,
+      bucketName: props.BucketName,
+      objectPath: props.ObjectPath || '',
+      ignore: props.Ignore || [],
+      uri: props.Uri
     }
   }
 
@@ -35,8 +39,26 @@ class MyComponent extends Component {
   }
 
   async upload(inputs) {
-    const { Parameters } = this.args(inputs.Args);
-    const { y, n } = Parameters;
+    const { Parameters = {} } = commandParse(inputs.args) || {};
+    const { y, n, h } = Parameters;
+    if (h) {
+      return help({
+        header: 'Options',
+        optionList: [
+          {
+            name: 'y',
+            description: '覆盖 ObjectPath 已经存在的文件',
+            type: Boolean,
+          },
+          {
+            name: 'n',
+            description: '不上传 ObjectPath 已经存在的文件',
+            type: Boolean,
+          },
+        ],
+      });
+    }
+
     if (y && n) {
       throw new Error('-y 和 -n 不能同时存在');
     }
@@ -51,7 +73,7 @@ class MyComponent extends Component {
       objectPath,
       ignore,
       uri
-    } = this.handlerInput(inputs);
+    } = await this.handlerInput(inputs);
 
     if (!region) {
       throw new Error('Region 是必填项');