fix: flush more than 1000 files bucket (#35)

yugasun · web-flow · commit a3765293843a · 2021-03-24T11:36:21.000+08:00
* fix: flush more than 1000 files bucket

* test: update
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,5 +41,8 @@ jobs:
       - name: Running integration tests
         run: npm run test
         env:
+          SERVERLESS_PLATFORM_VENDOR: tencent
+          GLOBAL_ACCELERATOR_NA: true
+          TENCENT_APP_ID: ${{ secrets.TENCENT_APP_ID }}
           TENCENT_SECRET_ID: ${{ secrets.TENCENT_SECRET_ID }}
           TENCENT_SECRET_KEY: ${{ secrets.TENCENT_SECRET_KEY }}
diff --git a/__tests__/index.test.js b/__tests__/index.test.js
@@ -2,6 +2,14 @@ const path = require('path')
 const axios = require('axios')
 const { generateId, getServerlessSdk } = require('./lib/utils')
 
+const appId = process.env.TENCENT_APP_ID
+const credentials = {
+  tencent: {
+    SecretId: process.env.TENCENT_SECRET_ID,
+    SecretKey: process.env.TENCENT_SECRET_KEY
+  }
+}
+
 const instanceYaml = {
   org: 'orgDemo',
   app: 'appDemo',
@@ -19,14 +27,7 @@ const instanceYaml = {
   }
 }
 
-const credentials = {
-  tencent: {
-    SecretId: process.env.TENCENT_SECRET_ID,
-    SecretKey: process.env.TENCENT_SECRET_KEY,
-  }
-}
-
-const sdk = getServerlessSdk(instanceYaml.org)
+const sdk = getServerlessSdk(instanceYaml.org, appId)
 
 it('should deploy success', async () => {
   const instance = await sdk.deploy(instanceYaml, credentials)
@@ -37,14 +38,14 @@ it('should deploy success', async () => {
   expect(instance.outputs.region).toEqual(instanceYaml.inputs.region)
   // exist page
   const { data } = await axios.get(instance.outputs.website)
-  expect(data).toContain('Serverless Framework');
+  expect(data).toContain('Serverless');
 
   // not exist page
   try {
     await axios.get(`${instance.outputs.website}/error.html`)
   } catch (e) {
     const { response } = e
-    expect(response.data).toContain('Serverless Framework');
+    expect(response.data).toContain('Serverless');
     expect(response.status).toBe(404)
   }
 })
@@ -59,10 +60,10 @@ it('should update success', async () => {
   expect(instance.outputs.region).toEqual(instanceYaml.inputs.region)
   // exist page
   const { data } = await axios.get(instance.outputs.website)
-  expect(data).toContain('Serverless Framework');
+  expect(data).toContain('Serverless');
   // not exist page
   const res = await axios.get(`${instance.outputs.website}/error.html`)
-  expect(res.data).toContain('Serverless Framework');
+  expect(res.data).toContain('Serverless');
   expect(res.status).toBe(200)
 })
 
diff --git a/__tests__/lib/utils.js b/__tests__/lib/utils.js
@@ -1,24 +1,26 @@
 const { ServerlessSDK } = require('@serverless/platform-client-china')
 
-/*
- * Generate random id
- */
 const generateId = () =>
   Math.random()
     .toString(36)
     .substring(6)
 
-/*
- * Initializes and returns an instance of the serverless sdk
- * @param ${string} orgName - the serverless org name.
- */
-const getServerlessSdk = (orgName) => {
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true)
+    }, ms)
+  })
+}
+
+function getServerlessSdk(orgName, orgUid) {
   const sdk = new ServerlessSDK({
     context: {
+      orgUid,
       orgName
     }
   })
   return sdk
 }
 
