Merge pull request #2 from serverless-cd/ots

Ots

Author: mamba

.github/workflows/registry-publish.yml

@@ -0,0 +1,36 @@
+name: publish package to serverless-hub
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools wheel twine
+          pip install requests
+      - name: Build
+        run: |
+          npm run build
+      - name: Add publish file
+        run: |
+          wget https://serverless-registry.oss-cn-hangzhou.aliyuncs.com/publish-file/python3/hub-publish.py
+          ls
+      - name: Publish package
+        env:
+          publish_token: ${{ secrets.alibaba_registry_publish_token }}
+        run: |
+          ls
+          python hub-publish.py

dist/index.js

@@ -2,7 +2,7 @@ Type: Component
 Name: cd-generate
 Provider:
   - 阿里云
-Version: 0.0.13
+Version: 0.0.14
 Description: 服务于serverless-cd初始化组件
 HomePage: https://cd.serverless-devs.com
 Tags: 

publish.yaml

@@ -6,11 +6,17 @@ import * as generateDbParams from "./generate-db-params";
 import logger from "../../common/logger";
 import { OTS_INSTANCE_NAME } from "../../constants";
 
+enum OtsAccess {
+  OTS = 'ots',
+  TABLE_STORE = 'tablestore',
+}
+
 export default class Ots {
   client: Client;
   popClient: any;
   dbConfig: any;
   envConfig: any;
+  endpoint: string;
 
   constructor(envConfig: IProps) {
     this.envConfig = envConfig;
@@ -20,15 +26,7 @@ export default class Ots {
       endpoint: `https://ots.${envConfig.REGION}.aliyuncs.com`,
       apiVersion: "2016-06-20",
     });
-
-    this.client = new Client({
-      accessKeyId: envConfig.ACCESS_KEY_ID,
-      accessKeySecret: envConfig.ACCESS_KEY_SECRET,
-      // securityToken: credentials.SecurityToken,
-      endpoint: `https://${envConfig.OTS_INSTANCE_NAME}.${envConfig.REGION}.ots.aliyuncs.com`,
-      instancename: envConfig.OTS_INSTANCE_NAME,
-      maxRetries: 20, // 默认20次重试，可以省略此参数。
-    });
+    this.makeClient();
 
     this.dbConfig = [
       {
@@ -62,6 +60,20 @@ export default class Ots {
     ];
   }
 
+  makeClient(access: OtsAccess = OtsAccess.OTS) {
+    const envConfig = this.envConfig;
+    this.endpoint = `https://${envConfig.OTS_INSTANCE_NAME}.${envConfig.REGION}.${access}.aliyuncs.com`;
+
+    this.client = new Client({
+      accessKeyId: envConfig.ACCESS_KEY_ID,
+      accessKeySecret: envConfig.ACCESS_KEY_SECRET,
+      // securityToken: credentials.SecurityToken,
+      endpoint: this.endpoint,
+      instancename: envConfig.OTS_INSTANCE_NAME,
+      maxRetries: 20, // 默认20次重试，可以省略此参数。
+    });
+  }
+
   // 初始化实例
   async initInstance() {
     const popClient = this.popClient;
@@ -103,7 +115,17 @@ export default class Ots {
     for (const { name, indexName, genTableParams, genIndexParams } of this
       .dbConfig) {
       logger.debug(`handler ${name} start`);
-      await this.handlerTable(name, genTableParams(name, this.envConfig));
+      try {
+        await this.handlerTable(name, genTableParams(name, this.envConfig));
+      } catch (ex) {
+        logger.debug(`handler table error: ${ex.message}`);
+        if (ex?.code === 'NetworkingError' && ex?.message.startsWith('getaddrinfo ENOTFOUND')) {
+          this.makeClient(OtsAccess.TABLE_STORE);
+          await this.handlerTable(name, genTableParams(name, this.envConfig));
+        } else {
+          throw ex;
+        }
+      }
 
       if (indexName) {
         await this.handlerIndex(