From 40b99c12af75d87ba5d83cda0e44c383f8dd7d27 Mon Sep 17 00:00:00 2001 From: Avril Li Date: Wed, 26 Aug 2020 19:58:02 +0800 Subject: [PATCH 1/4] chore: update release rule --- package.json | 1 - release.config.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 76bc5fc..3d9a1e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "@serverless/flask", - "version": "0.0.5", "main": "src/serverless.js", "publishConfig": { "access": "public" diff --git a/release.config.js b/release.config.js index a13798c..98b3864 100644 --- a/release.config.js +++ b/release.config.js @@ -11,8 +11,7 @@ module.exports = { preset: 'angular', parserOpts: { noteKeywords: ['BREAKING CHANGE', 'BREAKING CHANGES', 'BREAKING'] - }, - releaseRules: [{ type: 'feat', release: 'patch' }] + } } ], [ From 27f437462b664930fd0483119d414705b660071b Mon Sep 17 00:00:00 2001 From: yugasun Date: Thu, 27 Aug 2020 16:04:51 +0800 Subject: [PATCH 2/4] fix: support cfs config --- serverless.component.yml | 2 +- src/package.json | 2 +- src/utils.js | 3 +++ tests/integration.test.js | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/serverless.component.yml b/serverless.component.yml index fc7d7ae..64f32f8 100644 --- a/serverless.component.yml +++ b/serverless.component.yml @@ -1,5 +1,5 @@ name: flask -version: 0.0.5 +version: 0.0.6 author: Tencent Cloud, Inc org: Tencent Cloud, Inc description: Deploy a serverless Flask application onto Tencent SCF and API Gateway. diff --git a/src/package.json b/src/package.json index 9a9d323..a53fc4f 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "dependencies": { "download": "^8.0.0", - "tencent-component-toolkit": "^1.13.2", + "tencent-component-toolkit": "^1.15.7", "type": "^2.0.0" } } diff --git a/src/utils.js b/src/utils.js index 026fa0f..c613450 100644 --- a/src/utils.js +++ b/src/utils.js @@ -249,6 +249,9 @@ const prepareInputs = async (instance, credentials, inputs = {}) => { layers: ensureIterable(tempFunctionConf.layers ? tempFunctionConf.layers : inputs.layers, { default: [] }), + cfs: ensureIterable(tempFunctionConf.cfs ? tempFunctionConf.cfs : inputs.cfs, { + default: [] + }), publish: inputs.publish, traffic: inputs.traffic, lastVersion: instance.state.lastVersion, diff --git a/tests/integration.test.js b/tests/integration.test.js index 4d35f2b..5c6215a 100644 --- a/tests/integration.test.js +++ b/tests/integration.test.js @@ -7,7 +7,7 @@ jest.setTimeout(300000) const instanceYaml = { org: 'orgDemo', app: 'appDemo', - component: 'flask@dev', + component: 'flask', name: `flask-integration-tests-${generateId()}`, stage: 'dev', inputs: { From 99aa1111fb85d2888e5ae09caac45a5ba84570aa Mon Sep 17 00:00:00 2001 From: Avril Li Date: Wed, 2 Sep 2020 11:12:09 +0800 Subject: [PATCH 3/4] chore: add ygsec check --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3d9a1e8..6369aff 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged", + "pre-commit": "ygsec && lint-staged", "commit-msg": "commitlint -E HUSKY_GIT_PARAMS", - "pre-push": "npm run lint:fix && npm run prettier:fix" + "pre-push": "ygsec && npm run lint:fix && npm run prettier:fix" } }, "lint-staged": { @@ -45,13 +45,14 @@ "@semantic-release/npm": "^7.0.4", "@semantic-release/release-notes-generator": "^9.0.1", "@serverless/platform-client-china": "^1.0.19", + "@ygkit/secure": "0.0.3", "babel-eslint": "^10.1.0", "dotenv": "^8.2.0", "eslint": "^6.8.0", "eslint-config-prettier": "^6.10.0", "eslint-plugin-import": "^2.20.1", "eslint-plugin-prettier": "^3.1.2", - "husky": "^4.2.3", + "husky": "^4.2.5", "jest": "^25.0.1", "lint-staged": "^10.0.8", "prettier": "^1.19.1", From 96be3ff58daaaec45c4520ee9a8b7ce2b32bac1b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 2 Sep 2020 03:13:55 +0000 Subject: [PATCH 4/4] chore(release): version 0.0.6 ## [0.0.6](https://github.com/serverless-components/tencent-flask/compare/v0.0.5...v0.0.6) (2020-09-02) ### Bug Fixes * support cfs config ([27f4374](https://github.com/serverless-components/tencent-flask/commit/27f437462b664930fd0483119d414705b660071b)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01aa130..6353356 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.0.6](https://github.com/serverless-components/tencent-flask/compare/v0.0.5...v0.0.6) (2020-09-02) + + +### Bug Fixes + +* support cfs config ([27f4374](https://github.com/serverless-components/tencent-flask/commit/27f437462b664930fd0483119d414705b660071b)) + ## [0.0.5](https://github.com/serverless-components/tencent-flask/compare/v0.0.4...v0.0.5) (2020-08-26)