Skip to content

fix auth && update version #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2020
Merged

fix auth && update version #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4fe7b
update version
Feb 4, 2020
11fd88b
update dependencies and add component name
Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@serverless/tencent-laravel",
"description": "Tencent Cloud Laravel Serverless Component",
"version": "0.1.2",
"version": "0.1.3",
"main": "serverless.js",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -47,8 +47,8 @@
},
"dependencies": {
"@serverless/core": "^1.1.1",
"@serverless/tencent-apigateway": "^2.0.0",
"@serverless/tencent-scf": "^2.0.2",
"@serverless/tencent-apigateway": "^2.0.4",
"@serverless/tencent-scf": "^2.0.9",
"ext": "^1.4.0",
"type": "^2.0.0"
},
Expand Down
11 changes: 8 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class TencentLaravel extends Component {
const tencentCloudFunction = await this.load('@serverless/tencent-scf')
const tencentApiGateway = await this.load('@serverless/tencent-apigateway')

inputs.fromClientRemark = inputs.fromClientRemark || 'tencent-laravel'
const tencentCloudFunctionOutputs = await tencentCloudFunction(inputs)
const apigwParam = {
serviceName: inputs.serviceName,
Expand Down Expand Up @@ -94,6 +95,7 @@ class TencentLaravel extends Component {
apigwParam.endpoints[0].auth = inputs.apigatewayConf.auth
}

apigwParam.fromClientRemark = inputs.fromClientRemark || 'tencent-laravel'
const tencentApiGatewayOutputs = await tencentApiGateway(apigwParam)
const outputs = {
region: inputs.region,
Expand All @@ -111,13 +113,16 @@ class TencentLaravel extends Component {
return outputs
}

async remove() {
async remove(inputs = {}) {
this.context.status('Removing')
const removeInput = {
fromClientRemark: inputs.fromClientRemark || 'tencent-laravel'
}
const tencentCloudFunction = await this.load('@serverless/tencent-scf')
const tencentApiGateway = await this.load('@serverless/tencent-apigateway')

await tencentCloudFunction.remove()
await tencentApiGateway.remove()
await tencentCloudFunction.remove(removeInput)
await tencentApiGateway.remove(removeInput)

this.state = {}
await this.save()
Expand Down