From 951f94178467658d0e21a1bfbac0ffa2942dee0b Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Fri, 17 Aug 2018 19:30:21 +0300 Subject: [PATCH 1/6] fix: change sqs event name to receive-message --- .../event-mapping.json | 128 +++++++++--------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index 1453a9f9bb..4e6ceef8be 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -38,7 +38,7 @@ }, "intent-getnewfact": { "filename": "AlexaIntentGetNewFact", - "help" : "Generates an Amazon Alexa Intent GetNewFact Event", + "help": "Generates an Amazon Alexa Intent GetNewFact Event", "tags": { "session-id": { "default": "123456789012" @@ -54,9 +54,9 @@ } } }, - "intent-mycoloris" : { + "intent-mycoloris": { "filename": "AlexaIntentMyColorIs", - "help" : "Generates an Amazon Alexa Intent MyColorIs Event", + "help": "Generates an Amazon Alexa Intent MyColorIs Event", "tags": { "session-id": { "default": "123456789012" @@ -72,9 +72,9 @@ } } }, - "intent-recipe" : { + "intent-recipe": { "filename": "AlexaIntentRecipe", - "help" : "Generates an Amazon Alexa Intent Recipe Event", + "help": "Generates an Amazon Alexa Intent Recipe Event", "tags": { "session-id": { "default": "123456789012" @@ -90,9 +90,9 @@ } } }, - "start-session" : { + "start-session": { "filename": "AlexaStartSession", - "help" : "Generates an Amazon Alexa Start Session Event", + "help": "Generates an Amazon Alexa Start Session Event", "tags": { "session-id": { "default": "123456789012" @@ -109,27 +109,27 @@ } } }, - "alexa-smart-home" : { + "alexa-smart-home": { "smart-home-control-turn-off-request": { "filename": "AlexaSmartHomeControlTurnOffRequest", - "help" : "Generates an Amazon Alexa Smart Home Control Turn Off Request Event", + "help": "Generates an Amazon Alexa Smart Home Control Turn Off Request Event", "tags": {} }, - "smart-home-control-turn-on-request" : { + "smart-home-control-turn-on-request": { "filename": "AlexaSmartHomeControlTurnOnRequest", - "help" : "Generates an Amazon Alexa Smart Home Control Turn On Request Event", + "help": "Generates an Amazon Alexa Smart Home Control Turn On Request Event", "tags": {} }, - "smart-home-discovery-request" : { + "smart-home-discovery-request": { "filename": "AlexaSmartHomeDiscoveryRequest", - "help" : "Generates an Amazon Alexa Smart Home Discovery Request Event", + "help": "Generates an Amazon Alexa Smart Home Discovery Request Event", "tags": {} } }, "apigateway": { - "authorizer" : { + "authorizer": { "filename": "ApiGatewayAuthorizer", - "help" : "Generates an Amazon API Gateway Authorizer Event", + "help": "Generates an Amazon API Gateway Authorizer Event", "tags": { "account-id": { "default": "123456789012" @@ -155,9 +155,9 @@ } } }, - "aws-proxy" : { + "aws-proxy": { "filename": "AwsProxy", - "help" : "Generates an Amazon API Gateway AWS Proxy Event", + "help": "Generates an Amazon API Gateway AWS Proxy Event", "tags": { "body": { "type": "string", @@ -189,19 +189,19 @@ "batch": { "get-job": { "filename": "BatchGetJob", - "help" : "Generates an AWS Batch Get Job Event", + "help": "Generates an AWS Batch Get Job Event", "tags": {} }, - "submit-job" : { + "submit-job": { "filename": "BatchSubmitJob", - "help" : "Generates an AWS Batch Submit Job Event", + "help": "Generates an AWS Batch Submit Job Event", "tags": {} } }, "cloudformation": { "create-request": { "filename": "CfnCreateRequest", - "help" : "Generates an AWS CloudFormation Create Request Event", + "help": "Generates an AWS CloudFormation Create Request Event", "tags": { "account-id": { "default": "123456789012" @@ -219,7 +219,7 @@ "cloudfront": { "ab-test": { "filename": "CloudFrontABTest", - "help" : "Generates an Amazon CloudFront A/B Test Event", + "help": "Generates an Amazon CloudFront A/B Test Event", "tags": { "uri": { "default": "/test" @@ -231,7 +231,7 @@ }, "access-request-in-response": { "filename": "CloudFrontAccessRequestInResponse", - "help" : "Generates an Amazon CloudFront Access Request in Response Event", + "help": "Generates an Amazon CloudFront Access Request in Response Event", "tags": { "uri": { "default": "/test" @@ -243,7 +243,7 @@ }, "http-redirect": { "filename": "CloudFrontHttpRedirect", - "help" : "Generates an Amazon CloudFront HTTP Redirect Event", + "help": "Generates an Amazon CloudFront HTTP Redirect Event", "tags": { "uri": { "default": "/test" @@ -253,9 +253,9 @@ } } }, - "modify-querystring" : { + "modify-querystring": { "filename": "CloudFrontModifyQueryString", - "help" : "Generates an Amazon CloudFront Modify QueryString Event", + "help": "Generates an Amazon CloudFront Modify QueryString Event", "tags": { "uri": { "default": "/test" @@ -267,12 +267,12 @@ }, "modify-response-header": { "filename": "CloudFrontModifyResponseHeader", - "help" : "Generates an Amazon CloudFront Modify Response Header Event", + "help": "Generates an Amazon CloudFront Modify Response Header Event", "tags": {} }, "multiple-remote-calls-aggregate-response": { "filename": "CloudFrontMultipleRemoteCallsAggregateResponse", - "help" : "Generates an Amazon CloudFront Multiple Remote Calls Aggregate Response Event", + "help": "Generates an Amazon CloudFront Multiple Remote Calls Aggregate Response Event", "tags": { "uri": { "default": "/forecast/Seattle:NewYork:Chicago:SanFrancisco" @@ -284,7 +284,7 @@ }, "normalize-querystring-to-improve-cache-hit": { "filename": "CloudFrontNormalizeQuerystringToImproveCacheHit", - "help" : "Generates an Amazon CloudFront Normalize Querystring Event", + "help": "Generates an Amazon CloudFront Normalize Querystring Event", "tags": { "uri": { "default": "/test" @@ -296,7 +296,7 @@ }, "redirect-on-viewer-country": { "filename": "CloudFrontRedirectOnViewerCountry", - "help" : "Generates an Amazon CloudFront Redirect on Viewer Country Event", + "help": "Generates an Amazon CloudFront Redirect on Viewer Country Event", "tags": { "uri": { "default": "/test" @@ -308,7 +308,7 @@ }, "redirect-unauthenticated-users": { "filename": "CloudFrontRedirectUnauthenticatedUsers", - "help" : "Generates an Amazon CloudFront Redirect Unauthenticated Users Event", + "help": "Generates an Amazon CloudFront Redirect Unauthenticated Users Event", "tags": { "uri": { "default": "/test" @@ -320,7 +320,7 @@ }, "response-generation": { "filename": "CloudFrontResponseGeneration", - "help" : "Generates an Amazon CloudFront Response Generation Event", + "help": "Generates an Amazon CloudFront Response Generation Event", "tags": { "uri": { "default": "/test" @@ -332,7 +332,7 @@ }, "serve-object-on-viewer-device": { "filename": "CloudFrontServeObjectOnViewerDevice", - "help" : "Generates an Amazon CloudFront Serve Object on Viewer Device Event", + "help": "Generates an Amazon CloudFront Serve Object on Viewer Device Event", "tags": { "uri": { "default": "/test" @@ -344,7 +344,7 @@ }, "simple-remote-call": { "filename": "CloudFrontSimpleRemoteCall", - "help" : "Generates an Amazon CloudFront Simple Remote Call Event", + "help": "Generates an Amazon CloudFront Simple Remote Call Event", "tags": { "uri": { "default": "/test" @@ -358,7 +358,7 @@ "codecommit": { "codecommit": { "filename": "CodeCommit", - "help" : "Generates an AWS CodeCommit Event", + "help": "Generates an AWS CodeCommit Event", "tags": { "account-id": { "default": "123456789012" @@ -381,8 +381,8 @@ } } }, - "codepipeline" : { - "job" : { + "codepipeline": { + "job": { "filename": "CodePipeline", "help": "Generates an AWS CodePipeline Job Event", "tags": { @@ -411,7 +411,7 @@ "cognito": { "sync-trigger": { "filename": "CognitoSyncTrigger", - "help" : "Generates an Amazon Cognito Sync Trigger Event", + "help": "Generates an Amazon Cognito Sync Trigger Event", "tags": { "region": { "default": "us-east-1" @@ -420,9 +420,9 @@ } }, "config": { - "item-change-notification" : { + "item-change-notification": { "filename": "ConfigurationItemChangeNotification", - "help" : "Generates an AWS Config Configuration Item Change Notification Event", + "help": "Generates an AWS Config Configuration Item Change Notification Event", "tags": { "region": { "default": "us-east-1" @@ -434,7 +434,7 @@ }, "oversized-item-change-notification": { "filename": "OversizedConfigurationItemChangeNotification", - "help" : "Generates an AWS Config Oversized Configuration Item Change Notification Event", + "help": "Generates an AWS Config Oversized Configuration Item Change Notification Event", "tags": { "region": { "default": "us-east-1" @@ -446,7 +446,7 @@ }, "periodic-rule": { "filename": "PeriodicRule", - "help" : "Generates an AWS Config Periodic Rule Event", + "help": "Generates an AWS Config Periodic Rule Event", "tags": { "region": { "default": "us-east-1" @@ -460,7 +460,7 @@ "dynamodb": { "update": { "filename": "DynamoDBUpdate", - "help" : "Generates an Amazon DynamoDB Update Event", + "help": "Generates an Amazon DynamoDB Update Event", "tags": { "account-id": { "default": "123456789012" @@ -478,7 +478,7 @@ "events": { "scheduled-event": { "filename": "ScheduledEvent", - "help" : "Generates an Amazon CloudWatch Scheduled Event", + "help": "Generates an Amazon CloudWatch Scheduled Event", "tags": { "account-id": { "default": "123456789012" @@ -496,7 +496,7 @@ "kinesis": { "kinesis": { "filename": "Kinesis", - "help" : "Generates an Amazon Kinesis Event", + "help": "Generates an Amazon Kinesis Event", "tags": { "region": { "default": "us-east-1" @@ -518,7 +518,7 @@ }, "kinesis-firehose": { "filename": "KinesisFirehose", - "help" : "Generates an Amazon Kinesis Data Firehose Event", + "help": "Generates an Amazon Kinesis Data Firehose Event", "tags": { "region": { "default": "us-east-1" @@ -534,7 +534,7 @@ }, "apachelog": { "filename": "KinesisFirehoseApachelog", - "help" : "Generates an Amazon Kinesis Data Firehose Apachelog Event", + "help": "Generates an Amazon Kinesis Data Firehose Apachelog Event", "tags": { "region": { "default": "us-east-1" @@ -546,7 +546,7 @@ }, "cloudwatch-logs-processor": { "filename": "KinesisFirehoseCloudwatchLogsProcessor", - "help" : "Generates an Amazon Kinesis Data Firehose Cloudwatch Logs Processor Event", + "help": "Generates an Amazon Kinesis Data Firehose Cloudwatch Logs Processor Event", "tags": { "region": { "default": "us-east-1" @@ -556,9 +556,9 @@ } } }, - "streams-as-source" : { + "streams-as-source": { "filename": "KinesisFirehoseStreamsAsSource", - "help" : "Generates an Amazon Kinesis Data Firehose Streams as Source Event", + "help": "Generates an Amazon Kinesis Data Firehose Streams as Source Event", "tags": { "region": { "default": "us-east-1" @@ -579,7 +579,7 @@ }, "syslog": { "filename": "KinesisFirehoseSyslog", - "help" : "Generates an Amazon Kinesis Data Firehose Syslog Event", + "help": "Generates an Amazon Kinesis Data Firehose Syslog Event", "tags": { "region": { "default": "us-east-1" @@ -594,36 +594,36 @@ "lex": { "book-car": { "filename": "LexBookCar", - "help" : "Generates an Amazon Lex Book Car Event", + "help": "Generates an Amazon Lex Book Car Event", "tags": {} }, "book-hotel": { "filename": "LexBookHotel", - "help" : "Generates an Amazon Lex Book Hotel Event", + "help": "Generates an Amazon Lex Book Hotel Event", "tags": {} }, "make-appointment": { "filename": "LexMakeAppointment", - "help" : "Generates an Amazon Lex Make Appointment Event", + "help": "Generates an Amazon Lex Make Appointment Event", "tags": {} }, "order-flowers": { "filename": "LexOrderFlowers", - "help" : "Generates an Amazon Lex Order Flowers Event", + "help": "Generates an Amazon Lex Order Flowers Event", "tags": {} } }, "logs": { "cloudwatch-logs": { "filename": "CloudwatchLogs", - "help" : "Generates an Amazon Cloudwatch Logs Event", + "help": "Generates an Amazon Cloudwatch Logs Event", "tags": {} } }, "rekognition": { "s3-request": { "filename": "RekognitionS3Request", - "help" : "Generates an Amazon Rekognition S3 Request Event", + "help": "Generates an Amazon Rekognition S3 Request Event", "tags": { "region": { "default": "us-east-1" @@ -643,7 +643,7 @@ "s3": { "delete": { "filename": "S3Delete", - "help" : "Generates an Amazon S3 Delete Event", + "help": "Generates an Amazon S3 Delete Event", "tags": { "region": { "default": "us-east-1" @@ -661,7 +661,7 @@ }, "put": { "filename": "S3Put", - "help" : "Generates an Amazon S3 Put Event", + "help": "Generates an Amazon S3 Put Event", "tags": { "region": { "default": "us-east-1" @@ -681,7 +681,7 @@ "ses": { "email-receiving": { "filename": "SesEmailReceiving", - "help" : "Generates an Amazon SES Email Receiving Event", + "help": "Generates an Amazon SES Email Receiving Event", "tags": { "region": { "default": "us-east-1" @@ -695,7 +695,7 @@ "sns": { "sns": { "filename": "Sns", - "help" : "Generates an Amazon SNS Event", + "help": "Generates an Amazon SNS Event", "tags": { "account-id": { "default": "123456789012" @@ -719,7 +719,7 @@ } }, "sqs": { - "sqs": { + "receive-message": { "filename": "Sqs", "help": "Generates an Amazon SQS Event", "tags": { @@ -742,8 +742,8 @@ "stepfunctions": { "error": { "filename": "StepFunctionsError", - "help" : "Generates an AWS StepFunctions Error Event", + "help": "Generates an AWS StepFunctions Error Event", "tags": {} } } -} +} \ No newline at end of file From 9c6ae3bb5494899b37f113ed5d33f48eef604ec3 Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Tue, 21 Aug 2018 15:58:49 +0100 Subject: [PATCH 2/6] fix: change codecommit event name to repository --- .../local/lib/generated_sample_events/event-mapping.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index 4e6ceef8be..c40193eb6a 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -356,9 +356,9 @@ } }, "codecommit": { - "codecommit": { + "repository": { "filename": "CodeCommit", - "help": "Generates an AWS CodeCommit Event", + "help": "Generates an AWS CodeCommit Repository Event ", "tags": { "account-id": { "default": "123456789012" From 2c42679c2dbe018272fca8477c406fef15b4de08 Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Tue, 21 Aug 2018 16:05:27 +0100 Subject: [PATCH 3/6] fix: change sns event name to notifications and descriptions --- .../local/lib/generated_sample_events/event-mapping.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index c40193eb6a..2e77878ef2 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -693,9 +693,9 @@ } }, "sns": { - "sns": { + "notifications": { "filename": "Sns", - "help": "Generates an Amazon SNS Event", + "help": "Generates an Amazon SNS Topic Notifications Event", "tags": { "account-id": { "default": "123456789012" From 99d5e5246081f4a99005edeea6fa29dcaeac0d8a Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Tue, 21 Aug 2018 16:08:22 +0100 Subject: [PATCH 4/6] fix: change kinesis event name to get-records and description --- .../local/lib/generated_sample_events/event-mapping.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index 2e77878ef2..94038298ff 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -494,9 +494,9 @@ } }, "kinesis": { - "kinesis": { + "get-records": { "filename": "Kinesis", - "help": "Generates an Amazon Kinesis Event", + "help": "Generates an Amazon Kinesis Data Stream Event", "tags": { "region": { "default": "us-east-1" From 4c5b484df6f8ee4ceb7e324476ae282d2d930154 Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Tue, 21 Aug 2018 16:21:33 +0100 Subject: [PATCH 5/6] fix: moves logs and scheduled-event as sub-commands under cloudwatch --- .../generated_sample_events/event-mapping.json | 16 +++++++--------- .../{logs => cloudwatch}/CloudwatchLogs.json | 0 .../{events => cloudwatch}/ScheduledEvent.json | 0 3 files changed, 7 insertions(+), 9 deletions(-) rename samcli/commands/local/lib/generated_sample_events/events/{logs => cloudwatch}/CloudwatchLogs.json (100%) rename samcli/commands/local/lib/generated_sample_events/events/{events => cloudwatch}/ScheduledEvent.json (100%) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index 94038298ff..37423e2a09 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -475,10 +475,15 @@ } } }, - "events": { + "cloudwatch": { + "logs": { + "filename": "CloudwatchLogs", + "help": "Generates an Amazon Cloudwatch Logs Event", + "tags": {} + }, "scheduled-event": { "filename": "ScheduledEvent", - "help": "Generates an Amazon CloudWatch Scheduled Event", + "help": "Generates an Amazon CloudWatch Events Scheduled Event", "tags": { "account-id": { "default": "123456789012" @@ -613,13 +618,6 @@ "tags": {} } }, - "logs": { - "cloudwatch-logs": { - "filename": "CloudwatchLogs", - "help": "Generates an Amazon Cloudwatch Logs Event", - "tags": {} - } - }, "rekognition": { "s3-request": { "filename": "RekognitionS3Request", diff --git a/samcli/commands/local/lib/generated_sample_events/events/logs/CloudwatchLogs.json b/samcli/commands/local/lib/generated_sample_events/events/cloudwatch/CloudwatchLogs.json similarity index 100% rename from samcli/commands/local/lib/generated_sample_events/events/logs/CloudwatchLogs.json rename to samcli/commands/local/lib/generated_sample_events/events/cloudwatch/CloudwatchLogs.json diff --git a/samcli/commands/local/lib/generated_sample_events/events/events/ScheduledEvent.json b/samcli/commands/local/lib/generated_sample_events/events/cloudwatch/ScheduledEvent.json similarity index 100% rename from samcli/commands/local/lib/generated_sample_events/events/events/ScheduledEvent.json rename to samcli/commands/local/lib/generated_sample_events/events/cloudwatch/ScheduledEvent.json From 95174a5ec28a6541d0f4cff7bd5386e26e79456b Mon Sep 17 00:00:00 2001 From: Heitor Lessa Date: Wed, 22 Aug 2018 07:50:38 +0100 Subject: [PATCH 6/6] fix: address jacob's feedback on single notification --- .../local/lib/generated_sample_events/event-mapping.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samcli/commands/local/lib/generated_sample_events/event-mapping.json b/samcli/commands/local/lib/generated_sample_events/event-mapping.json index 37423e2a09..da59dbfad2 100644 --- a/samcli/commands/local/lib/generated_sample_events/event-mapping.json +++ b/samcli/commands/local/lib/generated_sample_events/event-mapping.json @@ -691,9 +691,9 @@ } }, "sns": { - "notifications": { + "notification": { "filename": "Sns", - "help": "Generates an Amazon SNS Topic Notifications Event", + "help": "Generates an Amazon SNS Topic Notification Event", "tags": { "account-id": { "default": "123456789012"