-module.exports = { generateId, getServerlessSdk }
+module.exports = { sleep, generateId, getServerlessSdk }
diff --git a/example/src/index.html b/example/src/index.html
@@ -3,7 +3,9 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Serverless Component - Website</title>
+    <meta name="description" content="Serverless Website 应用" />
+    <meta name="keywords" content="website,serverless,无服务" />
+    <title>Serverless - Website</title>
     <style lang="css">
       h1 {
         text-align: center;
@@ -14,8 +16,12 @@
   </head>
   <body>
     <h1>
-      Welcome to website created by
-      <a href="https://serverlesscloud.cn/">Serverless Framework.</a>
+      欢迎访问静态网站
+      <br />
+      <a href="https://cloud.tencent.com/product/sls" target="_blank" rel="noopener noreferrer">
+        腾讯云 Serverless
+      </a>
+      为您提供服务
     </h1>
   </body>
 </html>
diff --git a/jest.config.js b/jest.config.js
@@ -6,7 +6,7 @@ const config = {
   silent: false,
   testTimeout: 300000,
   testEnvironment: 'node',
-  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$',
+  testRegex: '/__tests__/.*\\.(test|spec)\\.(js|ts)$',
   testPathIgnorePatterns: ['/node_modules/', '/__tests__/lib/'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
 }
diff --git a/package.json b/package.json
@@ -25,12 +25,10 @@
   },
   "lint-staged": {
     "**/*.{js,ts,tsx}": [
-      "npm run lint:fix",
-      "git add ."
+      "npm run lint:fix"
     ],
     "**/*.{css,html,js,json,md,yaml,yml}": [
-      "npm run prettier:fix",
-      "git add ."
+      "npm run prettier:fix"
     ]
   },
   "author": "Tencent Cloud, Inc.",
@@ -44,7 +42,7 @@
     "@semantic-release/git": "^9.0.0",
     "@semantic-release/npm": "^7.0.4",
     "@semantic-release/release-notes-generator": "^9.0.1",
-    "@serverless/platform-client-china": "^2.0.9",
+    "@serverless/platform-client-china": "^2.1.9",
     "@ygkit/secure": "0.0.3",
     "axios": "^0.21.0",
     "babel-eslint": "^10.1.0",
diff --git a/serverless.component.yml b/serverless.component.yml
@@ -1,5 +1,5 @@
 name: website
-version: 0.1.2
+version: 0.1.3
 author: 'Tencent Cloud, Inc.'
 org: 'Tencent Cloud, Inc.'
 description: Deploy a static website on Tencent Cloud.
diff --git a/src/package.json b/src/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "download": "^8.0.0",
-    "tencent-component-toolkit": "^1.20.5",
+    "tencent-component-toolkit": "^2.5.3",
     "type": "^2.1.0"
   }
 }
diff --git a/src/serverless.js b/src/serverless.js
@@ -1,6 +1,6 @@
 const { Component } = require('@serverless/core')
 const { Cos, Cdn } = require('tencent-component-toolkit')
-const { TypeError } = require('tencent-component-toolkit/src/utils/error')
+const { ApiTypeError } = require('tencent-component-toolkit/lib/utils/error')
 const CONFIGS = require('./config')
 const { prepareInputs } = require('./utils')
 
@@ -9,7 +9,7 @@ class ServerlessComponent extends Component {
     const { tmpSecrets } = this.credentials.tencent
 
     if (!tmpSecrets || !tmpSecrets.TmpSecretId) {
-      throw new TypeError(
+      throw new ApiTypeError(
         'CREDENTIAL',
         'Cannot get secretId/Key, your account could be sub-account and does not have the access to use SLS_QcsRole, please make sure the role exists first, then visit https://cloud.tencent.com/document/product/1154/43006, follow the instructions to bind the role to your account.'
       )

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ const config = {`
`6`	`6`	`silent: false,`
`7`	`7`	`testTimeout: 300000,`
`8`	`8`	`testEnvironment: 'node',`
`9`		`- testRegex: '(/__tests__/.*\|(\\.\|/)(test\|spec))\\.(js\|ts)$',`
	`9`	`+ testRegex: '/__tests__/.*\\.(test\|spec)\\.(js\|ts)$',`
`10`	`10`	`testPathIgnorePatterns: ['/node_modules/', '/__tests__/lib/'],`
`11`	`11`	`moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"download": "^8.0.0",`
`4`		`- "tencent-component-toolkit": "^1.20.5",`
	`4`	`+ "tencent-component-toolkit": "^2.5.3",`
`5`	`5`	`"type": "^2.1.0"`
`6`	`6`	`}`
`7`	`7`	`}`