From f6c913174ab2b6a545bf0149756d109b86f57c90 Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Tue, 4 Aug 2020 19:23:21 +0200 Subject: [PATCH 1/4] v2 --- .gitmodules | 3 - lambda-src/README.md | 1 - lambda-src/custom-resource-deployment.js | 36 -------- .../node_modules/cfn-response/README.md | 11 --- lambda-src/node_modules/cfn-response/index.js | 54 ------------ .../node_modules/cfn-response/license.txt | 7 -- .../node_modules/cfn-response/package.json | 58 ------------ lambda-src/package-lock.json | 11 --- lambda-src/package.json | 6 -- module.yml | 88 +++---------------- package.json | 3 +- test/defaults.yml | 2 +- 12 files changed, 14 insertions(+), 266 deletions(-) delete mode 100644 .gitmodules delete mode 100644 lambda-src/README.md delete mode 100644 lambda-src/custom-resource-deployment.js delete mode 100644 lambda-src/node_modules/cfn-response/README.md delete mode 100644 lambda-src/node_modules/cfn-response/index.js delete mode 100644 lambda-src/node_modules/cfn-response/license.txt delete mode 100644 lambda-src/node_modules/cfn-response/package.json delete mode 100644 lambda-src/package-lock.json delete mode 100644 lambda-src/package.json diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e86314d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "node_modules/@cfn-modules/lambda-function"] - path = node_modules/@cfn-modules/lambda-function - url = https://github.com/cfn-modules/lambda-function diff --git a/lambda-src/README.md b/lambda-src/README.md deleted file mode 100644 index a57c357..0000000 --- a/lambda-src/README.md +++ /dev/null @@ -1 +0,0 @@ -> It's important that the content of `node_modules` is part fo the repository and included in the archive published to npm! \ No newline at end of file diff --git a/lambda-src/custom-resource-deployment.js b/lambda-src/custom-resource-deployment.js deleted file mode 100644 index d150763..0000000 --- a/lambda-src/custom-resource-deployment.js +++ /dev/null @@ -1,36 +0,0 @@ -const AWS = require('aws-sdk'); -const response = require('cfn-response'); -const apigateway = new AWS.APIGateway({apiVersion: '2015-07-09'}); - -exports.handler = (event, context, cb) => { - console.log(JSON.stringify(event)); - const error = (err) => { - console.log(JSON.stringify(err)); - response.send(event, context, response.FAILED); - }; - if (event.RequestType === 'Delete') { - apigateway.deleteDeployment({ - restApiId: event.ResourceProperties.RestApiId, - deploymentId: event.PhysicalResourceId - }, (err) => { - if (err) { - error(err); - } else { - response.send(event, context, response.SUCCESS); - } - }); - } else if (event.RequestType === 'Create' || event.RequestType === 'Update') { - apigateway.createDeployment({ - restApiId: event.ResourceProperties.RestApiId, - description: `input ${event.ResourceProperties.LambdaModule} ${event.ResourceProperties.HttpMethod}` - }, (err, data) => { - if (err) { - error(err); - } else { - response.send(event, context, response.SUCCESS, {}, data.id); - } - }); - } else { - error(new Error(`unsupported request type: ${event.RequestType}`)); - } -}; diff --git a/lambda-src/node_modules/cfn-response/README.md b/lambda-src/node_modules/cfn-response/README.md deleted file mode 100644 index 994e920..0000000 --- a/lambda-src/node_modules/cfn-response/README.md +++ /dev/null @@ -1,11 +0,0 @@ -#cfn-response module - -This module contains functions that respond on behalf of custom resources you create using AWS CloudFormation. - -The module includes a send method, which sends a response object to a custom resource by way of a ResponseURL, which is an Amazon S3 pre-signed URL. - -Any Lambda function using this module stops running after executing the module's send method. - -For more information, read the AWS documentation [here][1] - -[1]: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-cfnresponsemodule diff --git a/lambda-src/node_modules/cfn-response/index.js b/lambda-src/node_modules/cfn-response/index.js deleted file mode 100644 index 8b7b2e8..0000000 --- a/lambda-src/node_modules/cfn-response/index.js +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2015 Amazon Web Services, Inc. or its affiliates. All Rights Reserved. - This file is licensed to you under the AWS Customer Agreement (the "License"). - You may not use this file except in compliance with the License. - A copy of the License is located at http://aws.amazon.com/agreement/. - This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. - See the License for the specific language governing permissions and limitations under the License. */ - -exports.SUCCESS = "SUCCESS"; -exports.FAILED = "FAILED"; - -exports.send = function(event, context, responseStatus, responseData, physicalResourceId) { - - var responseBody = JSON.stringify({ - Status: responseStatus, - Reason: "See the details in CloudWatch Log Stream: " + context.logStreamName, - PhysicalResourceId: physicalResourceId || context.logStreamName, - StackId: event.StackId, - RequestId: event.RequestId, - LogicalResourceId: event.LogicalResourceId, - Data: responseData - }); - - console.log("Response body:\n", responseBody); - - var https = require("https"); - var url = require("url"); - - var parsedUrl = url.parse(event.ResponseURL); - var options = { - hostname: parsedUrl.hostname, - port: 443, - path: parsedUrl.path, - method: "PUT", - headers: { - "content-type": "", - "content-length": responseBody.length - } - }; - - var request = https.request(options, function(response) { - console.log("Status code: " + response.statusCode); - console.log("Status message: " + response.statusMessage); - context.done(); - }); - - request.on("error", function(error) { - console.log("send(..) failed executing https.request(..): " + error); - context.done(); - }); - - request.write(responseBody); - request.end(); -} - diff --git a/lambda-src/node_modules/cfn-response/license.txt b/lambda-src/node_modules/cfn-response/license.txt deleted file mode 100644 index 3c6c2cb..0000000 --- a/lambda-src/node_modules/cfn-response/license.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 2015 Amazon Web Services, Inc. or its affiliates. All Rights Reserved. -This file is licensed to you under the AWS Customer Agreement (the "License"). -You may not use this file except in compliance with the License. -A copy of the License is located at http://aws.amazon.com/agreement/. -This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. -See the License for the specific language governing permissions and limitations under the License. - diff --git a/lambda-src/node_modules/cfn-response/package.json b/lambda-src/node_modules/cfn-response/package.json deleted file mode 100644 index 2ff40a5..0000000 --- a/lambda-src/node_modules/cfn-response/package.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "_from": "cfn-response@1.0.1", - "_id": "cfn-response@1.0.1", - "_inBundle": false, - "_integrity": "sha1-qOwDlQwGg8UUlejKaA2dwLiEsTc=", - "_location": "/cfn-response", - "_phantomChildren": {}, - "_requested": { - "type": "version", - "registry": true, - "raw": "cfn-response@1.0.1", - "name": "cfn-response", - "escapedName": "cfn-response", - "rawSpec": "1.0.1", - "saveSpec": null, - "fetchSpec": "1.0.1" - }, - "_requiredBy": [ - "/" - ], - "_resolved": "https://registry.npmjs.org/cfn-response/-/cfn-response-1.0.1.tgz", - "_shasum": "a8ec03950c0683c51495e8ca680d9dc0b884b137", - "_spec": "cfn-response@1.0.1", - "_where": "/src", - "author": { - "name": "Amazon Web Services, Inc. or its affiliates" - }, - "bugs": { - "url": "https://github.com/LukeMizuhashi/cfn-response/issues" - }, - "bundleDependencies": false, - "deprecated": false, - "description": "A module for sending responses from lambda-funciton backed custom resources in AWS CloudFormation", - "homepage": "https://github.com/LukeMizuhashi/cfn-response#readme", - "keywords": [ - "aws", - "cfn-response", - "response", - "lambda", - "function", - "cloudFormation", - "custom", - "resource", - "cloud", - "formation" - ], - "license": "SEE LICENSE IN license.txt", - "main": "index.js", - "name": "cfn-response", - "repository": { - "type": "git", - "url": "git+https://github.com/LukeMizuhashi/cfn-response.git" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "version": "1.0.1" -} diff --git a/lambda-src/package-lock.json b/lambda-src/package-lock.json deleted file mode 100644 index e4b7122..0000000 --- a/lambda-src/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "cfn-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cfn-response/-/cfn-response-1.0.1.tgz", - "integrity": "sha1-qOwDlQwGg8UUlejKaA2dwLiEsTc=" - } - } -} diff --git a/lambda-src/package.json b/lambda-src/package.json deleted file mode 100644 index a37b744..0000000 --- a/lambda-src/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "private": true, - "dependencies": { - "cfn-response": "1.0.1" - } -} diff --git a/module.yml b/module.yml index 1ffbdc6..807e73a 100644 --- a/module.yml +++ b/module.yml @@ -37,90 +37,26 @@ Resources: Action: 'lambda:InvokeFunction' FunctionName: {'Fn::ImportValue': !Sub '${LambdaModule}-Name'} Principal: 'apigateway.amazonaws.com' - SourceArn: !Sub 'arn:${AWS::Partition}:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/${HttpMethod}/' - RestApi: - Type: 'AWS::ApiGateway::RestApi' + SourceArn: !Sub 'arn:${AWS::Partition}:execute-api:${AWS::Region}:${AWS::AccountId}:${Api}/*/$default' + Api: + Type: 'AWS::ApiGatewayV2::Api' Properties: + #CorsConfiguration: Name: !Ref 'AWS::StackName' - Stage: - Type: 'AWS::ApiGateway::Stage' - Properties: - DeploymentId: !Ref DeploymentCustom - RestApiId: !Ref RestApi - StageName: webhook - DeploymentCustom: - DependsOn: Method - Type: 'Custom::Deployment' - Version: '1.0' - Properties: - LambdaModule: !Ref LambdaModule - HttpMethod: !Ref HttpMethod - RestApiId: !Ref RestApi - ServiceToken: !GetAtt 'DeploymentFunction.Outputs.Arn' - Method: - Type: 'AWS::ApiGateway::Method' - Properties: - AuthorizationType: NONE - HttpMethod: !Ref HttpMethod - Integration: - IntegrationHttpMethod: 'POST' - PassthroughBehavior: 'WHEN_NO_MATCH' - Type: 'AWS_PROXY' - Uri: !Sub - - 'arn:${Partition}:apigateway:${Region}:lambda:path/2015-03-31/functions/${LambdaFunctionArn}/invocations' - - Partition: !Ref 'AWS::Partition' - Region: !Ref 'AWS::Region' - LambdaFunctionArn: {'Fn::ImportValue': !Sub '${LambdaModule}-Arn'} - ResourceId: !GetAtt 'RestApi.RootResourceId' - RestApiId: !Ref RestApi - Alarm5XXErrorTooHigh: - Condition: HasAlertingModule - Type: 'AWS::CloudWatch::Alarm' - Properties: - AlarmDescription: 'Api Gateway server-side errors captured' - Namespace: 'AWS/ApiGateway' - MetricName: 5XXError - Statistic: Sum - Period: 60 - EvaluationPeriods: 1 - ComparisonOperator: GreaterThanThreshold - Threshold: 0 - AlarmActions: - - 'Fn::ImportValue': !Sub '${AlertingModule}-Arn' - Dimensions: - - Name: ApiName - Value: !Ref 'AWS::StackName' - - Name: Stage - Value: !Ref Stage - TreatMissingData: notBreaching - DeploymentFunctionPolicy: - Type: 'AWS::IAM::ManagedPolicy' - Properties: - PolicyDocument: - Version: '2012-10-17' - Statement: - - Effect: Allow - Action: - - 'apigateway:POST' - - 'apigateway:DELETE' - Resource: !Sub 'arn:${AWS::Partition}:apigateway:${AWS::Region}::/restapis/${RestApi}/*' - DeploymentFunction: - Type: 'AWS::CloudFormation::Stack' - Properties: - Parameters: - Handler: 'custom-resource-deployment.handler' - Runtime: 'nodejs10.x' - Timeout: '30' - ManagedPolicyArns: !Ref DeploymentFunctionPolicy - TemplateURL: './node_modules/@cfn-modules/lambda-function/module.yml' + ProtocolType: HTTP + Target: !Sub + - 'arn:${Partition}:apigateway:${Region}:lambda:path/2015-03-31/functions/${LambdaFunctionArn}/invocations' + - Partition: !Ref 'AWS::Partition' + Region: !Ref 'AWS::Region' + LambdaFunctionArn: {'Fn::ImportValue': !Sub '${LambdaModule}-Arn'} Outputs: ModuleId: Value: 'lambda-event-source-webhook' ModuleVersion: - Value: '1.2.1' + Value: '2.0.0' StackName: Value: !Ref 'AWS::StackName' Url: - Value: !Sub 'https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/${Stage}' + Value: !Sub 'https://${Api}.execute-api.${AWS::Region}.amazonaws.com' Export: Name: !Sub '${AWS::StackName}-Url' diff --git a/package.json b/package.json index 99f9be5..85efb80 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,9 @@ { "name": "@cfn-modules/lambda-event-source-webhook", - "version": "1.2.1", + "version": "2.0.0", "description": "Webhook event source for AWS Lambda function", "author": "Michael Wittig ", "license": "Apache-2.0", - "bundledDependencies": ["@cfn-modules/lambda-function"], "keywords": ["cfn-modules"], "homepage": "https://github.com/cfn-modules", "bugs": { diff --git a/test/defaults.yml b/test/defaults.yml index 66ddbde..ebca76b 100644 --- a/test/defaults.yml +++ b/test/defaults.yml @@ -13,7 +13,7 @@ Resources: Properties: Parameters: Handler: 'defaults.handler' - Runtime: 'nodejs10.x' + Runtime: 'nodejs12.x' TemplateURL: './node_modules/@cfn-modules/lambda-function/module.yml' Outputs: Url: From b0fa0b51ab27a990190c94d1e2baec377dd45719 Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Fri, 23 Oct 2020 13:24:54 +0200 Subject: [PATCH 2/4] fix GHA --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50dd47b..c8eb6b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: CI -on: push +on: [push, pull_request] jobs: build: From c52ca360f92ce6d0f8f14b3bddf2df0b16e06b52 Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Mon, 26 Oct 2020 19:52:04 +0100 Subject: [PATCH 3/4] clean up --- module.yml | 28 ++- node_modules/@cfn-modules/lambda-function | 1 - test/package-lock.json | 276 ++++++++++++---------- test/package.json | 2 +- 4 files changed, 169 insertions(+), 138 deletions(-) delete mode 160000 node_modules/@cfn-modules/lambda-function diff --git a/module.yml b/module.yml index 807e73a..c0d6798 100644 --- a/module.yml +++ b/module.yml @@ -23,11 +23,6 @@ Parameters: Description: 'Optional but recommended stack name of alerting module.' Type: String Default: '' - HttpMethod: - Description: 'The HTTP method that clients use to call this method.' - Type: String - Default: ANY - AllowedValues: [ANY, GET, HEAD, POST, PUT, DELETE, OPTIONS] Conditions: HasAlertingModule: !Not [!Equals [!Ref AlertingModule, '']] Resources: @@ -41,7 +36,6 @@ Resources: Api: Type: 'AWS::ApiGatewayV2::Api' Properties: - #CorsConfiguration: Name: !Ref 'AWS::StackName' ProtocolType: HTTP Target: !Sub @@ -49,6 +43,26 @@ Resources: - Partition: !Ref 'AWS::Partition' Region: !Ref 'AWS::Region' LambdaFunctionArn: {'Fn::ImportValue': !Sub '${LambdaModule}-Arn'} + Alarm5XXErrorTooHigh: + Condition: HasAlertingModule + Type: 'AWS::CloudWatch::Alarm' + Properties: + AlarmDescription: 'Api Gateway server-side errors captured' + Namespace: 'AWS/ApiGateway' + MetricName: 5xx + Statistic: Sum + Period: 60 + EvaluationPeriods: 1 + ComparisonOperator: GreaterThanThreshold + Threshold: 0 + AlarmActions: + - 'Fn::ImportValue': !Sub '${AlertingModule}-Arn' + Dimensions: + - Name: ApiId + Value: !Ref Api + - Name: Stage + Value: '$default' + TreatMissingData: notBreaching Outputs: ModuleId: Value: 'lambda-event-source-webhook' @@ -57,6 +71,6 @@ Outputs: StackName: Value: !Ref 'AWS::StackName' Url: - Value: !Sub 'https://${Api}.execute-api.${AWS::Region}.amazonaws.com' + Value: !GetAtt 'Api.ApiEndpoint' Export: Name: !Sub '${AWS::StackName}-Url' diff --git a/node_modules/@cfn-modules/lambda-function b/node_modules/@cfn-modules/lambda-function deleted file mode 160000 index d992e92..0000000 --- a/node_modules/@cfn-modules/lambda-function +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d992e92537025fd204372bf557683b3e6183e10b diff --git a/test/package-lock.json b/test/package-lock.json index 3f7294d..6a3054b 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -72,22 +72,12 @@ } }, "@cfn-modules/lambda-event-source-webhook": { - "version": "file:..", - "requires": { - "@cfn-modules/lambda-function": "*" - }, - "dependencies": { - "@cfn-modules/lambda-function": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@cfn-modules/lambda-function/-/lambda-function-2.5.0.tgz", - "integrity": "sha512-NAdiwJ+3OLysVK3ZXMrgQW8Xismb9W0lEs/KxGegiNSse8WG3TuRliPrpOiAji0gY39G1g1LOJNjXmkJlgNiig==" - } - } + "version": "file:.." }, "@cfn-modules/lambda-function": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@cfn-modules/lambda-function/-/lambda-function-2.6.0.tgz", - "integrity": "sha512-AOvOSRQyiZvQHgapvIe091pUIhwumeaZLySjmg032U9axQW8iTioWCa8mOj0kJyHtbAeI9IyZBf5GuQPxNqQ/A==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@cfn-modules/lambda-function/-/lambda-function-2.7.0.tgz", + "integrity": "sha512-5qg7DnuTsso2uIH7WD7bv8yJxys5F6QP7UBWfb3RPh0XDK8mj+3jbcv+uW4gMSIF+EYLCmQOYjaucmfiepxCTQ==" }, "@cfn-modules/test": { "version": "0.7.3", @@ -151,11 +141,6 @@ "defer-to-connect": "^1.0.1" } }, - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -171,9 +156,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.0.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz", - "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==" + "version": "14.14.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.3.tgz", + "integrity": "sha512-33/L34xS7HVUx23e0wOT2V1qPF1IrHgQccdJVm9uXGTB9vFBrrzBtkQymT8VskeKOxjz55MSqMv0xuLq+u98WQ==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -181,14 +166,14 @@ "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==" }, "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==" + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" }, "acorn-jsx": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", - "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==" }, "acorn-walk": { "version": "7.2.0", @@ -196,18 +181,18 @@ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" }, "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "requires": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" } }, "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -269,11 +254,10 @@ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, @@ -390,11 +374,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -453,9 +437,9 @@ } }, "blueimp-md5": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz", - "integrity": "sha512-x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw==" + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz", + "integrity": "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==" }, "boxen": { "version": "4.2.0", @@ -535,9 +519,9 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "requires": { "pump": "^3.0.0" } @@ -569,9 +553,9 @@ } }, "chokidar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -580,7 +564,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" } }, "chunkd": { @@ -609,9 +593,9 @@ "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=" }, "cli-boxes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", - "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" }, "cli-cursor": { "version": "3.1.0", @@ -622,9 +606,9 @@ } }, "cli-spinners": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz", - "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz", + "integrity": "sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==" }, "cli-truncate": { "version": "2.1.0", @@ -690,9 +674,9 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concordance": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.0.tgz", - "integrity": "sha512-stOCz9ffg0+rytwTaL2njUOIyMfANwfwmqc9Dr4vTUS/x/KkVFlWx9Zlzu6tHYtjKxxaCF/cEAZgPDac+n35sg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.1.tgz", + "integrity": "sha512-TbNtInKVElgEBnJ1v2Xg+MFX2lvFLbmlv3EuSC5wTfCwpB8kC3w3mffF6cKuUhkn475Ym1f1I4qmuXzx2+uXpw==", "requires": { "date-time": "^3.1.0", "esutils": "^2.0.3", @@ -867,9 +851,9 @@ } }, "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "requires": { "is-obj": "^2.0.0" } @@ -880,9 +864,9 @@ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, "emittery": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz", - "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==" + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz", + "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==" }, "emoji-regex": { "version": "8.0.0", @@ -972,11 +956,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ignore": { @@ -997,11 +981,11 @@ } }, "eslint-scope": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", - "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, @@ -1019,11 +1003,11 @@ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" }, "espree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz", - "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", "requires": { - "acorn": "^7.3.1", + "acorn": "^7.4.0", "acorn-jsx": "^5.2.0", "eslint-visitor-keys": "^1.3.0" } @@ -1042,18 +1026,25 @@ }, "dependencies": { "estraverse": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", - "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" } } }, "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "requires": { - "estraverse": "^4.1.0" + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" + } } }, "estraverse": { @@ -1189,6 +1180,11 @@ "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "optional": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", @@ -1287,6 +1283,14 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1412,6 +1416,14 @@ "ci-info": "^2.0.0" } }, + "is-core-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz", + "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==", + "requires": { + "has": "^1.0.3" + } + }, "is-error": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.2.tgz", @@ -1538,6 +1550,11 @@ "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1599,9 +1616,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "log-symbols": { "version": "3.0.0", @@ -1709,9 +1726,9 @@ } }, "mem": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz", - "integrity": "sha512-RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz", + "integrity": "sha512-Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==", "requires": { "map-age-cleaner": "^0.1.3", "mimic-fn": "^3.0.0" @@ -1821,9 +1838,9 @@ } }, "onetime": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz", - "integrity": "sha512-ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "requires": { "mimic-fn": "^2.1.0" } @@ -1842,9 +1859,9 @@ } }, "ora": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.5.tgz", - "integrity": "sha512-jCDgm9DqvRcNIAEv2wZPrh7E5PcQiDUnbnWbAfu4NGAE2ZNqPFbDixmWldy1YG2QfLeQhuiu6/h5VRrk6cG50w==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz", + "integrity": "sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==", "requires": { "chalk": "^3.0.0", "cli-cursor": "^3.1.0", @@ -2049,9 +2066,9 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, "pretty-ms": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz", - "integrity": "sha512-J3aPWiC5e9ZeZFuSeBraGxSkGMOvulSWsxDByOcbD1Pr75YL3LSNIKIb52WXbCLE1sS5s4inBBbryjF4Y05Ceg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", + "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", "requires": { "parse-ms": "^2.1.0" } @@ -2076,9 +2093,9 @@ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, "pupa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz", - "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", + "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", "requires": { "escape-goat": "^2.0.0" } @@ -2111,13 +2128,13 @@ }, "dependencies": { "parse-json": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz", - "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz", + "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==", "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", + "json-parse-even-better-errors": "^2.3.0", "lines-and-columns": "^1.1.6" } }, @@ -2147,9 +2164,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "requires": { "picomatch": "^2.2.1" } @@ -2186,10 +2203,11 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz", + "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==", "requires": { + "is-core-module": "^2.0.0", "path-parse": "^1.0.6" } }, @@ -2370,9 +2388,9 @@ } }, "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz", + "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==" }, "sprintf-js": { "version": "1.0.3", @@ -2494,9 +2512,9 @@ } }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "requires": { "has-flag": "^4.0.0" } @@ -2589,9 +2607,9 @@ "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==" }, "term-size": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", - "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", + "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==" }, "text-table": { "version": "0.2.0", @@ -2651,9 +2669,9 @@ } }, "update-notifier": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz", - "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", + "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", "requires": { "boxen": "^4.2.0", "chalk": "^3.0.0", @@ -2682,9 +2700,9 @@ } }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "requires": { "punycode": "^2.1.0" }, diff --git a/test/package.json b/test/package.json index d7143bd..903e7f8 100644 --- a/test/package.json +++ b/test/package.json @@ -5,7 +5,7 @@ "ava": "3.11.1", "@cfn-modules/test": "0.7.3", "@cfn-modules/lambda-event-source-webhook": "file:../", - "@cfn-modules/lambda-function": "2.6.0" + "@cfn-modules/lambda-function": "2.7.0" }, "scripts": { "test": "eslint . && ava -c 4 *.js" From 060013e5ce2d7efb5bcd4dbaabee9919b2db647a Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Mon, 26 Oct 2020 19:54:49 +0100 Subject: [PATCH 4/4] bump --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8eb6b9..b343a11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ jobs: - name: yamlllint run: | - pip install yamllint==1.24.2 + pip install yamllint==1.25.0 yamllint module.yml && yamllint test/*.yml - name: cfn-lint run: | - pip install cfn-lint==0.34.0 + pip install cfn-lint==0.39.0 cfn-lint -t module.yml && cfn-lint -t test/*.yml - name: license