Skip to content
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

Jump to bottom

Websocket event schema #8218

Merged
merged 14 commits into from Sep 18, 2020
Merged

Websocket event schema #8218

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d0864d9
Merge pull request #1 from serverless/master
rzaldana Sep 3, 2020
ce8fc14
Merge pull request #2 from serverless/master
rzaldana Sep 4, 2020
6001d4a
Started working on websockets schema
rzaldana Sep 5, 2020
6eb858d
Merge branch 'master' of https://github.com/serverless/serverless
rzaldana Sep 8, 2020
7b7517a
finished out schemas
rzaldana Sep 8, 2020
6f433be
fixed some errors with Websocket schema
rzaldana Sep 9, 2020
4b82ab8
finished up provider attributes
rzaldana Sep 10, 2020
58870fd
Merge branch 'master' of https://github.com/serverless/serverless
rzaldana Sep 10, 2020
99a67fb
made requested changes to websockets schema
rzaldana Sep 14, 2020
b4be0bb
removing routePattern regexp
rzaldana Sep 15, 2020
9f5757e
requested changes
rzaldana Sep 16, 2020
584e96e
removed inline validation for websockets
rzaldana Sep 18, 2020
4fdb552
removed additional inline validation from websocket impl
rzaldana Sep 18, 2020
c149d29
Merge pull request #3 from serverless/master
rzaldana Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 38 additions & 2 deletions lib/plugins/aws/package/compile/events/websockets/index.js
View file
Open in desktop
Expand Up @@ -51,9 +51,45 @@ class AwsCompileWebsockets {
},
};

// TODO: Complete schema, see https://github.com/serverless/serverless/issues/8019
this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'websocket', {
anyOf: [{ type: 'string' }, { type: 'object' }],
anyOf: [
{ type: 'string' },
{
type: 'object',
properties: {
route: { type: 'string' },
routeResponseSelectionExpression: {
type: 'string',
regexp: /^(?:\$default)$/.toString(),
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
},
authorizer: {
anyOf: [
{ type: 'string' },
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
{
type: 'object',
properties: {
name: { type: 'string' },
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
identitySource: { type: 'array', items: { type: 'string' } },
},
required: ['name'],
additionalProperties: false,
},
{
type: 'object',
properties: {
arn: { type: 'string' },
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
identitySource: { type: 'array', items: { type: 'string' } },
},
required: ['arn'],
additionalProperties: false,
},
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
],
},
},
required: ['route'],
additionalProperties: false,
},
],
});
}
}
Expand Down
14 changes: 14 additions & 0 deletions lib/plugins/aws/provider/awsProvider.js
View file
Open in desktop
Expand Up @@ -313,6 +313,17 @@ class AwsProvider {
},
],
},
websocket: {
oneOf: [
{ type: 'boolean' },
{
type: 'object',
properties: {
level: { enum: ['INFO', 'ERROR'] },
},
},
rzaldana marked this conversation as resolved.
Show resolved Hide resolved
],
},
},
},
resourcePolicy: {
Expand All @@ -321,6 +332,9 @@ class AwsProvider {
type: 'object',
},
},
websocketsApiName: { type: 'string' },
websocketsApiRouteSelectionExpression: { type: 'string' },
medikoo marked this conversation as resolved.
Show resolved Hide resolved
apiGateway: { type: 'object', properties: { websocketApiId: { type: 'string' } } },
},
},
function: {
Expand Down